From 968d7733a19cda3db16947024bd335d877b3d9c3 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 24 Aug 2001 14:07:50 +0000 Subject: Rename config.h to pg_config.h and os.h to pg_config_os.h, fix a number of places that were including the wrong files. --- src/Makefile.global.in | 16 +- src/backend/access/transam/Makefile | 15 +- src/backend/catalog/Makefile | 12 +- src/backend/catalog/genbki.sh | 14 +- src/backend/libpq/pqsignal.c | 4 +- src/backend/port/gethostname.c | 6 +- src/backend/port/inet_aton.c | 6 +- src/backend/port/isinf.c | 6 +- src/backend/port/qnx4/isnan.c | 4 +- src/backend/port/qnx4/rint.c | 4 +- src/backend/port/qnx4/sem.c | 5 +- src/backend/port/qnx4/shm.c | 4 +- src/backend/port/qnx4/tstrint.c | 5 +- src/backend/port/qnx4/tstsem.c | 4 +- src/backend/port/qnx4/tstshm.c | 4 +- src/backend/port/random.c | 6 +- src/backend/port/srandom.c | 6 +- src/backend/storage/smgr/md.c | 4 +- src/backend/utils/adt/int8.c | 4 +- src/include/Makefile | 6 +- src/include/c.h | 12 +- src/include/config.h.in | 717 ---------------------------------- src/include/config.h.win32 | 25 -- src/include/pg_config.h.in | 717 ++++++++++++++++++++++++++++++++++ src/include/pg_config.h.win32 | 25 ++ src/interfaces/ecpg/lib/connect.c | 4 + src/interfaces/ecpg/lib/data.c | 4 +- src/interfaces/ecpg/lib/descriptor.c | 4 +- src/interfaces/ecpg/lib/error.c | 4 + src/interfaces/ecpg/lib/execute.c | 7 +- src/interfaces/ecpg/lib/memory.c | 4 + src/interfaces/ecpg/lib/misc.c | 4 + src/interfaces/ecpg/lib/prepare.c | 4 + src/interfaces/ecpg/lib/typename.c | 4 +- src/interfaces/libpq++/pgconnection.h | 6 +- src/interfaces/odbc/bind.c | 5 +- src/interfaces/odbc/columninfo.c | 1 + src/interfaces/odbc/connection.c | 5 +- src/interfaces/odbc/connection.h | 8 +- src/interfaces/odbc/convert.c | 7 +- src/interfaces/odbc/convert.h | 2 + src/interfaces/odbc/dlg_specific.c | 4 +- src/interfaces/odbc/dlg_specific.h | 4 - src/interfaces/odbc/drvconn.c | 5 +- src/interfaces/odbc/environ.c | 1 + src/interfaces/odbc/environ.h | 4 - src/interfaces/odbc/execute.c | 4 - src/interfaces/odbc/gpps.c | 11 +- src/interfaces/odbc/gpps.h | 4 +- src/interfaces/odbc/info.c | 5 +- src/interfaces/odbc/misc.c | 8 +- src/interfaces/odbc/misc.h | 4 +- src/interfaces/odbc/multibyte.c | 2 +- src/interfaces/odbc/multibyte.h | 1 + src/interfaces/odbc/odbcapi.c | 4 - src/interfaces/odbc/odbcapi30.c | 4 - src/interfaces/odbc/options.c | 4 - src/interfaces/odbc/parse.c | 4 +- src/interfaces/odbc/pgapifunc.h | 3 - src/interfaces/odbc/pgtypes.c | 6 +- src/interfaces/odbc/psqlodbc.c | 4 - src/interfaces/odbc/psqlodbc.h | 4 +- src/interfaces/odbc/qresult.h | 3 +- src/interfaces/odbc/results.c | 5 +- src/interfaces/odbc/socket.c | 4 - src/interfaces/odbc/socket.h | 4 +- src/interfaces/odbc/statement.c | 4 - src/interfaces/odbc/statement.h | 4 - src/interfaces/odbc/tuplelist.c | 2 +- src/interfaces/python/GNUmakefile | 3 +- src/tools/pginclude/pgrminclude | 2 +- 71 files changed, 879 insertions(+), 946 deletions(-) delete mode 100644 src/include/config.h.in delete mode 100644 src/include/config.h.win32 create mode 100644 src/include/pg_config.h.in create mode 100644 src/include/pg_config.h.win32 (limited to 'src') diff --git a/src/Makefile.global.in b/src/Makefile.global.in index a447d4e87c3..1b1abc8f207 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.131 2001/07/15 11:20:01 petere Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.132 2001/08/24 14:07:48 petere Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -321,20 +321,20 @@ STRTOUL = @STRTOUL@ $(top_builddir)/src/Makefile.global: $(top_srcdir)/src/Makefile.global.in $(top_builddir)/config.status cd $(top_builddir) && CONFIG_FILES=src/Makefile.global CONFIG_HEADERS= ./config.status -# Remake config.h from config.h.in if the latter changed. -# config.status will not change the timestamp on config.h if it +# Remake pg_config.h from pg_config.h.in if the latter changed. +# config.status will not change the timestamp on pg_config.h if it # doesn't change, so as to avoid recompiling the entire tree # unnecessarily. Therefore we make config.status update a timestamp file # stamp-h everytime it runs, so that we don't trigger this rule everytime. -# (We do trigger the null rule for stamp-h to config.h everytime; so it's +# (We do trigger the null rule for stamp-h to pg_config.h everytime; so it's # important for that rule to be null!) # # Of course you need to turn on dependency tracking to get any -# dependencies on config.h. -$(top_builddir)/src/include/config.h: $(top_builddir)/src/include/stamp-h +# dependencies on pg_config.h. +$(top_builddir)/src/include/pg_config.h: $(top_builddir)/src/include/stamp-h -$(top_builddir)/src/include/stamp-h: $(top_srcdir)/src/include/config.h.in $(top_builddir)/config.status - cd $(top_builddir) && CONFIG_FILES= CONFIG_HEADERS=src/include/config.h ./config.status +$(top_builddir)/src/include/stamp-h: $(top_srcdir)/src/include/pg_config.h.in $(top_builddir)/config.status + cd $(top_builddir) && CONFIG_FILES= CONFIG_HEADERS=src/include/pg_config.h ./config.status # When configure changes, rerun configure with the same options as # last time. To change configure, you need to run autoconf manually. 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 #include #include -#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 #include #include -#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 +#include "c.h" -#include "config.h" +#include #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 -#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 #include #include @@ -19,7 +21,6 @@ #include #include #include -#include "postgres.h" #include "storage/ipc.h" #include "storage/proc.h" #include 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 #include #include 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 #include #include -#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 #include #include #include -#include "postgres.h" #include "storage/ipc.h" #include #include 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 #include #include 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 #include #include -#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 #include #include -#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 diff --git a/src/include/Makefile b/src/include/Makefile index 7d8a3e5b7f5..a8aed3fdd70 100644 --- a/src/include/Makefile +++ b/src/include/Makefile @@ -6,7 +6,7 @@ # programming. 'make install-all-headers' installs the whole contents # of src/include. # -# $Header: /cvsroot/pgsql/src/include/Makefile,v 1.8 2001/03/01 16:17:53 petere Exp $ +# $Header: /cvsroot/pgsql/src/include/Makefile,v 1.9 2001/08/24 14:07:49 petere Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ include $(top_builddir)/src/Makefile.global srcdir_headers := c.h postgres_ext.h postgres_fe.h \ libpq/pqcomm.h libpq/libpq-fs.h lib/dllist.h -builddir_headers := os.h config.h +builddir_headers := pg_config_os.h pg_config.h HEADERS = $(srcdir_headers) $(builddir_headers) @@ -91,4 +91,4 @@ clean: rm -f utils/fmgroids.h parser/parse.h distclean maintainer-clean: clean - rm -f config.h dynloader.h os.h stamp-h + rm -f pg_config.h dynloader.h pg_config_os.h stamp-h diff --git a/src/include/c.h b/src/include/c.h index d67dee12ac6..fc95d381d39 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -12,7 +12,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: c.h,v 1.98 2001/08/23 23:06:38 tgl Exp $ + * $Id: c.h,v 1.99 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ @@ -25,7 +25,7 @@ * * section description * ------- ------------------------------------------------ - * 0) config.h and standard system headers + * 0) pg_config.h and standard system headers * 1) hacks to cope with non-ANSI C compilers * 2) bool, true, false, TRUE, FALSE, NULL * 3) standard system types @@ -49,7 +49,7 @@ have its own. The same goes for stddef and stdarg if present. */ -#include "config.h" +#include "pg_config.h" #include #include @@ -79,7 +79,7 @@ /* ---------------------------------------------------------------- * Section 1: hacks to cope with non-ANSI C compilers * - * type prefixes (const, signed, volatile, inline) are now handled in config.h. + * type prefixes (const, signed, volatile, inline) are handled in pg_config.h. * ---------------------------------------------------------------- */ @@ -624,8 +624,8 @@ typedef NameData *Name; #endif /* Provide prototypes for routines not present in a particular machine's - * standard C library. It'd be better to put these in config.h, but - * in config.h we haven't yet included anything that defines size_t... + * standard C library. It'd be better to put these in pg_config.h, but + * in pg_config.h we haven't yet included anything that defines size_t... */ #ifndef HAVE_SNPRINTF_DECL diff --git a/src/include/config.h.in b/src/include/config.h.in deleted file mode 100644 index c0559089eb6..00000000000 --- a/src/include/config.h.in +++ /dev/null @@ -1,717 +0,0 @@ -/* - * PostgreSQL configuration-settings file. - * - * config.h.in is processed by configure to produce config.h. - * - * If you want to modify any of the tweakable settings in Part 2 - * of this file, you can do it in config.h.in before running configure, - * or in config.h afterwards. Of course, if you edit config.h, then your - * changes will be overwritten the next time you run configure. - * - * $Id: config.h.in,v 1.170 2001/08/01 23:52:50 tgl Exp $ - */ - -#ifndef CONFIG_H -#define CONFIG_H - - -/* - *------------------------------------------------------------------------ - * Part 1: feature symbols and limits that are set by configure based on - * user-supplied switches. This is first so that stuff in Part 2 can - * depend on these values. - * - * Beware of "fixing" configure-time mistakes by editing these values, - * since configure may have inserted the settings in other files as well - * as here. Best to rerun configure if you forgot --enable-multibyte - * or whatever. - *------------------------------------------------------------------------ - */ - -/* The version number is actually hard-coded into configure.in */ -#undef PG_VERSION -/* A canonical string containing the version number, platform, and C compiler */ -#undef PG_VERSION_STR - -/* Set to 1 if you want LOCALE support (--enable-locale) */ -#undef USE_LOCALE - -/* Set to 1 if you want cyrillic recode (--enable-recode) */ -#undef CYR_RECODE - -/* Set to 1 if you want to use multibyte characters (--enable-multibyte) */ -#undef MULTIBYTE - -/* Set to 1 if you want Unicode conversion support (--enable-uniconv) */ -#undef UNICODE_CONVERSION - -/* Set to 1 if you want ASSERT checking (--enable-cassert) */ -#undef USE_ASSERT_CHECKING - -/* Set to 1 to use syslog() to write postmaster log (--enable-syslog) */ -#undef ENABLE_SYSLOG - -/* Define to build with Kerberos 4 support (--with-krb4[=DIR]) */ -#undef KRB4 - -/* Define to build with Kerberos 5 support (--with-krb5[=DIR]) */ -#undef KRB5 - -/* Kerberos name of the Postgres service principal (--with-krb-srvnam=NAME) */ -#undef PG_KRB_SRVNAM - -/* Define to build with (Open)SSL support (--with-openssl[=DIR]) */ -#undef USE_SSL - -/* - * DEF_PGPORT is the TCP port number on which the Postmaster listens and - * which clients will try to connect to. This is just a default value; - * it can be overridden at postmaster or client startup. It's awfully - * convenient if your clients have the right default compiled in, though. - * (--with-pgport=PORTNUM) - */ -#undef DEF_PGPORT -/* ... and once more as a string constant instead */ -#undef DEF_PGPORT_STR - -/* - * Default soft limit on number of backend server processes per postmaster; - * this is just the default setting for the postmaster's -N switch. - * (--with-maxbackends=N) - */ -#undef DEF_MAXBACKENDS - -/* --enable-pltcl-unknown */ -#undef ENABLE_PLTCL_UNKNOWN - -/* --enable-nls */ -#undef ENABLE_NLS - -/* location of locale files */ -#undef LOCALEDIR - -/* - *------------------------------------------------------------------------ - * Part 2: feature symbols and limits that are user-configurable, but - * only by editing this file ... there's no configure support for them. - * - * Editing this file and doing a full rebuild (and an initdb if noted) - * should be sufficient to change any of these. - *------------------------------------------------------------------------ - */ - -/* - * Hard limit on number of backend server processes per postmaster. - * Increasing this costs about 32 bytes per process slot as of v 6.5. - */ -#define MAXBACKENDS (DEF_MAXBACKENDS > 1024 ? DEF_MAXBACKENDS : 1024) - -/* - * Default number of buffers in shared buffer pool (each of size BLCKSZ). - * This is just the default setting for the postmaster's -B switch. - * Perhaps it ought to be configurable from a configure switch. - * NOTE: default setting corresponds to the minimum number of buffers - * that postmaster.c will allow for the default MaxBackends value. - */ -#define DEF_NBUFFERS (DEF_MAXBACKENDS > 8 ? DEF_MAXBACKENDS * 2 : 16) - -/* - * Size of a disk block --- this also limits the size of a tuple. - * You can set it bigger if you need bigger tuples (although TOAST - * should reduce the need to have large tuples, since fields can now - * be spread across multiple tuples). - * - * The maximum possible value of BLCKSZ is currently 2^15 (32768). - * This is determined by the 15-bit widths of the lp_off and lp_len - * fields in ItemIdData (see include/storage/itemid.h). - * - * CAUTION: changing BLCKSZ requires an initdb. - */ -#define BLCKSZ 8192 - -/* - * RELSEG_SIZE is the maximum number of blocks allowed in one disk file. - * Thus, the maximum size of a single file is RELSEG_SIZE * BLCKSZ; - * relations bigger than that are divided into multiple files. - * - * CAUTION: RELSEG_SIZE * BLCKSZ must be less than your OS' limit on file - * size. This is typically 2Gb or 4Gb in a 32-bit operating system. By - * default, we make the limit 1Gb to avoid any possible integer-overflow - * problems within the OS. A limit smaller than necessary only means we - * divide a large relation into more chunks than necessary, so it seems - * best to err in the direction of a small limit. (Besides, a power-of-2 - * value saves a few cycles in md.c.) - * - * CAUTION: changing RELSEG_SIZE requires an initdb. - */ -#define RELSEG_SIZE (0x40000000 / BLCKSZ) - -/* - * Maximum number of columns in an index and maximum number of arguments - * to a function. They must be the same value. - * - * The minimum value is 8 (index creation uses 8-argument functions). - * There is no specific upper limit, although large values will waste - * system-table space and processing time. - * - * CAUTION: changing these requires an initdb. - * - * BTW: if you need to call dynamically-loaded old-style C functions that - * have more than 16 arguments, you will also need to add cases to the - * switch statement in fmgr_oldstyle() in src/backend/utils/fmgr/fmgr.c. - * But consider converting such functions to new-style instead... - */ -#define INDEX_MAX_KEYS 16 -#define FUNC_MAX_ARGS INDEX_MAX_KEYS - -/* - * System default value for pg_attribute.attstattarget - */ -#define DEFAULT_ATTSTATTARGET 10 - -/* - * Define this to make libpgtcl's "pg_result -assign" command process C-style - * backslash sequences in returned tuple data and convert Postgres array - * attributes into Tcl lists. CAUTION: this conversion is *wrong* unless - * you install the routines in contrib/string/string_io to make the backend - * produce C-style backslash sequences in the first place. - */ -/* #define TCL_ARRAYS */ - -/* - * User locks are handled totally on the application side as long term - * cooperative locks which extend beyond the normal transaction boundaries. - * Their purpose is to indicate to an application that someone is `working' - * on an item. Define this flag to enable user locks. You will need the - * loadable module user-locks.c to use this feature. - */ -#define USER_LOCKS - -/* - * Define this if you want psql to _always_ ask for a username and a password - * for password authentication. - */ -/* #define PSQL_ALWAYS_GET_PASSWORDS */ - -/* - * Define this if you want to allow the lo_import and lo_export SQL functions - * to be executed by ordinary users. By default these functions are only - * available to the Postgres superuser. CAUTION: these functions are - * SECURITY HOLES since they can read and write any file that the Postgres - * backend has permission to access. If you turn this on, don't say we - * didn't warn you. - */ -/* #define ALLOW_DANGEROUS_LO_FUNCTIONS */ - -/* - * Use btree bulkload code: - * this code is moderately slow (~10% slower) compared to the regular - * btree (insertion) build code on sorted or well-clustered data. on - * random data, however, the insertion build code is unusable -- the - * difference on a 60MB heap is a factor of 15 because the random - * probes into the btree thrash the buffer pool. - * - * Great thanks to Paul M. Aoki (aoki@CS.Berkeley.EDU) - */ -#define FASTBUILD /* access/nbtree/nbtsort.c */ - -/* - * MAXPGPATH: standard size of a pathname buffer in Postgres (hence, - * maximum usable pathname length is one less). - * - * We'd use a standard system header symbol for this, if there weren't - * so many to choose from: MAXPATHLEN, _POSIX_PATH_MAX, MAX_PATH, PATH_MAX - * are all defined by different "standards", and often have different - * values on the same platform! So we just punt and use a reasonably - * generous setting here. - */ -#define MAXPGPATH 1024 - -/* - * DEFAULT_MAX_EXPR_DEPTH: default value of max_expr_depth SET variable. - */ -#define DEFAULT_MAX_EXPR_DEPTH 10000 - -/* - * PG_SOMAXCONN: maximum accept-queue length limit passed to listen(2). - * You'd think we should use SOMAXCONN from , but on many - * systems that symbol is much smaller than the kernel's actual limit. - * In any case, this symbol need be twiddled only if you have a kernel - * that refuses large limit values, rather than silently reducing the - * value to what it can handle (which is what most if not all Unixen do). - */ -#define PG_SOMAXCONN 10000 - -/* - * You can try changing this if you have a machine with bytes of another - * size, but no guarantee... - */ -#define BITS_PER_BYTE 8 - -/* - * Define this if your operating system supports AF_UNIX family sockets. - */ -#if !defined(__QNX__) && !defined(__BEOS__) -# define HAVE_UNIX_SOCKETS 1 -#endif - -/* - * This is the default directory in which AF_UNIX socket files are placed. - * Caution: changing this risks breaking your existing client applications, - * which are likely to continue to look in the old directory. But if you - * just hate the idea of sockets in /tmp, here's where to twiddle it. - * You can also override this at runtime with the postmaster's -k switch. - */ -#define DEFAULT_PGSOCKET_DIR "/tmp" - - -/* - *------------------------------------------------------------------------ - * These hand-configurable symbols are for enabling debugging code, - * not for controlling user-visible features or resource limits. - *------------------------------------------------------------------------ - */ - -/* Define this to cause pfree()'d memory to be cleared immediately, - * to facilitate catching bugs that refer to already-freed values. - * XXX For 7.1 development, define this automatically if --enable-cassert. - * In the long term it probably doesn't need to be on by default. - */ -#ifdef USE_ASSERT_CHECKING -#define CLOBBER_FREED_MEMORY -#endif - -/* Define this to check memory allocation errors (scribbling on more - * bytes than were allocated). - * XXX For 7.1 development, define this automatically if --enable-cassert. - * In the long term it probably doesn't need to be on by default. - */ -#ifdef USE_ASSERT_CHECKING -#define MEMORY_CONTEXT_CHECKING -#endif - -/* Define this to force all parse and plan trees to be passed through - * copyObject(), to facilitate catching errors and omissions in copyObject(). - */ -/* #define COPY_PARSE_PLAN_TREES */ - -/* Enable debugging print statements in the date/time support routines. */ -/* #define DATEDEBUG */ - -/* Enable debugging print statements for lock-related operations. */ -/* #define LOCK_DEBUG */ - -/* - * Other debug #defines (documentation, anyone?) - */ -/* #define IPORTAL_DEBUG */ -/* #define HEAPDEBUGALL */ -/* #define ISTRATDEBUG */ -/* #define ACLDEBUG */ -/* #define RTDEBUG */ -/* #define GISTDEBUG */ - -/* - * defining unsafe floats will make float4 and float8 ops faster - * by suppressing overflow/underflow checks. - */ -/* #define UNSAFE_FLOATS */ - - -/* - *------------------------------------------------------------------------ - * Part 3: system configuration information that is auto-detected by - * configure. In theory you shouldn't have to touch any of this stuff - * by hand. In the real world, configure might get it wrong... - *------------------------------------------------------------------------ - */ - -/* Define const as empty if your compiler doesn't grok const. */ -#undef const - -/* Define as your compiler's spelling of "inline", or empty if no inline. */ -#undef inline - -/* Define as empty if the C compiler doesn't understand "signed". */ -#undef signed - -/* Define as empty if the C compiler doesn't understand "volatile". */ -#undef volatile - -/* Define if your cpp understands the ANSI stringizing operators in macros */ -#undef HAVE_STRINGIZE - -/* Set to 1 if you have */ -#undef HAVE_CRYPT_H - -/* Set to 1 if you have */ -#undef HAVE_DLD_H - -/* Set to 1 if you have */ -#undef HAVE_ENDIAN_H - -/* Set to 1 if you have */ -#undef HAVE_FP_CLASS_H - -/* Set to 1 if you have */ -#undef HAVE_GETOPT_H - -/* Set to 1 if you have */ -#undef HAVE_HISTORY_H - -/* Set to 1 if you have */ -#undef HAVE_IEEEFP_H - -/* Set to 1 if you have */ -#undef HAVE_NETINET_TCP_H - -/* Set to 1 if you have */ -#undef HAVE_READLINE_H - -/* Set to 1 if you have */ -#undef HAVE_READLINE_HISTORY_H - -/* Set to 1 if you have */ -#undef HAVE_READLINE_READLINE_H - -/* Set to 1 if you have */ -#undef HAVE_SYS_IPC_H - -/* Set to 1 if you have */ -#undef HAVE_SYS_SELECT_H - -/* Set to 1 if you have */ -#undef HAVE_SYS_UN_H - -/* Set to 1 if you have */ -#undef HAVE_SYS_SEM_H - -/* Set to 1 if you have */ -#undef HAVE_SYS_SHM_H - -/* Set to 1 if you have */ -#undef HAVE_KERNEL_OS_H - -/* Set to 1 if you have */ -#undef HAVE_SUPPORTDEFS_H - -/* Set to 1 if you have */ -#undef HAVE_KERNEL_IMAGE_H - -/* Set to 1 if you have */ -#undef HAVE_TERMIOS_H - -/* Set to 1 if you have */ -#undef HAVE_SYS_PSTAT_H - -/* Define if string.h and strings.h may both be included */ -#undef STRING_H_WITH_STRINGS_H - -/* Define if you have the setproctitle function. */ -#undef HAVE_SETPROCTITLE - -/* Define if you have the pstat function. */ -#undef HAVE_PSTAT - -/* Define if the PS_STRINGS thing exists. */ -#undef HAVE_PS_STRINGS - -/* Define if you have the stricmp function. */ -#undef HAVE_STRICMP - -/* Set to 1 if you have history functions (either in libhistory or libreadline) */ -#undef HAVE_HISTORY_FUNCTIONS - -/* Set to 1 if you have */ -#undef HAVE_PWD_H - -/* Set to 1 if you have gettimeofday(a) instead of gettimeofday(a,b) */ -#undef GETTIMEOFDAY_1ARG -#ifdef GETTIMEOFDAY_1ARG -# define gettimeofday(a,b) gettimeofday(a) -#endif - -/* Set to 1 if you have snprintf() in the C library */ -#undef HAVE_SNPRINTF - -/* Set to 1 if your standard system headers declare snprintf() */ -#undef HAVE_SNPRINTF_DECL - -/* Set to 1 if you have vsnprintf() in the C library */ -#undef HAVE_VSNPRINTF - -/* Set to 1 if your standard system headers declare vsnprintf() */ -#undef HAVE_VSNPRINTF_DECL - -/* Set to 1 if you have strerror() */ -#undef HAVE_STRERROR - -/* Set to 1 if you have isinf() */ -#undef HAVE_ISINF -#ifndef HAVE_ISINF -extern int isinf(double x); -#endif - -/* - * These are all related to port/isinf.c - */ -#undef HAVE_FPCLASS -#undef HAVE_FP_CLASS -#undef HAVE_FP_CLASS_H -#undef HAVE_FP_CLASS_D -#undef HAVE_CLASS - -/* Set to 1 if you have gethostname() */ -#undef HAVE_GETHOSTNAME -#ifndef HAVE_GETHOSTNAME -extern int gethostname(char *name, int namelen); -#endif - -/* Set to 1 if struct tm has a tm_zone member */ -#undef HAVE_TM_ZONE - -/* Set to 1 if you have int timezone. - * NOTE: if both tm_zone and a global timezone variable exist, - * using the tm_zone field should probably be preferred, - * since global variables are inherently not thread-safe. - */ -#undef HAVE_INT_TIMEZONE - -/* Set to 1 if you have cbrt() */ -#undef HAVE_CBRT - -/* Set to 1 if you have inet_aton() */ -#undef HAVE_INET_ATON - -#ifndef HAVE_INET_ATON -# include -# include -# include -extern int inet_aton(const char *cp, struct in_addr * addr); -#endif - -/* Set to 1 if you have fcvt() */ -#undef HAVE_FCVT - -/* Set to 1 if you have rint() */ -#undef HAVE_RINT - -/* Set to 1 if you have finite() */ -#undef HAVE_FINITE - -/* Set to 1 if you have memmove() */ -#undef HAVE_MEMMOVE - -/* Set to 1 if you have sigsetjmp() */ -#undef HAVE_SIGSETJMP - -/* - * When there is no sigsetjmp, its functionality is provided by plain - * setjmp. Incidentally, nothing provides setjmp's functionality in - * that case. - */ -#ifndef HAVE_SIGSETJMP -# define sigjmp_buf jmp_buf -# define sigsetjmp(x,y) setjmp(x) -# define siglongjmp longjmp -#endif - -/* Set to 1 if you have sysconf() */ -#undef HAVE_SYSCONF - -/* Set to 1 if you have getrusage() */ -#undef HAVE_GETRUSAGE - -/* Set to 1 if you have waitpid() */ -#undef HAVE_WAITPID - -/* Set to 1 if you have setsid() */ -#undef HAVE_SETSID - -/* Set to 1 if you have sigprocmask() */ -#undef HAVE_SIGPROCMASK - -/* Set to 1 if you have sigprocmask() */ -#undef HAVE_STRCASECMP -#ifndef HAVE_STRCASECMP -extern int strcasecmp(char *s1, char *s2); -#endif - -/* Set to 1 if you have strtol() */ -#undef HAVE_STRTOL - -/* Set to 1 if you have strtoul() */ -#undef HAVE_STRTOUL - -/* Set to 1 if you have strdup() */ -#undef HAVE_STRDUP -#ifndef HAVE_STRDUP -extern char *strdup(char const *); -#endif - -/* Set to 1 if you have random() */ -#undef HAVE_RANDOM -#ifndef HAVE_RANDOM -extern long random(void); -#endif - -/* Set to 1 if you have srandom() */ -#undef HAVE_SRANDOM -#ifndef HAVE_SRANDOM -extern void srandom(unsigned int seed); -#endif - -/* The random() function is expected to yield values 0 .. MAX_RANDOM_VALUE */ -/* Currently, all known implementations yield 0..2^31-1, so we just hardwire - * this constant. We could do a configure test if it proves to be necessary. - * CAUTION: Think not to replace this with RAND_MAX. RAND_MAX defines the - * maximum value of the older rand() function, which is often different from - * --- and considerably inferior to --- random(). - */ -#define MAX_RANDOM_VALUE (0x7FFFFFFF) - -/* Define if you have dlopen() */ -#undef HAVE_DLOPEN - -/* Define if you have fdatasync() */ -#undef HAVE_FDATASYNC - -/* Define if the standard header unistd.h declares fdatasync() */ -#undef HAVE_FDATASYNC_DECL - -#if defined(HAVE_FDATASYNC) && !defined(HAVE_FDATASYNC_DECL) -extern int fdatasync(int fildes); -#endif - -/* Set to 1 if you have libz.a */ -#undef HAVE_LIBZ - -/* Set to 1 if you have libreadline.a */ -#undef HAVE_LIBREADLINE - -/* Set to 1 if you have libhistory.a */ -#undef HAVE_LIBHISTORY - -/* Set to 1 if your libreadline defines rl_completion_append_character */ -#undef HAVE_RL_COMPLETION_APPEND_CHARACTER - -/* Set to 1 if you have rl_completion_matches */ -#undef HAVE_RL_COMPLETION_MATCHES - -/* Set to 1 if you have rl_filename_completion_function */ -#undef HAVE_RL_FILENAME_COMPLETION_FUNCTION - -/* Set to 1 if you have getopt_long() (GNU long options) */ -#undef HAVE_GETOPT_LONG - -/* Set to 1 if you have union semun */ -#undef HAVE_UNION_SEMUN - -/* Set to 1 if you have struct sockaddr_un */ -#undef HAVE_STRUCT_SOCKADDR_UN - -/* Set to 1 if type "long int" works and is 64 bits */ -#undef HAVE_LONG_INT_64 - -/* Set to 1 if type "long long int" works and is 64 bits */ -#undef HAVE_LONG_LONG_INT_64 - -/* Set to 1 if type "long long int" constants should be suffixed by LL */ -#undef HAVE_LL_CONSTANTS - -/* Define this as the appropriate snprintf format for 64-bit ints, if any */ -#undef INT64_FORMAT - -/* - * We need a #define symbol for sizeof(Datum) for use in some #if tests. - */ -#undef SIZEOF_DATUM - -/* - * These must be defined as the alignment requirement (NOT the size) of - * each of the basic C data types (except char, which we assume has align 1). - * MAXIMUM_ALIGNOF is the largest alignment requirement for any C data type. - * ALIGNOF_LONG_LONG_INT need only be defined if HAVE_LONG_LONG_INT_64 is. - */ -#undef ALIGNOF_SHORT -#undef ALIGNOF_INT -#undef ALIGNOF_LONG -#undef ALIGNOF_LONG_LONG_INT -#undef ALIGNOF_DOUBLE -#undef MAXIMUM_ALIGNOF - -/* Define as the type of the 3rd argument to accept() */ -#undef ACCEPT_TYPE_ARG3 - -/* Define if POSIX signal interface is available */ -#undef HAVE_POSIX_SIGNALS - -/* Define if C++ compiler accepts "using namespace std" */ -#undef HAVE_NAMESPACE_STD - -/* Define if C++ compiler accepts "#include " */ -#undef HAVE_CXX_STRING_HEADER - -/* Define if you have the optreset variable */ -#undef HAVE_INT_OPTRESET - -/* Define if you have strtoll() */ -#undef HAVE_STRTOLL - -/* Define if you have strtoq() */ -#undef HAVE_STRTOQ - -/* If strtoq() exists, rename it to the more standard strtoll() */ -#if defined(HAVE_LONG_LONG_INT_64) && !defined(HAVE_STRTOLL) && defined(HAVE_STRTOQ) -# define strtoll strtoq -# define HAVE_STRTOLL 1 -#endif - -/* Define if you have strtoull() */ -#undef HAVE_STRTOULL - -/* Define if you have strtouq() */ -#undef HAVE_STRTOUQ - -/* If strtouq() exists, rename it to the more standard strtoull() */ -#if defined(HAVE_LONG_LONG_INT_64) && !defined(HAVE_STRTOULL) && defined(HAVE_STRTOUQ) -# define strtoull strtouq -# define HAVE_STRTOULL 1 -#endif - -/* Define if you have atexit() */ -#undef HAVE_ATEXIT - -/* Define if you have on_exit() */ -#undef HAVE_ON_EXIT - -/* - *------------------------------------------------------------------------ - * Part 4: pull in system-specific declarations. - * - * This is still configure's responsibility, because it picks where - * the "os.h" symlink points... - *------------------------------------------------------------------------ - */ - -/* - * Pull in OS-specific declarations (using link created by configure) - */ - -#include "os.h" - -/* - * The following is used as the arg list for signal handlers. Any ports - * that take something other than an int argument should override this in - * the port-specific os.h file. Note that variable names are required - * because it is used in both the prototypes as well as the definitions. - * Note also the long name. We expect that this won't collide with - * other names causing compiler warnings. - */ - -#ifndef SIGNAL_ARGS -#define SIGNAL_ARGS int postgres_signal_arg -#endif - - -#endif /* CONFIG_H */ diff --git a/src/include/config.h.win32 b/src/include/config.h.win32 deleted file mode 100644 index e8323b77364..00000000000 --- a/src/include/config.h.win32 +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Parts of config.h that you get with autoconf on other systems - */ -#define PG_VERSION "7.2.0" -#define PG_VERSION_STR "7.2.0 (win32)" - -#define SYSCONFDIR "" - -#define DEF_PGPORT 5432 -#define DEF_PGPORT_STR "5432" - -#define MAXIMUM_ALIGNOF 4 -#define ACCEPT_TYPE_ARG3 int - -#define MAXPGPATH 1024 - -#define BLCKSZ 8192 - -#define INDEX_MAX_KEYS 16 - -#define HAVE_ATEXIT -#define HAVE_MEMMOVE - -#define HAVE_CXX_STRING_HEADER -#define HAVE_NAMESPACE_STD diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in new file mode 100644 index 00000000000..c0984313e1e --- /dev/null +++ b/src/include/pg_config.h.in @@ -0,0 +1,717 @@ +/* + * PostgreSQL configuration-settings file. + * + * pg_config.h.in is processed by configure to produce pg_config.h. + * + * If you want to modify any of the tweakable settings in Part 2 + * of this file, you can do it in pg_config.h.in before running configure, + * or in pg_config.h afterwards. Of course, if you edit pg_config.h, then your + * changes will be overwritten the next time you run configure. + * + * $Id: pg_config.h.in,v 1.1 2001/08/24 14:07:49 petere Exp $ + */ + +#ifndef PG_CONFIG_H +#define PG_CONFIG_H + + +/* + *------------------------------------------------------------------------ + * Part 1: feature symbols and limits that are set by configure based on + * user-supplied switches. This is first so that stuff in Part 2 can + * depend on these values. + * + * Beware of "fixing" configure-time mistakes by editing these values, + * since configure may have inserted the settings in other files as well + * as here. Best to rerun configure if you forgot --enable-multibyte + * or whatever. + *------------------------------------------------------------------------ + */ + +/* The version number is actually hard-coded into configure.in */ +#undef PG_VERSION +/* A canonical string containing the version number, platform, and C compiler */ +#undef PG_VERSION_STR + +/* Set to 1 if you want LOCALE support (--enable-locale) */ +#undef USE_LOCALE + +/* Set to 1 if you want cyrillic recode (--enable-recode) */ +#undef CYR_RECODE + +/* Set to 1 if you want to use multibyte characters (--enable-multibyte) */ +#undef MULTIBYTE + +/* Set to 1 if you want Unicode conversion support (--enable-uniconv) */ +#undef UNICODE_CONVERSION + +/* Set to 1 if you want ASSERT checking (--enable-cassert) */ +#undef USE_ASSERT_CHECKING + +/* Set to 1 to use syslog() to write postmaster log (--enable-syslog) */ +#undef ENABLE_SYSLOG + +/* Define to build with Kerberos 4 support (--with-krb4[=DIR]) */ +#undef KRB4 + +/* Define to build with Kerberos 5 support (--with-krb5[=DIR]) */ +#undef KRB5 + +/* Kerberos name of the Postgres service principal (--with-krb-srvnam=NAME) */ +#undef PG_KRB_SRVNAM + +/* Define to build with (Open)SSL support (--with-openssl[=DIR]) */ +#undef USE_SSL + +/* + * DEF_PGPORT is the TCP port number on which the Postmaster listens and + * which clients will try to connect to. This is just a default value; + * it can be overridden at postmaster or client startup. It's awfully + * convenient if your clients have the right default compiled in, though. + * (--with-pgport=PORTNUM) + */ +#undef DEF_PGPORT +/* ... and once more as a string constant instead */ +#undef DEF_PGPORT_STR + +/* + * Default soft limit on number of backend server processes per postmaster; + * this is just the default setting for the postmaster's -N switch. + * (--with-maxbackends=N) + */ +#undef DEF_MAXBACKENDS + +/* --enable-pltcl-unknown */ +#undef ENABLE_PLTCL_UNKNOWN + +/* --enable-nls */ +#undef ENABLE_NLS + +/* location of locale files */ +#undef LOCALEDIR + +/* + *------------------------------------------------------------------------ + * Part 2: feature symbols and limits that are user-configurable, but + * only by editing this file ... there's no configure support for them. + * + * Editing this file and doing a full rebuild (and an initdb if noted) + * should be sufficient to change any of these. + *------------------------------------------------------------------------ + */ + +/* + * Hard limit on number of backend server processes per postmaster. + * Increasing this costs about 32 bytes per process slot as of v 6.5. + */ +#define MAXBACKENDS (DEF_MAXBACKENDS > 1024 ? DEF_MAXBACKENDS : 1024) + +/* + * Default number of buffers in shared buffer pool (each of size BLCKSZ). + * This is just the default setting for the postmaster's -B switch. + * Perhaps it ought to be configurable from a configure switch. + * NOTE: default setting corresponds to the minimum number of buffers + * that postmaster.c will allow for the default MaxBackends value. + */ +#define DEF_NBUFFERS (DEF_MAXBACKENDS > 8 ? DEF_MAXBACKENDS * 2 : 16) + +/* + * Size of a disk block --- this also limits the size of a tuple. + * You can set it bigger if you need bigger tuples (although TOAST + * should reduce the need to have large tuples, since fields can now + * be spread across multiple tuples). + * + * The maximum possible value of BLCKSZ is currently 2^15 (32768). + * This is determined by the 15-bit widths of the lp_off and lp_len + * fields in ItemIdData (see include/storage/itemid.h). + * + * CAUTION: changing BLCKSZ requires an initdb. + */ +#define BLCKSZ 8192 + +/* + * RELSEG_SIZE is the maximum number of blocks allowed in one disk file. + * Thus, the maximum size of a single file is RELSEG_SIZE * BLCKSZ; + * relations bigger than that are divided into multiple files. + * + * CAUTION: RELSEG_SIZE * BLCKSZ must be less than your OS' limit on file + * size. This is typically 2Gb or 4Gb in a 32-bit operating system. By + * default, we make the limit 1Gb to avoid any possible integer-overflow + * problems within the OS. A limit smaller than necessary only means we + * divide a large relation into more chunks than necessary, so it seems + * best to err in the direction of a small limit. (Besides, a power-of-2 + * value saves a few cycles in md.c.) + * + * CAUTION: changing RELSEG_SIZE requires an initdb. + */ +#define RELSEG_SIZE (0x40000000 / BLCKSZ) + +/* + * Maximum number of columns in an index and maximum number of arguments + * to a function. They must be the same value. + * + * The minimum value is 8 (index creation uses 8-argument functions). + * There is no specific upper limit, although large values will waste + * system-table space and processing time. + * + * CAUTION: changing these requires an initdb. + * + * BTW: if you need to call dynamically-loaded old-style C functions that + * have more than 16 arguments, you will also need to add cases to the + * switch statement in fmgr_oldstyle() in src/backend/utils/fmgr/fmgr.c. + * But consider converting such functions to new-style instead... + */ +#define INDEX_MAX_KEYS 16 +#define FUNC_MAX_ARGS INDEX_MAX_KEYS + +/* + * System default value for pg_attribute.attstattarget + */ +#define DEFAULT_ATTSTATTARGET 10 + +/* + * Define this to make libpgtcl's "pg_result -assign" command process C-style + * backslash sequences in returned tuple data and convert Postgres array + * attributes into Tcl lists. CAUTION: this conversion is *wrong* unless + * you install the routines in contrib/string/string_io to make the backend + * produce C-style backslash sequences in the first place. + */ +/* #define TCL_ARRAYS */ + +/* + * User locks are handled totally on the application side as long term + * cooperative locks which extend beyond the normal transaction boundaries. + * Their purpose is to indicate to an application that someone is `working' + * on an item. Define this flag to enable user locks. You will need the + * loadable module user-locks.c to use this feature. + */ +#define USER_LOCKS + +/* + * Define this if you want psql to _always_ ask for a username and a password + * for password authentication. + */ +/* #define PSQL_ALWAYS_GET_PASSWORDS */ + +/* + * Define this if you want to allow the lo_import and lo_export SQL functions + * to be executed by ordinary users. By default these functions are only + * available to the Postgres superuser. CAUTION: these functions are + * SECURITY HOLES since they can read and write any file that the Postgres + * backend has permission to access. If you turn this on, don't say we + * didn't warn you. + */ +/* #define ALLOW_DANGEROUS_LO_FUNCTIONS */ + +/* + * Use btree bulkload code: + * this code is moderately slow (~10% slower) compared to the regular + * btree (insertion) build code on sorted or well-clustered data. on + * random data, however, the insertion build code is unusable -- the + * difference on a 60MB heap is a factor of 15 because the random + * probes into the btree thrash the buffer pool. + * + * Great thanks to Paul M. Aoki (aoki@CS.Berkeley.EDU) + */ +#define FASTBUILD /* access/nbtree/nbtsort.c */ + +/* + * MAXPGPATH: standard size of a pathname buffer in Postgres (hence, + * maximum usable pathname length is one less). + * + * We'd use a standard system header symbol for this, if there weren't + * so many to choose from: MAXPATHLEN, _POSIX_PATH_MAX, MAX_PATH, PATH_MAX + * are all defined by different "standards", and often have different + * values on the same platform! So we just punt and use a reasonably + * generous setting here. + */ +#define MAXPGPATH 1024 + +/* + * DEFAULT_MAX_EXPR_DEPTH: default value of max_expr_depth SET variable. + */ +#define DEFAULT_MAX_EXPR_DEPTH 10000 + +/* + * PG_SOMAXCONN: maximum accept-queue length limit passed to listen(2). + * You'd think we should use SOMAXCONN from , but on many + * systems that symbol is much smaller than the kernel's actual limit. + * In any case, this symbol need be twiddled only if you have a kernel + * that refuses large limit values, rather than silently reducing the + * value to what it can handle (which is what most if not all Unixen do). + */ +#define PG_SOMAXCONN 10000 + +/* + * You can try changing this if you have a machine with bytes of another + * size, but no guarantee... + */ +#define BITS_PER_BYTE 8 + +/* + * Define this if your operating system supports AF_UNIX family sockets. + */ +#if !defined(__QNX__) && !defined(__BEOS__) +# define HAVE_UNIX_SOCKETS 1 +#endif + +/* + * This is the default directory in which AF_UNIX socket files are placed. + * Caution: changing this risks breaking your existing client applications, + * which are likely to continue to look in the old directory. But if you + * just hate the idea of sockets in /tmp, here's where to twiddle it. + * You can also override this at runtime with the postmaster's -k switch. + */ +#define DEFAULT_PGSOCKET_DIR "/tmp" + + +/* + *------------------------------------------------------------------------ + * These hand-configurable symbols are for enabling debugging code, + * not for controlling user-visible features or resource limits. + *------------------------------------------------------------------------ + */ + +/* Define this to cause pfree()'d memory to be cleared immediately, + * to facilitate catching bugs that refer to already-freed values. + * XXX For 7.1 development, define this automatically if --enable-cassert. + * In the long term it probably doesn't need to be on by default. + */ +#ifdef USE_ASSERT_CHECKING +#define CLOBBER_FREED_MEMORY +#endif + +/* Define this to check memory allocation errors (scribbling on more + * bytes than were allocated). + * XXX For 7.1 development, define this automatically if --enable-cassert. + * In the long term it probably doesn't need to be on by default. + */ +#ifdef USE_ASSERT_CHECKING +#define MEMORY_CONTEXT_CHECKING +#endif + +/* Define this to force all parse and plan trees to be passed through + * copyObject(), to facilitate catching errors and omissions in copyObject(). + */ +/* #define COPY_PARSE_PLAN_TREES */ + +/* Enable debugging print statements in the date/time support routines. */ +/* #define DATEDEBUG */ + +/* Enable debugging print statements for lock-related operations. */ +/* #define LOCK_DEBUG */ + +/* + * Other debug #defines (documentation, anyone?) + */ +/* #define IPORTAL_DEBUG */ +/* #define HEAPDEBUGALL */ +/* #define ISTRATDEBUG */ +/* #define ACLDEBUG */ +/* #define RTDEBUG */ +/* #define GISTDEBUG */ + +/* + * defining unsafe floats will make float4 and float8 ops faster + * by suppressing overflow/underflow checks. + */ +/* #define UNSAFE_FLOATS */ + + +/* + *------------------------------------------------------------------------ + * Part 3: system configuration information that is auto-detected by + * configure. In theory you shouldn't have to touch any of this stuff + * by hand. In the real world, configure might get it wrong... + *------------------------------------------------------------------------ + */ + +/* Define const as empty if your compiler doesn't grok const. */ +#undef const + +/* Define as your compiler's spelling of "inline", or empty if no inline. */ +#undef inline + +/* Define as empty if the C compiler doesn't understand "signed". */ +#undef signed + +/* Define as empty if the C compiler doesn't understand "volatile". */ +#undef volatile + +/* Define if your cpp understands the ANSI stringizing operators in macros */ +#undef HAVE_STRINGIZE + +/* Set to 1 if you have */ +#undef HAVE_CRYPT_H + +/* Set to 1 if you have */ +#undef HAVE_DLD_H + +/* Set to 1 if you have */ +#undef HAVE_ENDIAN_H + +/* Set to 1 if you have */ +#undef HAVE_FP_CLASS_H + +/* Set to 1 if you have */ +#undef HAVE_GETOPT_H + +/* Set to 1 if you have */ +#undef HAVE_HISTORY_H + +/* Set to 1 if you have */ +#undef HAVE_IEEEFP_H + +/* Set to 1 if you have */ +#undef HAVE_NETINET_TCP_H + +/* Set to 1 if you have */ +#undef HAVE_READLINE_H + +/* Set to 1 if you have */ +#undef HAVE_READLINE_HISTORY_H + +/* Set to 1 if you have */ +#undef HAVE_READLINE_READLINE_H + +/* Set to 1 if you have */ +#undef HAVE_SYS_IPC_H + +/* Set to 1 if you have */ +#undef HAVE_SYS_SELECT_H + +/* Set to 1 if you have */ +#undef HAVE_SYS_UN_H + +/* Set to 1 if you have */ +#undef HAVE_SYS_SEM_H + +/* Set to 1 if you have */ +#undef HAVE_SYS_SHM_H + +/* Set to 1 if you have */ +#undef HAVE_KERNEL_OS_H + +/* Set to 1 if you have */ +#undef HAVE_SUPPORTDEFS_H + +/* Set to 1 if you have */ +#undef HAVE_KERNEL_IMAGE_H + +/* Set to 1 if you have */ +#undef HAVE_TERMIOS_H + +/* Set to 1 if you have */ +#undef HAVE_SYS_PSTAT_H + +/* Define if string.h and strings.h may both be included */ +#undef STRING_H_WITH_STRINGS_H + +/* Define if you have the setproctitle function. */ +#undef HAVE_SETPROCTITLE + +/* Define if you have the pstat function. */ +#undef HAVE_PSTAT + +/* Define if the PS_STRINGS thing exists. */ +#undef HAVE_PS_STRINGS + +/* Define if you have the stricmp function. */ +#undef HAVE_STRICMP + +/* Set to 1 if you have history functions (either in libhistory or libreadline) */ +#undef HAVE_HISTORY_FUNCTIONS + +/* Set to 1 if you have */ +#undef HAVE_PWD_H + +/* Set to 1 if you have gettimeofday(a) instead of gettimeofday(a,b) */ +#undef GETTIMEOFDAY_1ARG +#ifdef GETTIMEOFDAY_1ARG +# define gettimeofday(a,b) gettimeofday(a) +#endif + +/* Set to 1 if you have snprintf() in the C library */ +#undef HAVE_SNPRINTF + +/* Set to 1 if your standard system headers declare snprintf() */ +#undef HAVE_SNPRINTF_DECL + +/* Set to 1 if you have vsnprintf() in the C library */ +#undef HAVE_VSNPRINTF + +/* Set to 1 if your standard system headers declare vsnprintf() */ +#undef HAVE_VSNPRINTF_DECL + +/* Set to 1 if you have strerror() */ +#undef HAVE_STRERROR + +/* Set to 1 if you have isinf() */ +#undef HAVE_ISINF +#ifndef HAVE_ISINF +extern int isinf(double x); +#endif + +/* + * These are all related to port/isinf.c + */ +#undef HAVE_FPCLASS +#undef HAVE_FP_CLASS +#undef HAVE_FP_CLASS_H +#undef HAVE_FP_CLASS_D +#undef HAVE_CLASS + +/* Set to 1 if you have gethostname() */ +#undef HAVE_GETHOSTNAME +#ifndef HAVE_GETHOSTNAME +extern int gethostname(char *name, int namelen); +#endif + +/* Set to 1 if struct tm has a tm_zone member */ +#undef HAVE_TM_ZONE + +/* Set to 1 if you have int timezone. + * NOTE: if both tm_zone and a global timezone variable exist, + * using the tm_zone field should probably be preferred, + * since global variables are inherently not thread-safe. + */ +#undef HAVE_INT_TIMEZONE + +/* Set to 1 if you have cbrt() */ +#undef HAVE_CBRT + +/* Set to 1 if you have inet_aton() */ +#undef HAVE_INET_ATON + +#ifndef HAVE_INET_ATON +# include +# include +# include +extern int inet_aton(const char *cp, struct in_addr * addr); +#endif + +/* Set to 1 if you have fcvt() */ +#undef HAVE_FCVT + +/* Set to 1 if you have rint() */ +#undef HAVE_RINT + +/* Set to 1 if you have finite() */ +#undef HAVE_FINITE + +/* Set to 1 if you have memmove() */ +#undef HAVE_MEMMOVE + +/* Set to 1 if you have sigsetjmp() */ +#undef HAVE_SIGSETJMP + +/* + * When there is no sigsetjmp, its functionality is provided by plain + * setjmp. Incidentally, nothing provides setjmp's functionality in + * that case. + */ +#ifndef HAVE_SIGSETJMP +# define sigjmp_buf jmp_buf +# define sigsetjmp(x,y) setjmp(x) +# define siglongjmp longjmp +#endif + +/* Set to 1 if you have sysconf() */ +#undef HAVE_SYSCONF + +/* Set to 1 if you have getrusage() */ +#undef HAVE_GETRUSAGE + +/* Set to 1 if you have waitpid() */ +#undef HAVE_WAITPID + +/* Set to 1 if you have setsid() */ +#undef HAVE_SETSID + +/* Set to 1 if you have sigprocmask() */ +#undef HAVE_SIGPROCMASK + +/* Set to 1 if you have sigprocmask() */ +#undef HAVE_STRCASECMP +#ifndef HAVE_STRCASECMP +extern int strcasecmp(char *s1, char *s2); +#endif + +/* Set to 1 if you have strtol() */ +#undef HAVE_STRTOL + +/* Set to 1 if you have strtoul() */ +#undef HAVE_STRTOUL + +/* Set to 1 if you have strdup() */ +#undef HAVE_STRDUP +#ifndef HAVE_STRDUP +extern char *strdup(char const *); +#endif + +/* Set to 1 if you have random() */ +#undef HAVE_RANDOM +#ifndef HAVE_RANDOM +extern long random(void); +#endif + +/* Set to 1 if you have srandom() */ +#undef HAVE_SRANDOM +#ifndef HAVE_SRANDOM +extern void srandom(unsigned int seed); +#endif + +/* The random() function is expected to yield values 0 .. MAX_RANDOM_VALUE */ +/* Currently, all known implementations yield 0..2^31-1, so we just hardwire + * this constant. We could do a configure test if it proves to be necessary. + * CAUTION: Think not to replace this with RAND_MAX. RAND_MAX defines the + * maximum value of the older rand() function, which is often different from + * --- and considerably inferior to --- random(). + */ +#define MAX_RANDOM_VALUE (0x7FFFFFFF) + +/* Define if you have dlopen() */ +#undef HAVE_DLOPEN + +/* Define if you have fdatasync() */ +#undef HAVE_FDATASYNC + +/* Define if the standard header unistd.h declares fdatasync() */ +#undef HAVE_FDATASYNC_DECL + +#if defined(HAVE_FDATASYNC) && !defined(HAVE_FDATASYNC_DECL) +extern int fdatasync(int fildes); +#endif + +/* Set to 1 if you have libz.a */ +#undef HAVE_LIBZ + +/* Set to 1 if you have libreadline.a */ +#undef HAVE_LIBREADLINE + +/* Set to 1 if you have libhistory.a */ +#undef HAVE_LIBHISTORY + +/* Set to 1 if your libreadline defines rl_completion_append_character */ +#undef HAVE_RL_COMPLETION_APPEND_CHARACTER + +/* Set to 1 if you have rl_completion_matches */ +#undef HAVE_RL_COMPLETION_MATCHES + +/* Set to 1 if you have rl_filename_completion_function */ +#undef HAVE_RL_FILENAME_COMPLETION_FUNCTION + +/* Set to 1 if you have getopt_long() (GNU long options) */ +#undef HAVE_GETOPT_LONG + +/* Set to 1 if you have union semun */ +#undef HAVE_UNION_SEMUN + +/* Set to 1 if you have struct sockaddr_un */ +#undef HAVE_STRUCT_SOCKADDR_UN + +/* Set to 1 if type "long int" works and is 64 bits */ +#undef HAVE_LONG_INT_64 + +/* Set to 1 if type "long long int" works and is 64 bits */ +#undef HAVE_LONG_LONG_INT_64 + +/* Set to 1 if type "long long int" constants should be suffixed by LL */ +#undef HAVE_LL_CONSTANTS + +/* Define this as the appropriate snprintf format for 64-bit ints, if any */ +#undef INT64_FORMAT + +/* + * We need a #define symbol for sizeof(Datum) for use in some #if tests. + */ +#undef SIZEOF_DATUM + +/* + * These must be defined as the alignment requirement (NOT the size) of + * each of the basic C data types (except char, which we assume has align 1). + * MAXIMUM_ALIGNOF is the largest alignment requirement for any C data type. + * ALIGNOF_LONG_LONG_INT need only be defined if HAVE_LONG_LONG_INT_64 is. + */ +#undef ALIGNOF_SHORT +#undef ALIGNOF_INT +#undef ALIGNOF_LONG +#undef ALIGNOF_LONG_LONG_INT +#undef ALIGNOF_DOUBLE +#undef MAXIMUM_ALIGNOF + +/* Define as the type of the 3rd argument to accept() */ +#undef ACCEPT_TYPE_ARG3 + +/* Define if POSIX signal interface is available */ +#undef HAVE_POSIX_SIGNALS + +/* Define if C++ compiler accepts "using namespace std" */ +#undef HAVE_NAMESPACE_STD + +/* Define if C++ compiler accepts "#include " */ +#undef HAVE_CXX_STRING_HEADER + +/* Define if you have the optreset variable */ +#undef HAVE_INT_OPTRESET + +/* Define if you have strtoll() */ +#undef HAVE_STRTOLL + +/* Define if you have strtoq() */ +#undef HAVE_STRTOQ + +/* If strtoq() exists, rename it to the more standard strtoll() */ +#if defined(HAVE_LONG_LONG_INT_64) && !defined(HAVE_STRTOLL) && defined(HAVE_STRTOQ) +# define strtoll strtoq +# define HAVE_STRTOLL 1 +#endif + +/* Define if you have strtoull() */ +#undef HAVE_STRTOULL + +/* Define if you have strtouq() */ +#undef HAVE_STRTOUQ + +/* If strtouq() exists, rename it to the more standard strtoull() */ +#if defined(HAVE_LONG_LONG_INT_64) && !defined(HAVE_STRTOULL) && defined(HAVE_STRTOUQ) +# define strtoull strtouq +# define HAVE_STRTOULL 1 +#endif + +/* Define if you have atexit() */ +#undef HAVE_ATEXIT + +/* Define if you have on_exit() */ +#undef HAVE_ON_EXIT + +/* + *------------------------------------------------------------------------ + * Part 4: pull in system-specific declarations. + * + * This is still configure's responsibility, because it picks where + * the "pg_config_os.h" symlink points... + *------------------------------------------------------------------------ + */ + +/* + * Pull in OS-specific declarations (using link created by configure) + */ + +#include "pg_config_os.h" + +/* + * The following is used as the arg list for signal handlers. Any ports + * that take something other than an int argument should override this in + * the port-specific pg_config_os.h file. Note that variable names are required + * because it is used in both the prototypes as well as the definitions. + * Note also the long name. We expect that this won't collide with + * other names causing compiler warnings. + */ + +#ifndef SIGNAL_ARGS +#define SIGNAL_ARGS int postgres_signal_arg +#endif + + +#endif /* PG_CONFIG_H */ diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 new file mode 100644 index 00000000000..b3977e90c24 --- /dev/null +++ b/src/include/pg_config.h.win32 @@ -0,0 +1,25 @@ +/* + * Parts of pg_config.h that you get with autoconf on other systems + */ +#define PG_VERSION "7.2" +#define PG_VERSION_STR "7.2 (win32)" + +#define SYSCONFDIR "" + +#define DEF_PGPORT 5432 +#define DEF_PGPORT_STR "5432" + +#define MAXIMUM_ALIGNOF 4 +#define ACCEPT_TYPE_ARG3 int + +#define MAXPGPATH 1024 + +#define BLCKSZ 8192 + +#define INDEX_MAX_KEYS 16 + +#define HAVE_ATEXIT +#define HAVE_MEMMOVE + +#define HAVE_CXX_STRING_HEADER +#define HAVE_NAMESPACE_STD diff --git a/src/interfaces/ecpg/lib/connect.c b/src/interfaces/ecpg/lib/connect.c index 2618cc37ed8..e70299dc5f4 100644 --- a/src/interfaces/ecpg/lib/connect.c +++ b/src/interfaces/ecpg/lib/connect.c @@ -1,3 +1,7 @@ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/connect.c,v 1.11 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" + #include "ecpgtype.h" #include "ecpglib.h" #include "ecpgerrno.h" diff --git a/src/interfaces/ecpg/lib/data.c b/src/interfaces/ecpg/lib/data.c index 50640ba1a46..1f6a86f16c9 100644 --- a/src/interfaces/ecpg/lib/data.c +++ b/src/interfaces/ecpg/lib/data.c @@ -1,4 +1,6 @@ -#include "config.h" +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/data.c,v 1.14 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" #include #include diff --git a/src/interfaces/ecpg/lib/descriptor.c b/src/interfaces/ecpg/lib/descriptor.c index 07f12c5f2e2..1312b22e474 100644 --- a/src/interfaces/ecpg/lib/descriptor.c +++ b/src/interfaces/ecpg/lib/descriptor.c @@ -1,4 +1,6 @@ -#include "config.h" +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/descriptor.c,v 1.15 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" #include "ecpgtype.h" #include "ecpglib.h" diff --git a/src/interfaces/ecpg/lib/error.c b/src/interfaces/ecpg/lib/error.c index 72b005bb9ac..c16fb8395a0 100644 --- a/src/interfaces/ecpg/lib/error.c +++ b/src/interfaces/ecpg/lib/error.c @@ -1,3 +1,7 @@ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/error.c,v 1.9 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" + #include #include "ecpgerrno.h" diff --git a/src/interfaces/ecpg/lib/execute.c b/src/interfaces/ecpg/lib/execute.c index c9b66bb36f0..3238fd59bb9 100644 --- a/src/interfaces/ecpg/lib/execute.c +++ b/src/interfaces/ecpg/lib/execute.c @@ -1,4 +1,5 @@ -/* Copyright comment */ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.22 2001/08/24 14:07:49 petere Exp $ */ + /* * The aim is to get a simpler inteface to the database routines. * All the tidieous messing around with tuples is supposed to be hidden @@ -12,7 +13,7 @@ /* Taken over as part of PostgreSQL by Michael Meskes on Feb. 5th, 1998 */ -#include "config.h" +#include "postgres_fe.h" #include #include @@ -1035,7 +1036,7 @@ ECPGdo(int lineno, const char *connection_name, char *query,...) * * Copyright (c) 2000, Christof Petig * - * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.21 2001/08/19 09:21:44 meskes Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c,v 1.22 2001/08/24 14:07:49 petere Exp $ */ PGconn *ECPG_internal_get_connection(char *name); diff --git a/src/interfaces/ecpg/lib/memory.c b/src/interfaces/ecpg/lib/memory.c index e6ef531128d..d7ff8799635 100644 --- a/src/interfaces/ecpg/lib/memory.c +++ b/src/interfaces/ecpg/lib/memory.c @@ -1,3 +1,7 @@ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/memory.c,v 1.4 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" + #include "ecpgtype.h" #include "ecpglib.h" #include "ecpgerrno.h" diff --git a/src/interfaces/ecpg/lib/misc.c b/src/interfaces/ecpg/lib/misc.c index c0b585cf1db..4a93be4b905 100644 --- a/src/interfaces/ecpg/lib/misc.c +++ b/src/interfaces/ecpg/lib/misc.c @@ -1,3 +1,7 @@ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/misc.c,v 1.4 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" + #include #include "ecpgtype.h" #include "ecpglib.h" diff --git a/src/interfaces/ecpg/lib/prepare.c b/src/interfaces/ecpg/lib/prepare.c index 50900048752..f1c164c7f45 100644 --- a/src/interfaces/ecpg/lib/prepare.c +++ b/src/interfaces/ecpg/lib/prepare.c @@ -1,3 +1,7 @@ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/prepare.c,v 1.6 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" + #include #include "ecpgtype.h" diff --git a/src/interfaces/ecpg/lib/typename.c b/src/interfaces/ecpg/lib/typename.c index a27aea47438..d41ca583909 100644 --- a/src/interfaces/ecpg/lib/typename.c +++ b/src/interfaces/ecpg/lib/typename.c @@ -1,4 +1,6 @@ -#include "config.h" +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/typename.c,v 1.18 2001/08/24 14:07:49 petere Exp $ */ + +#include "postgres_fe.h" #include #include "ecpgtype.h" diff --git a/src/interfaces/libpq++/pgconnection.h b/src/interfaces/libpq++/pgconnection.h index 379f8d023e7..7d8ca2c52bf 100644 --- a/src/interfaces/libpq++/pgconnection.h +++ b/src/interfaces/libpq++/pgconnection.h @@ -13,7 +13,7 @@ * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pgconnection.h,v 1.12 2001/07/11 22:12:43 momjian Exp $ + * $Id: pgconnection.h,v 1.13 2001/08/24 14:07:49 petere Exp $ * *------------------------------------------------------------------------- */ @@ -22,11 +22,11 @@ #define PGCONNECTION_H extern "C" { -#include "config.h" +#include "pg_config.h" } /* We assume that the C++ compiler will have these keywords, even though - * config.h may have #define'd them to empty because C compiler doesn't. + * pg_config.h may have #define'd them to empty because C compiler doesn't. */ #undef const #undef inline diff --git a/src/interfaces/odbc/bind.c b/src/interfaces/odbc/bind.c index 469edb6c2ce..2fc340907a3 100644 --- a/src/interfaces/odbc/bind.c +++ b/src/interfaces/odbc/bind.c @@ -13,11 +13,8 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "bind.h" + #include "environ.h" #include "statement.h" #include "qresult.h" diff --git a/src/interfaces/odbc/columninfo.c b/src/interfaces/odbc/columninfo.c index 1c635945074..d9a22a163a1 100644 --- a/src/interfaces/odbc/columninfo.c +++ b/src/interfaces/odbc/columninfo.c @@ -13,6 +13,7 @@ */ #include "columninfo.h" + #include "connection.h" #include "socket.h" #include diff --git a/src/interfaces/odbc/connection.c b/src/interfaces/odbc/connection.c index 54e448892bb..3e6c89863ce 100644 --- a/src/interfaces/odbc/connection.c +++ b/src/interfaces/odbc/connection.c @@ -14,12 +14,9 @@ */ /* Multibyte support Eiji Tokuya 2001-03-15 */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "connection.h" #include "environ.h" -#include "connection.h" #include "socket.h" #include "statement.h" #include "qresult.h" diff --git a/src/interfaces/odbc/connection.h b/src/interfaces/odbc/connection.h index 11379e4f2ff..4da6a7b7a85 100644 --- a/src/interfaces/odbc/connection.h +++ b/src/interfaces/odbc/connection.h @@ -9,15 +9,11 @@ #ifndef __CONNECTION_H__ #define __CONNECTION_H__ +#include "psqlodbc.h" + #include #include -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "psqlodbc.h" - #ifndef WIN32 #include "iodbc.h" #include "isql.h" diff --git a/src/interfaces/odbc/convert.c b/src/interfaces/odbc/convert.c index 12d5ddf1b8a..59dffbdcf9e 100644 --- a/src/interfaces/odbc/convert.c +++ b/src/interfaces/odbc/convert.c @@ -17,16 +17,12 @@ */ /* Multibyte support Eiji Tokuya 2001-03-15 */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "convert.h" #include #include #include -#include "psqlodbc.h" - #ifdef MULTIBYTE #include "multibyte.h" #endif @@ -44,7 +40,6 @@ #include #include #include -#include "convert.h" #include "statement.h" #include "qresult.h" #include "bind.h" diff --git a/src/interfaces/odbc/convert.h b/src/interfaces/odbc/convert.h index fed2239e3b1..4a142db3d5c 100644 --- a/src/interfaces/odbc/convert.h +++ b/src/interfaces/odbc/convert.h @@ -11,6 +11,8 @@ #include "psqlodbc.h" +#include "isql.h" + /* copy_and_convert results */ #define COPY_OK 0 #define COPY_UNSUPPORTED_TYPE 1 diff --git a/src/interfaces/odbc/dlg_specific.c b/src/interfaces/odbc/dlg_specific.c index c465f3fc280..d28fcf966c4 100644 --- a/src/interfaces/odbc/dlg_specific.c +++ b/src/interfaces/odbc/dlg_specific.c @@ -17,9 +17,7 @@ */ /* Multibyte support Eiji Tokuya 2001-03-15 */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #ifndef WIN32 #include diff --git a/src/interfaces/odbc/dlg_specific.h b/src/interfaces/odbc/dlg_specific.h index 884fe2e85ce..67f99449754 100644 --- a/src/interfaces/odbc/dlg_specific.h +++ b/src/interfaces/odbc/dlg_specific.h @@ -9,10 +9,6 @@ #ifndef __DLG_SPECIFIC_H__ #define __DLG_SPECIFIC_H__ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #include "connection.h" diff --git a/src/interfaces/odbc/drvconn.c b/src/interfaces/odbc/drvconn.c index 6a8c563fafb..e224cbda5e7 100644 --- a/src/interfaces/odbc/drvconn.c +++ b/src/interfaces/odbc/drvconn.c @@ -12,14 +12,11 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #include #include -#include "psqlodbc.h" #include "connection.h" #ifndef WIN32 diff --git a/src/interfaces/odbc/environ.c b/src/interfaces/odbc/environ.c index 2ea5f28ef45..d21c0540cac 100644 --- a/src/interfaces/odbc/environ.c +++ b/src/interfaces/odbc/environ.c @@ -14,6 +14,7 @@ */ #include "environ.h" + #include "connection.h" #include "dlg_specific.h" #include "statement.h" diff --git a/src/interfaces/odbc/environ.h b/src/interfaces/odbc/environ.h index cc7950ae5ee..6d50fa6b48f 100644 --- a/src/interfaces/odbc/environ.h +++ b/src/interfaces/odbc/environ.h @@ -9,10 +9,6 @@ #ifndef __ENVIRON_H__ #define __ENVIRON_H__ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #ifndef WIN32 diff --git a/src/interfaces/odbc/execute.c b/src/interfaces/odbc/execute.c index 38eabfea6eb..374d700193d 100644 --- a/src/interfaces/odbc/execute.c +++ b/src/interfaces/odbc/execute.c @@ -13,10 +13,6 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #include #include diff --git a/src/interfaces/odbc/gpps.c b/src/interfaces/odbc/gpps.c index 248f8e0fcd3..4b13fbe62e5 100644 --- a/src/interfaces/odbc/gpps.c +++ b/src/interfaces/odbc/gpps.c @@ -21,9 +21,7 @@ #ifndef WIN32 -#if HAVE_CONFIG_H -#include "config.h" /* produced by configure */ -#endif +#include "gpps.h" #include #include @@ -36,7 +34,6 @@ #include #include #include "misc.h" -#include "gpps.h" #include "dlg_specific.h" #ifndef TRUE @@ -286,7 +283,7 @@ WritePrivateProfileString(char *theSection, /* section name */ } -#if 0 +#if NOT_USED /* * Ok. What the hell's the default behaviour for a null input buffer, and null * section name. For now if either are null I ignore the request, until @@ -449,7 +446,7 @@ if (!keyFound) return aReturnLength > 0 ? aReturnLength - 1 : 0; } -#endif +#endif /* NOT_USED */ -#endif +#endif /* not WIN32 */ diff --git a/src/interfaces/odbc/gpps.h b/src/interfaces/odbc/gpps.h index 5bbe10374b2..9dc9d64210a 100644 --- a/src/interfaces/odbc/gpps.h +++ b/src/interfaces/odbc/gpps.h @@ -4,9 +4,7 @@ #ifndef GPPS_H #define GPPS_H -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #ifndef WIN32 #include diff --git a/src/interfaces/odbc/info.c b/src/interfaces/odbc/info.c index 79854d6cd2e..1bc96ac888c 100644 --- a/src/interfaces/odbc/info.c +++ b/src/interfaces/odbc/info.c @@ -16,13 +16,10 @@ *-------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #include #include -#include "psqlodbc.h" #ifndef WIN32 #include "iodbc.h" diff --git a/src/interfaces/odbc/misc.c b/src/interfaces/odbc/misc.c index ae75320bb53..1bfb877cbf7 100644 --- a/src/interfaces/odbc/misc.c +++ b/src/interfaces/odbc/misc.c @@ -12,12 +12,12 @@ *------- */ +#include "psqlodbc.h" + #include #include #include -#include "psqlodbc.h" - #ifndef WIN32 #if HAVE_PWD_H #include @@ -120,10 +120,6 @@ qlog(char *fmt,...) /* Undefine these because windows.h will redefine and cause a warning */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #ifdef WIN32 #undef va_start #undef va_end diff --git a/src/interfaces/odbc/misc.h b/src/interfaces/odbc/misc.h index 5172e491f5d..dc2ef0d5bea 100644 --- a/src/interfaces/odbc/misc.h +++ b/src/interfaces/odbc/misc.h @@ -9,9 +9,7 @@ #ifndef __MISC_H__ #define __MISC_H__ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #ifndef WIN32 #include "gpps.h" diff --git a/src/interfaces/odbc/multibyte.c b/src/interfaces/odbc/multibyte.c index 4d25c0bb1ad..a9c9c2f83bb 100644 --- a/src/interfaces/odbc/multibyte.c +++ b/src/interfaces/odbc/multibyte.c @@ -7,8 +7,8 @@ *-------- */ -#include #include "multibyte.h" +#include int multibyte_client_encoding; /* Multibyte Client Encoding. */ int multibyte_status; /* Multibyte Odds and ends character. */ diff --git a/src/interfaces/odbc/multibyte.h b/src/interfaces/odbc/multibyte.h index c7d8b20d951..43870458e0d 100644 --- a/src/interfaces/odbc/multibyte.h +++ b/src/interfaces/odbc/multibyte.h @@ -3,6 +3,7 @@ * Multibyte library header ( psqlODBC Only ) * */ +#include "psqlodbc.h" /* PostgreSQL client encoding */ #define SQL_ASCII 0 /* SQL/ASCII */ diff --git a/src/interfaces/odbc/odbcapi.c b/src/interfaces/odbc/odbcapi.c index a69c3d1a944..60205c011b6 100644 --- a/src/interfaces/odbc/odbcapi.c +++ b/src/interfaces/odbc/odbcapi.c @@ -26,10 +26,6 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #ifdef WIN32 #undef ODBCVER diff --git a/src/interfaces/odbc/odbcapi30.c b/src/interfaces/odbc/odbcapi30.c index 9902be746df..cee57934df2 100644 --- a/src/interfaces/odbc/odbcapi30.c +++ b/src/interfaces/odbc/odbcapi30.c @@ -18,10 +18,6 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #undef ODBCVER #define ODBCVER 0x0300 diff --git a/src/interfaces/odbc/options.c b/src/interfaces/odbc/options.c index 82b651cdc58..77421b63ebd 100644 --- a/src/interfaces/odbc/options.c +++ b/src/interfaces/odbc/options.c @@ -13,10 +13,6 @@ *-------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #include diff --git a/src/interfaces/odbc/parse.c b/src/interfaces/odbc/parse.c index 8916db2072d..eb0589e4c4b 100644 --- a/src/interfaces/odbc/parse.c +++ b/src/interfaces/odbc/parse.c @@ -22,9 +22,7 @@ */ /* Multibyte support Eiji Tokuya 2001-03-15 */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #include #include diff --git a/src/interfaces/odbc/pgapifunc.h b/src/interfaces/odbc/pgapifunc.h index fda018f61f9..a4aca5f323d 100644 --- a/src/interfaces/odbc/pgapifunc.h +++ b/src/interfaces/odbc/pgapifunc.h @@ -5,9 +5,6 @@ */ #ifndef _PG_API_FUNC_H__ #define _PG_API_FUNC_H__ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include "psqlodbc.h" #include diff --git a/src/interfaces/odbc/pgtypes.c b/src/interfaces/odbc/pgtypes.c index ff640776f8b..fdc38d62a19 100644 --- a/src/interfaces/odbc/pgtypes.c +++ b/src/interfaces/odbc/pgtypes.c @@ -16,13 +16,9 @@ *-------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "pgtypes.h" -#include "psqlodbc.h" #include "dlg_specific.h" -#include "pgtypes.h" #include "statement.h" #include "connection.h" #include "qresult.h" diff --git a/src/interfaces/odbc/psqlodbc.c b/src/interfaces/odbc/psqlodbc.c index 4eabeae5ff3..9851af2ee66 100644 --- a/src/interfaces/odbc/psqlodbc.c +++ b/src/interfaces/odbc/psqlodbc.c @@ -13,10 +13,6 @@ *-------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #include "dlg_specific.h" diff --git a/src/interfaces/odbc/psqlodbc.h b/src/interfaces/odbc/psqlodbc.h index df077106512..542fe7ff596 100644 --- a/src/interfaces/odbc/psqlodbc.h +++ b/src/interfaces/odbc/psqlodbc.h @@ -5,7 +5,7 @@ * * Comments: See "notice.txt" for copyright and license information. * - * $Id: psqlodbc.h,v 1.45 2001/08/18 04:30:47 inoue Exp $ + * $Id: psqlodbc.h,v 1.46 2001/08/24 14:07:50 petere Exp $ * */ @@ -13,7 +13,7 @@ #define __PSQLODBC_H__ #ifdef HAVE_CONFIG_H -#include "config.h" +#include "pg_config.h" #endif #include /* for FILE* pointers: see GLOBAL_VALUES */ diff --git a/src/interfaces/odbc/qresult.h b/src/interfaces/odbc/qresult.h index 7da2a0201ec..29e171bad80 100644 --- a/src/interfaces/odbc/qresult.h +++ b/src/interfaces/odbc/qresult.h @@ -9,11 +9,12 @@ #ifndef __QRESULT_H__ #define __QRESULT_H__ +#include "psqlodbc.h" + #include "connection.h" #include "socket.h" #include "columninfo.h" #include "tuplelist.h" -#include "psqlodbc.h" #include "tuple.h" enum QueryResultCode_ diff --git a/src/interfaces/odbc/results.c b/src/interfaces/odbc/results.c index 098c5581d62..bb1f2975df6 100644 --- a/src/interfaces/odbc/results.c +++ b/src/interfaces/odbc/results.c @@ -15,12 +15,9 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #include -#include "psqlodbc.h" #include "dlg_specific.h" #include "environ.h" #include "connection.h" diff --git a/src/interfaces/odbc/socket.c b/src/interfaces/odbc/socket.c index 243df4a5014..ed3fd2913c6 100644 --- a/src/interfaces/odbc/socket.c +++ b/src/interfaces/odbc/socket.c @@ -12,10 +12,6 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "socket.h" #ifndef WIN32 diff --git a/src/interfaces/odbc/socket.h b/src/interfaces/odbc/socket.h index b4a55e57db6..b24be9504d4 100644 --- a/src/interfaces/odbc/socket.h +++ b/src/interfaces/odbc/socket.h @@ -9,9 +9,7 @@ #ifndef __SOCKET_H__ #define __SOCKET_H__ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "psqlodbc.h" #ifndef WIN32 #include diff --git a/src/interfaces/odbc/statement.c b/src/interfaces/odbc/statement.c index 3ab683d4a04..891f47df831 100644 --- a/src/interfaces/odbc/statement.c +++ b/src/interfaces/odbc/statement.c @@ -12,10 +12,6 @@ *------- */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "statement.h" #include "bind.h" #include "connection.h" diff --git a/src/interfaces/odbc/statement.h b/src/interfaces/odbc/statement.h index 6250a934a5a..571d13edaca 100644 --- a/src/interfaces/odbc/statement.h +++ b/src/interfaces/odbc/statement.h @@ -9,10 +9,6 @@ #ifndef __STATEMENT_H__ #define __STATEMENT_H__ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include "psqlodbc.h" #include "bind.h" diff --git a/src/interfaces/odbc/tuplelist.c b/src/interfaces/odbc/tuplelist.c index 06fd2d44ff8..284ee8ed440 100644 --- a/src/interfaces/odbc/tuplelist.c +++ b/src/interfaces/odbc/tuplelist.c @@ -13,8 +13,8 @@ *-------- */ -#include #include "tuplelist.h" +#include #include "tuple.h" diff --git a/src/interfaces/python/GNUmakefile b/src/interfaces/python/GNUmakefile index e405cf3a9f4..2be8fe1d186 100644 --- a/src/interfaces/python/GNUmakefile +++ b/src/interfaces/python/GNUmakefile @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.10 2001/07/10 16:33:02 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile,v 1.11 2001/08/24 14:07:50 petere Exp $ subdir = src/interfaces/python top_builddir = ../../.. @@ -17,7 +17,6 @@ endif include $(top_srcdir)/src/Makefile.shlib -# (Python also has a config.h file. Be sure to use ours.) override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS) $(python_includespec) all: all-lib diff --git a/src/tools/pginclude/pgrminclude b/src/tools/pginclude/pgrminclude index 60839c15dca..6504aad82a0 100755 --- a/src/tools/pginclude/pgrminclude +++ b/src/tools/pginclude/pgrminclude @@ -4,7 +4,7 @@ trap "rm -f /tmp/$$.c /tmp/$$.o /tmp/$$ /tmp/$$a /tmp/$$b" 0 1 2 3 15 find . \( -name CVS -a -prune \) -o -type f -print | grep -v '\./postgres.h' | -grep -v '\./config.h' | +grep -v '\./pg_config.h' | grep -v '\./c.h' | while read FILE do -- cgit v1.2.3