diff --git a/src/Makefile.config b/src/Makefile.config index a1b8699c..1df09f65 100644 --- a/src/Makefile.config +++ b/src/Makefile.config @@ -1,5 +1,5 @@ #======================================================================= -# Mac OS X Monterey Makefile.config +# Generic Makefile.config #----------------------------------------------------------------------- # This file is used as a template for Makefile.config if there is not # a predefined file in ${CWPROOT}/src/configs. @@ -48,8 +48,7 @@ include $(CWPROOT)/src/Rules/opengl.rules LINEHDRFLAG = XDRFLAG = -DSUXDR ENDIANFLAG = -DCWP_LITTLE_ENDIAN -#LARGE_FILE_FLAG = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DGNU_SOURCE -LARGE_FILE_FLAG = +LARGE_FILE_FLAG = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CWP_FLAGS = $(LARGE_FILE_FLAG) $(ENDIANFLAG) $(XDRFLAG) $(LINEHDRFLAG) @@ -76,10 +75,8 @@ POSTLFLAGS = IX11 = /usr/X11/include LX11 = /usr/X11/lib -#IMOTIF = /usr/X11R6/include -#LMOTIF = /usr/X11R6/lib -IMOTIF = /opt/local/include -LMOTIF = /opt/local/lib +IMOTIF = /usr/X11R6/include +LMOTIF = /usr/X11R6/lib LD_LIBRARY_PATH += $(CWPROOT)/lib:${LX11}:${LMOTIF} @@ -87,17 +84,18 @@ LD_LIBRARY_PATH += $(CWPROOT)/lib:${LX11}:${LMOTIF} # Gnu compilers by default just because they are the most common #----------------------------------------------------------------------- -CPP = /usr/bin/cpp +CPP = cpp -CC = /usr/bin/gcc -#OPTC = -g -c90 -m64 -Wall -ansi -Wno-long-long -#OPTC = -g -std=c90 -m64 -Wall -ansi -Wno-long-long -OPTC = -g -std=c99 -m64 -Wall -ansi -Wno-long-long +CC = gcc +OPTC = -g -std=c99 -Wall -pedantic -Wno-long-long -D_GNU_SOURCE -D_POSIX_C_SOURCE=200809L CFLAGS = -I$I $(OPTC) $(CWP_FLAGS) +CFLAGS += -I/usr/include/tirpc -# if gfortran is made using Homebrew FC = gfortran FOPTS = -g -FFLAGS = $(FOPTS) -ffixed-line-length-none -fallow-argument-mismatch +FFLAGS = $(FOPTS) -ffixed-line-length-none C++FLAGS = -I$I $(OPTC) $(CWP_FLAGS) + +LDFLAGS = -ltirpc +POSTLFLAGS = -ltirpc diff --git a/src/Makefile.config_old b/src/Makefile.config_old new file mode 100644 index 00000000..4cefb6cb --- /dev/null +++ b/src/Makefile.config_old @@ -0,0 +1,99 @@ +#======================================================================= +# Generic Makefile.config +#----------------------------------------------------------------------- +# This file is used as a template for Makefile.config if there is not +# a predefined file in ${CWPROOT}/src/configs. +# +# Likely source of issues will be the setting of preprocessor symbols +# to properly pick up common, non-ANSI & non-POSIX extensions in +# /usr/include/stdio.h for popen(3c), pclose(3c), fdopen(3c), etc. +# +# If you are using this file rather than a preconfigured version +# please post it to the seisunix mailing list along w/ the output +# from the sys_arch command. +# +#======================================================================= + + +#----------------------------------------------------------------------- +# pick up the Make rules (Gnu make required) +#----------------------------------------------------------------------- + +include $(CWPROOT)/src/Rules/gnumake.rules +include $(CWPROOT)/src/Rules/abbrev.rules +include $(CWPROOT)/src/Rules/cflags.rules +include $(CWPROOT)/src/Rules/suffix.rules +include $(CWPROOT)/src/Rules/misc.rules +include $(CWPROOT)/src/Rules/opengl.rules + +#----------------------------------------------------------------------- +# CWP feature options +#----------------------------------------------------------------------- +# +# LINEHDRFLAG=SU_LINEHEADER - adds 3200 byte text & 400 byte SEG-Y +# style line headers to output. CWP/SU +# always reads either format unless SUXDR +# has been selected. +# +# XDRFLAG=-DSUXDR - forces all SU data to be big endian +# independent of processor architecture +# +# LARGE_FILE_FLAG - controls access to files > 2 GB on +# some systems. +# +# -DSLTSU_SEGY_H - if defined selects SLT/SU trace header +# layout so both packages are compatible +#----------------------------------------------------------------------- + +LINEHDRFLAG = +XDRFLAG = -DSUXDR +ENDIANFLAG = -DCWP_LITTLE_ENDIAN +LARGE_FILE_FLAG = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE + +CWP_FLAGS = $(LARGE_FILE_FLAG) $(ENDIANFLAG) $(XDRFLAG) $(LINEHDRFLAG) + +#----------------------------------------------------------------------- +# system stuff +#----------------------------------------------------------------------- + +SHELL = /bin/sh +ROOT = $(CWPROOT) + +LN = ln # this needs to be changed to cp for FAT32 filesystems +AR = ar +ARFLAGS = rv +RANLIB = ranlib +RANFLAGS = +ICHMODLINE = chmod 644 $@ +MCHMODLINE = chmod 755 $@ + +POSTLFLAGS = + +#----------------------------------------------------------------------- +# use both X11 path conventions +#----------------------------------------------------------------------- + +IX11 = /usr/X11/include +LX11 = /usr/X11/lib +IMOTIF = /usr/X11R6/include +LMOTIF = /usr/X11R6/lib + +LD_LIBRARY_PATH += $(CWPROOT)/lib:${LX11}:${LMOTIF} + +#----------------------------------------------------------------------- +# Gnu compilers by default just because they are the most common +#----------------------------------------------------------------------- + +CPP = cpp + +CC = gcc +OPTC = -g -std=c99 -Wall -pedantic -Wno-long-long +CFLAGS = -I$I $(OPTC) $(CWP_FLAGS) + +FC = gfortran +FOPTS = -g +FFLAGS = $(FOPTS) -ffixed-line-length-none + +C++FLAGS = -I$I $(OPTC) $(CWP_FLAGS) + + diff --git a/src/cwp/lib/tempname.c b/src/cwp/lib/tempname.c index cf1b9b46..0c76ed39 100644 --- a/src/cwp/lib/tempname.c +++ b/src/cwp/lib/tempname.c @@ -1,10 +1,16 @@ -/* Copyright (c) Colorado School of Mines, 2011.*/ +/* Copyright (c) Colorado School of Mines, 2012.*/ /* All rights reserved. */ /*********************** self documentation **********************/ +#define _POSIX_C_SOURCE 200809L // added - ben #include "cwp.h" +/* next 3 lines edited - ben */ +#include // for fdopen, FILE +#include // for mkstemp +#include // for NULL and general utilities + /***************************************************************************** TEMPORARY_FILENAME - Creates a file name in a user-specified directory. diff --git a/src/cwp_su_version b/src/cwp_su_version index 36c6e884..bd46941f 100644 --- a/src/cwp_su_version +++ b/src/cwp_su_version @@ -1 +1 @@ -CWP/SU Release 44R24 25 March 2022 +CWP/SU Release 45R00 30 April 2023 diff --git a/src/par/lib/docpkge.c b/src/par/lib/docpkge.c index c66c0471..e801897d 100644 --- a/src/par/lib/docpkge.c +++ b/src/par/lib/docpkge.c @@ -52,6 +52,7 @@ Author: Jack K. Cohen, Center for Wave Phenomena ****************************************************************************/ /**************** end self doc ********************************/ +#define _POSIX_C_SOURCE 200809L // added - ben #include "par.h" diff --git a/src/par/lib/subcalls.c b/src/par/lib/subcalls.c index 43cfac46..59acfb0e 100644 --- a/src/par/lib/subcalls.c +++ b/src/par/lib/subcalls.c @@ -102,6 +102,8 @@ CWP: Shuki Ronen, Jack Cohen ***************************************************************************/ /**************** end self doc ********************************/ +#define _POSIX_C_SOURCE 200809L + #include "par.h" #define ERROR NULL diff --git a/src/par/main/ray_theory/rayt2dtopo.c b/src/par/main/ray_theory/rayt2dtopo.c index 2ed8bc02..7fec9cee 100644 --- a/src/par/main/ray_theory/rayt2dtopo.c +++ b/src/par/main/ray_theory/rayt2dtopo.c @@ -177,7 +177,7 @@ void zcoorTopog(float fxs,float dxs,int nxs,Surface *srf,float *sz, float *nangl); -main(int argc, char **argv) +int main(int argc, char **argv) { int na,nat,nt,nxs,nxo,nzo,nx,nz,nxt,nx0,mx,npv,nsrf,*nxzsrf; float dt,xs,fxs,dxs,exs,fxo,fzo,dxo,dzo,exo,ezo,fa,ea,amin,eat, diff --git a/src/psplot/main/psepsi.c b/src/psplot/main/psepsi.c index 9df1efd1..113eb16e 100644 --- a/src/psplot/main/psepsi.c +++ b/src/psplot/main/psepsi.c @@ -3,6 +3,8 @@ /* PSEPSI: $Revision: 1.10 $ ; $Date: 2011/11/17 00:10:53 $ */ +#define _POSIX_C_SOURCE 200809L +#include #include "psplot.h" #include "par.h" diff --git a/src/su/include/mkhdr b/src/su/include/mkhdr index 5479cc9b..9e87f9f6 100755 Binary files a/src/su/include/mkhdr and b/src/su/include/mkhdr differ diff --git a/src/su/include/mkheader b/src/su/include/mkheader index fa67f75f..ed6c9ea2 100755 Binary files a/src/su/include/mkheader and b/src/su/include/mkheader differ diff --git a/src/su/include/mkxdrbhdrsub b/src/su/include/mkxdrbhdrsub index 7141b05b..b57f36fd 100755 Binary files a/src/su/include/mkxdrbhdrsub and b/src/su/include/mkxdrbhdrsub differ diff --git a/src/su/include/mkxdrhdrsub b/src/su/include/mkxdrhdrsub index b171a50f..109902a1 100755 Binary files a/src/su/include/mkxdrhdrsub and b/src/su/include/mkxdrhdrsub differ diff --git a/src/su/lib/fgettr.c b/src/su/lib/fgettr.c index af393ba2..85621665 100644 --- a/src/su/lib/fgettr.c +++ b/src/su/lib/fgettr.c @@ -59,6 +59,8 @@ Authors: SEP: Einar Kjartansson, Stew Levin CWP: Shuki Ronen, Jack Cohen */ /**************** end self doc ********************************/ +#define _POSIX_C_SOURCE 200809L + #ifndef TEST #ifdef SU_LINE_HEADER @@ -71,6 +73,10 @@ int out_line_hdr=0; #endif +#include // for swab() +#include // for swab() and fileno() +#include // for fileno() + #include "su.h" #include "segy.h"