diff options
Diffstat (limited to 'src/backend')
-rw-r--r-- | src/backend/access/transam/Makefile | 15 | ||||
-rw-r--r-- | src/backend/catalog/Makefile | 12 | ||||
-rw-r--r-- | src/backend/catalog/genbki.sh | 14 | ||||
-rw-r--r-- | src/backend/libpq/pqsignal.c | 4 | ||||
-rw-r--r-- | src/backend/port/gethostname.c | 6 | ||||
-rw-r--r-- | src/backend/port/inet_aton.c | 6 | ||||
-rw-r--r-- | src/backend/port/isinf.c | 6 | ||||
-rw-r--r-- | src/backend/port/qnx4/isnan.c | 4 | ||||
-rw-r--r-- | src/backend/port/qnx4/rint.c | 4 | ||||
-rw-r--r-- | src/backend/port/qnx4/sem.c | 5 | ||||
-rw-r--r-- | src/backend/port/qnx4/shm.c | 4 | ||||
-rw-r--r-- | src/backend/port/qnx4/tstrint.c | 5 | ||||
-rw-r--r-- | src/backend/port/qnx4/tstsem.c | 4 | ||||
-rw-r--r-- | src/backend/port/qnx4/tstshm.c | 4 | ||||
-rw-r--r-- | src/backend/port/random.c | 6 | ||||
-rw-r--r-- | src/backend/port/srandom.c | 6 | ||||
-rw-r--r-- | src/backend/storage/smgr/md.c | 4 | ||||
-rw-r--r-- | src/backend/utils/adt/int8.c | 4 |
18 files changed, 51 insertions, 62 deletions
diff --git a/src/backend/access/transam/Makefile b/src/backend/access/transam/Makefile index 272a883c521..c4adcc5bffa 100644 --- a/src/backend/access/transam/Makefile +++ b/src/backend/access/transam/Makefile @@ -4,7 +4,7 @@ # Makefile for access/transam # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.13 2000/10/13 12:05:21 vadim Exp $ +# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.14 2001/08/24 14:07:48 petere Exp $ # #------------------------------------------------------------------------- @@ -19,17 +19,8 @@ all: SUBSYS.o SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) -depend dep: - $(CC) -MM $(CFLAGS) *.c >depend - clean: rm -f SUBSYS.o $(OBJS) -# ensure that version checks in xlog.c get recompiled when config.h or -# catversion.h changes, even if "make depend" hasn't been done. -xlog.o: xlog.c $(top_builddir)/src/include/config.h $(top_srcdir)/src/include/catalog/catversion.h - -ifeq (depend,$(wildcard depend)) -include depend -endif - +# ensure that version checks in xlog.c get recompiled when catversion.h changes +xlog.o: xlog.c $(top_srcdir)/src/include/catalog/catversion.h diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index 07801c9a14e..999897d9fee 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -2,7 +2,7 @@ # # Makefile for catalog # -# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.35 2001/06/12 05:55:49 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.36 2001/08/24 14:07:48 petere Exp $ # #------------------------------------------------------------------------- @@ -37,7 +37,7 @@ POSTGRES_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\ pg_includes := $(sort -I$(top_srcdir)/src/include -I$(top_builddir)/src/include) postgres.bki postgres.description: genbki.sh $(POSTGRES_BKI_SRCS) \ - $(top_srcdir)/src/include/postgres_ext.h $(top_builddir)/src/include/config.h + $(top_srcdir)/src/include/postgres_ext.h $(top_builddir)/src/include/pg_config.h CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $< $(BKIOPTS) -o postgres $(pg_includes) $(POSTGRES_BKI_SRCS) --set-version=$(VERSION) .PHONY: install-bki @@ -55,11 +55,3 @@ uninstall-bki: clean: rm -f SUBSYS.o $(OBJS) $(BKIFILES) - - -depend dep: - $(CC) -MM $(CFLAGS) *.c >depend - -ifeq (depend,$(wildcard depend)) -include depend -endif diff --git a/src/backend/catalog/genbki.sh b/src/backend/catalog/genbki.sh index 260d680f7b3..3d51423af42 100644 --- a/src/backend/catalog/genbki.sh +++ b/src/backend/catalog/genbki.sh @@ -10,7 +10,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh,v 1.21 2001/08/10 18:57:33 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh,v 1.22 2001/08/24 14:07:48 petere Exp $ # # NOTES # non-essential whitespace is removed from the generated file. @@ -66,7 +66,7 @@ do echo " $CMDNAME [ -D define [...] ] [ -I dir ] --set-version=VERSION -o prefix files..." echo echo "Options:" - echo " -I path to postgres_ext.h and config.h files" + echo " -I path to postgres_ext.h and pg_config.h files" echo " -o prefix of output files" echo " --set-version PostgreSQL version number for initdb cross-check" echo @@ -126,12 +126,12 @@ for dir in $INCLUDE_DIRS; do fi done -# Get INDEX_MAX_KEYS and DEFAULT_ATTSTATTARGET from config.h +# Get INDEX_MAX_KEYS and DEFAULT_ATTSTATTARGET from pg_config.h # (who needs consistency?) for dir in $INCLUDE_DIRS; do - if [ -f "$dir/config.h" ]; then - INDEXMAXKEYS=`grep '#define[ ]*INDEX_MAX_KEYS' $dir/config.h | $AWK '{ print $3 }'` - DEFAULTATTSTATTARGET=`grep '#define[ ]*DEFAULT_ATTSTATTARGET' $dir/config.h | $AWK '{ print $3 }'` + if [ -f "$dir/pg_config.h" ]; then + INDEXMAXKEYS=`grep '#define[ ]*INDEX_MAX_KEYS' $dir/pg_config.h | $AWK '{ print $3 }'` + DEFAULTATTSTATTARGET=`grep '#define[ ]*DEFAULT_ATTSTATTARGET' $dir/pg_config.h | $AWK '{ print $3 }'` break fi done @@ -146,7 +146,7 @@ done export BKIOBJECTID # NOTE: we assume here that FUNC_MAX_ARGS has the same value as INDEX_MAX_KEYS, -# and don't read it separately from config.h. This is OK because both of them +# and don't read it separately from pg_config.h. This is OK because both of them # must be equal to the length of oidvector. INDEXMAXKEYS2=`expr $INDEXMAXKEYS '*' 2` || exit diff --git a/src/backend/libpq/pqsignal.c b/src/backend/libpq/pqsignal.c index 8cc8f140ace..9bdcd27b703 100644 --- a/src/backend/libpq/pqsignal.c +++ b/src/backend/libpq/pqsignal.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.20 2001/03/22 03:59:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.21 2001/08/24 14:07:49 petere Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -17,7 +17,7 @@ * * A NOTE ABOUT SIGNAL HANDLING ACROSS THE VARIOUS PLATFORMS. * - * config.h defines the macro HAVE_POSIX_SIGNALS for some platforms and + * pg_config.h defines the macro HAVE_POSIX_SIGNALS for some platforms and * not for others. This file and pqsignal.h use that macro to decide * how to handle signalling. * diff --git a/src/backend/port/gethostname.c b/src/backend/port/gethostname.c index be7046e7c0e..568a2221a9d 100644 --- a/src/backend/port/gethostname.c +++ b/src/backend/port/gethostname.c @@ -1,12 +1,12 @@ -/* $Id: gethostname.c,v 1.4 1998/09/01 03:24:25 momjian Exp $ */ +/* $Id: gethostname.c,v 1.5 2001/08/24 14:07:49 petere Exp $ */ + +#include "c.h" #include <sys/types.h> #include <string.h> #include <sys/utsname.h> -#include "config.h" - int gethostname(char *name, int namelen) { diff --git a/src/backend/port/inet_aton.c b/src/backend/port/inet_aton.c index b6cd4974393..81f20da9672 100644 --- a/src/backend/port/inet_aton.c +++ b/src/backend/port/inet_aton.c @@ -1,4 +1,4 @@ -/* $Id: inet_aton.c,v 1.18 2000/12/03 20:45:34 tgl Exp $ +/* $Id: inet_aton.c,v 1.19 2001/08/24 14:07:49 petere Exp $ * * This inet_aton() function was taken from the GNU C library and * incorporated into Postgres for those systems which do not have this @@ -42,12 +42,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +#include "c.h" + #include <sys/types.h> #include <netinet/in.h> #include <ctype.h> -#include "config.h" - /* * Check whether "cp" is a valid ascii representation * of an Internet address and convert to a binary address. diff --git a/src/backend/port/isinf.c b/src/backend/port/isinf.c index 208cef53494..f589f47816e 100644 --- a/src/backend/port/isinf.c +++ b/src/backend/port/isinf.c @@ -1,8 +1,8 @@ -/* $Id: isinf.c,v 1.15 2000/04/12 17:15:28 momjian Exp $ */ +/* $Id: isinf.c,v 1.16 2001/08/24 14:07:49 petere Exp $ */ -#include <math.h> +#include "c.h" -#include "config.h" +#include <math.h> #if HAVE_FPCLASS /* this is _not_ HAVE_FP_CLASS, and not * typo */ diff --git a/src/backend/port/qnx4/isnan.c b/src/backend/port/qnx4/isnan.c index a0afb3d1849..725b26c2eea 100644 --- a/src/backend/port/qnx4/isnan.c +++ b/src/backend/port/qnx4/isnan.c @@ -7,12 +7,12 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/isnan.c,v 1.2 2000/04/12 17:15:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/isnan.c,v 1.3 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ -#include "os.h" +#include "c.h" unsigned char __nan[8] = __nan_bytes; diff --git a/src/backend/port/qnx4/rint.c b/src/backend/port/qnx4/rint.c index 4450d8c0567..972c51e74bf 100644 --- a/src/backend/port/qnx4/rint.c +++ b/src/backend/port/qnx4/rint.c @@ -7,13 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/rint.c,v 1.2 2000/04/12 17:15:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/rint.c,v 1.3 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ +#include "c.h" #include <math.h> -#include "os.h" double rint(double x) diff --git a/src/backend/port/qnx4/sem.c b/src/backend/port/qnx4/sem.c index 188a5f0616f..98fcc28993d 100644 --- a/src/backend/port/qnx4/sem.c +++ b/src/backend/port/qnx4/sem.c @@ -7,11 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.c,v 1.5 2001/05/24 15:53:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.c,v 1.6 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ +#include "postgres.h" + #include <errno.h> #include <semaphore.h> #include <string.h> @@ -19,7 +21,6 @@ #include <unistd.h> #include <fcntl.h> #include <sys/mman.h> -#include "postgres.h" #include "storage/ipc.h" #include "storage/proc.h" #include <sys/sem.h> diff --git a/src/backend/port/qnx4/shm.c b/src/backend/port/qnx4/shm.c index b96203f1c2d..466c4b4b402 100644 --- a/src/backend/port/qnx4/shm.c +++ b/src/backend/port/qnx4/shm.c @@ -7,11 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/shm.c,v 1.5 2001/05/24 15:53:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/shm.c,v 1.6 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ +#include "postgres.h" + #include <errno.h> #include <fcntl.h> #include <stdlib.h> diff --git a/src/backend/port/qnx4/tstrint.c b/src/backend/port/qnx4/tstrint.c index 222051692a8..5586edb6787 100644 --- a/src/backend/port/qnx4/tstrint.c +++ b/src/backend/port/qnx4/tstrint.c @@ -7,15 +7,16 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstrint.c,v 1.2 2000/04/12 17:15:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstrint.c,v 1.3 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ +#include "c.h" + #include <errno.h> #include <stdio.h> #include <stdlib.h> -#include "os.h" int diff --git a/src/backend/port/qnx4/tstsem.c b/src/backend/port/qnx4/tstsem.c index c58a724f9d0..571a6def252 100644 --- a/src/backend/port/qnx4/tstsem.c +++ b/src/backend/port/qnx4/tstsem.c @@ -7,17 +7,17 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstsem.c,v 1.4 2001/05/24 15:53:33 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstsem.c,v 1.5 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ +#include "postgres.h" #include <signal.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include "postgres.h" #include "storage/ipc.h" #include <sys/mman.h> #include <sys/sem.h> diff --git a/src/backend/port/qnx4/tstshm.c b/src/backend/port/qnx4/tstshm.c index d6e577f2924..0fd8226faad 100644 --- a/src/backend/port/qnx4/tstshm.c +++ b/src/backend/port/qnx4/tstshm.c @@ -7,11 +7,13 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstshm.c,v 1.2 2000/04/12 17:15:30 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstshm.c,v 1.3 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ +#include "postgres.h" + #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/src/backend/port/random.c b/src/backend/port/random.c index 950b9106eca..882a3fbf529 100644 --- a/src/backend/port/random.c +++ b/src/backend/port/random.c @@ -1,11 +1,11 @@ -/* $Id: random.c,v 1.9 1999/07/16 23:09:45 tgl Exp $ */ +/* $Id: random.c,v 1.10 2001/08/24 14:07:49 petere Exp $ */ + +#include "c.h" #include <stdlib.h> #include <math.h> #include <errno.h> -#include "config.h" - long random() { diff --git a/src/backend/port/srandom.c b/src/backend/port/srandom.c index eb16736d4ce..5f61088be69 100644 --- a/src/backend/port/srandom.c +++ b/src/backend/port/srandom.c @@ -1,11 +1,11 @@ -/* $Id: srandom.c,v 1.9 1999/07/16 23:09:45 tgl Exp $ */ +/* $Id: srandom.c,v 1.10 2001/08/24 14:07:49 petere Exp $ */ + +#include "c.h" #include <stdlib.h> #include <math.h> #include <errno.h> -#include "config.h" - void srandom(unsigned int seed) { diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c index 54054ee137e..424b667c630 100644 --- a/src/backend/storage/smgr/md.c +++ b/src/backend/storage/smgr/md.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.86 2001/06/27 23:31:39 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/smgr/md.c,v 1.87 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ @@ -36,7 +36,7 @@ * to support relations larger than the OS' file size limit (often 2GBytes). * In order to do that, we break relations up into chunks of < 2GBytes * and store one chunk in each of several files that represent the relation. - * See the BLCKSZ and RELSEG_SIZE configuration constants in include/config.h. + * See the BLCKSZ and RELSEG_SIZE configuration constants in include/pg_config.h. * * The file descriptor stored in the relation cache (see RelationGetFile()) * is actually an index into the Md_fdvec array. -1 indicates not open. diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c index 711c17ad8ad..7a93d219d70 100644 --- a/src/backend/utils/adt/int8.c +++ b/src/backend/utils/adt/int8.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/int8.c,v 1.31 2001/08/14 22:21:58 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/int8.c,v 1.32 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ @@ -21,7 +21,7 @@ #include "utils/int8.h" -/* this should be set in config.h, but just in case it wasn't: */ +/* this should be set in pg_config.h, but just in case it wasn't: */ #ifndef INT64_FORMAT #define INT64_FORMAT "%ld" #endif |