mirror of https://github.com/postgres/postgres
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.
This commit is contained in:
Peter Eisentraut
parent
7326e78c42
commit
968d7733a1
11
configure.in
11
configure.in
|
|
@ -23,7 +23,7 @@ undefine([infodir])
|
|||
undefine([info])
|
||||
|
||||
AC_PREFIX_DEFAULT(/usr/local/pgsql)
|
||||
AC_CONFIG_HEADER(src/include/config.h)
|
||||
AC_CONFIG_HEADER(src/include/pg_config.h)
|
||||
|
||||
AC_PREREQ(2.13)
|
||||
AC_CONFIG_AUX_DIR(config)
|
||||
|
|
@ -80,8 +80,7 @@ nextstep*) template=nextstep ;;
|
|||
univel) template=univel ;;
|
||||
esac ;;
|
||||
sysv4*) template=svr4 ;;
|
||||
sysv5uw*) template=unixware ;;
|
||||
sysv5*) template=unixware ;;
|
||||
sysv5*) template=unixware ;;
|
||||
ultrix*) template=ultrix4 ;;
|
||||
esac
|
||||
|
||||
|
|
@ -108,7 +107,7 @@ AC_SUBST(PORTNAME)
|
|||
|
||||
AC_LINK_FILES([src/backend/port/dynloader/${template}.c], [src/backend/port/dynloader.c])
|
||||
AC_LINK_FILES([src/backend/port/dynloader/${template}.h], [src/include/dynloader.h])
|
||||
AC_LINK_FILES([src/include/port/${template}.h], [src/include/os.h])
|
||||
AC_LINK_FILES([src/include/port/${template}.h], [src/include/pg_config_os.h])
|
||||
AC_LINK_FILES([src/makefiles/Makefile.${template}], [src/Makefile.port])
|
||||
|
||||
# Pick right test-and-set (TAS) code. Most platforms have inline
|
||||
|
|
@ -941,7 +940,7 @@ AC_TRY_LINK([#include <math.h>],
|
|||
|
||||
dnl Cannot use AC_CHECK_FUNC because sigsetjmp may be a macro
|
||||
dnl (especially on GNU libc)
|
||||
dnl See also comments in config.h.
|
||||
dnl See also comments in pg_config.h.
|
||||
AC_MSG_CHECKING(for sigsetjmp)
|
||||
AC_TRY_LINK([#include <setjmp.h>],
|
||||
[sigjmp_buf x; sigsetjmp(x, 1);],
|
||||
|
|
@ -1204,6 +1203,6 @@ AC_OUTPUT(
|
|||
src/backend/port/Makefile
|
||||
],
|
||||
[
|
||||
# Update timestamp for config.h (see Makefile.global)
|
||||
# Update timestamp for pg_config.h (see Makefile.global)
|
||||
test x"$CONFIG_HEADERS" != x"" && echo >src/include/stamp-h
|
||||
])
|
||||
|
|
|
|||
2
doc/FAQ
2
doc/FAQ
|
|
@ -559,7 +559,7 @@
|
|||
In PostgreSQL 6.5 and up, the default limit is 32 processes. You can
|
||||
increase it by restarting the postmaster with a suitable -N value.
|
||||
With the default configuration you can set -N as large as 1024. If you
|
||||
need more, increase MAXBACKENDS in include/config.h and rebuild. You
|
||||
need more, increase MAXBACKENDS in include/pg_config.h and rebuild. You
|
||||
can set the default value of -N at configuration time, if you like,
|
||||
using configure's --with-maxbackends switch.
|
||||
|
||||
|
|
|
|||
|
|
@ -682,7 +682,7 @@
|
|||
Wert dadurch erhöhen, daß Du den postmaster mit einem entsprechenden
|
||||
-N Wert neu startest. In der Standardkonfiguration kannst Du -N auf
|
||||
maximal 1024 setzen. Falls Du mehr brauchst, erhöhe MAXBACKENDS in
|
||||
include/config.h und kompiliere das Paket neu. Du kannst den
|
||||
include/pg_config.h und kompiliere das Paket neu. Du kannst den
|
||||
Standardwert von -N während der Konfiguration setzen, indem Du
|
||||
--with-maxbackends angibst. Anmerkung: Falls Du -N größer als 32
|
||||
einstellst, solltest Du -B auf einen Wert, höher als 64 setzen. Für
|
||||
|
|
|
|||
|
|
@ -725,7 +725,7 @@
|
|||
can increase it by restarting the <I>postmaster</I> with a suitable
|
||||
<I>-N</I> value. With the default configuration you can set
|
||||
<I>-N</I> as large as 1024. If you need more, increase
|
||||
<SMALL>MAXBACKENDS</SMALL> in <I>include/config.h</I> and rebuild.
|
||||
<SMALL>MAXBACKENDS</SMALL> in <I>include/pg_config.h</I> and rebuild.
|
||||
You can set the default value of <I>-N</I> at configuration time,
|
||||
if you like, using <I>configure's</I> <I>--with-maxbackends</I>
|
||||
switch.</P>
|
||||
|
|
|
|||
|
|
@ -712,7 +712,7 @@ Du mußt die Grenze des postmasters, die festlegt,
|
|||
In Postgres 6.5 sind das normalerweise 32 Prozesse. Du kannst diesen Wert dadurch erhöhen,
|
||||
daß Du den postmaster mit einem entsprechenden <I>-N</I> Wert neu startest.
|
||||
In der Standardkonfiguration kannst Du <I>-N</I> auf maximal 1024 setzen.
|
||||
Falls Du mehr brauchst, erhöhe <I>MAXBACKENDS</I> in <I>include/config.h</I> und
|
||||
Falls Du mehr brauchst, erhöhe <I>MAXBACKENDS</I> in <I>include/pg_config.h</I> und
|
||||
kompiliere das Paket neu.
|
||||
Du kannst den Standardwert von <I>-N</I> während der Konfiguration
|
||||
setzen, indem Du <I>--with-maxbackends</I> angibst.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/indices.sgml,v 1.21 2001/08/21 16:35:59 tgl Exp $ -->
|
||||
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/indices.sgml,v 1.22 2001/08/24 14:07:48 petere Exp $ -->
|
||||
|
||||
<chapter id="indexes">
|
||||
<title id="indexes-title">Indexes</title>
|
||||
|
|
@ -238,7 +238,7 @@ CREATE INDEX test2_mm_idx ON test2 (major, minor);
|
|||
Currently, only the B-tree implementation supports multi-column
|
||||
indexes. Up to 16 columns may be specified. (This limit can be
|
||||
altered when building <productname>Postgres</productname>; see the
|
||||
file <filename>config.h</filename>.)
|
||||
file <filename>pg_config.h</filename>.)
|
||||
</para>
|
||||
|
||||
<para>
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
/* $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 "c.h"
|
||||
|
||||
#include <math.h>
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#if HAVE_FPCLASS /* this is _not_ HAVE_FP_CLASS, and not
|
||||
* typo */
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
/*
|
||||
* PostgreSQL configuration-settings file.
|
||||
*
|
||||
* config.h.in is processed by configure to produce config.h.
|
||||
* 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 config.h.in before running configure,
|
||||
* or in config.h afterwards. Of course, if you edit config.h, then your
|
||||
* 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: config.h.in,v 1.170 2001/08/01 23:52:50 tgl Exp $
|
||||
* $Id: pg_config.h.in,v 1.1 2001/08/24 14:07:49 petere Exp $
|
||||
*/
|
||||
|
||||
#ifndef CONFIG_H
|
||||
#define CONFIG_H
|
||||
#ifndef PG_CONFIG_H
|
||||
#define PG_CONFIG_H
|
||||
|
||||
|
||||
/*
|
||||
|
|
@ -690,7 +690,7 @@ extern int fdatasync(int fildes);
|
|||
* Part 4: pull in system-specific declarations.
|
||||
*
|
||||
* This is still configure's responsibility, because it picks where
|
||||
* the "os.h" symlink points...
|
||||
* the "pg_config_os.h" symlink points...
|
||||
*------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
|
@ -698,12 +698,12 @@ extern int fdatasync(int fildes);
|
|||
* Pull in OS-specific declarations (using link created by configure)
|
||||
*/
|
||||
|
||||
#include "os.h"
|
||||
#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 os.h file. Note that variable names are required
|
||||
* 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.
|
||||
|
|
@ -714,4 +714,4 @@ extern int fdatasync(int fildes);
|
|||
#endif
|
||||
|
||||
|
||||
#endif /* CONFIG_H */
|
||||
#endif /* PG_CONFIG_H */
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
/*
|
||||
* Parts of config.h that you get with autoconf on other systems
|
||||
* Parts of pg_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 PG_VERSION "7.2"
|
||||
#define PG_VERSION_STR "7.2 (win32)"
|
||||
|
||||
#define SYSCONFDIR ""
|
||||
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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 <stdlib.h>
|
||||
#include <string.h>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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 <stdio.h>
|
||||
|
||||
#include "ecpgerrno.h"
|
||||
|
|
|
|||
|
|
@ -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 <meskes@postgresql.org>
|
||||
on Feb. 5th, 1998 */
|
||||
|
||||
#include "config.h"
|
||||
#include "postgres_fe.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <locale.h>
|
||||
|
|
@ -1035,7 +1036,7 @@ ECPGdo(int lineno, const char *connection_name, char *query,...)
|
|||
*
|
||||
* Copyright (c) 2000, Christof Petig <christof.petig@wtal.de>
|
||||
*
|
||||
* $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);
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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 <unistd.h>
|
||||
#include "ecpgtype.h"
|
||||
#include "ecpglib.h"
|
||||
|
|
|
|||
|
|
@ -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 <ctype.h>
|
||||
|
||||
#include "ecpgtype.h"
|
||||
|
|
|
|||
|
|
@ -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 <stdlib.h>
|
||||
#include "ecpgtype.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
|
||||
|
|
|
|||
|
|
@ -13,11 +13,8 @@
|
|||
*-------
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "bind.h"
|
||||
|
||||
#include "environ.h"
|
||||
#include "statement.h"
|
||||
#include "qresult.h"
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
*/
|
||||
|
||||
#include "columninfo.h"
|
||||
|
||||
#include "connection.h"
|
||||
#include "socket.h"
|
||||
#include <stdlib.h>
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -9,15 +9,11 @@
|
|||
#ifndef __CONNECTION_H__
|
||||
#define __CONNECTION_H__
|
||||
|
||||
#include "psqlodbc.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "psqlodbc.h"
|
||||
|
||||
#ifndef WIN32
|
||||
#include "iodbc.h"
|
||||
#include "isql.h"
|
||||
|
|
|
|||
|
|
@ -17,16 +17,12 @@
|
|||
*/
|
||||
/* Multibyte support Eiji Tokuya 2001-03-15 */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
#include "convert.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#include "psqlodbc.h"
|
||||
|
||||
#ifdef MULTIBYTE
|
||||
#include "multibyte.h"
|
||||
#endif
|
||||
|
|
@ -44,7 +40,6 @@
|
|||
#include <time.h>
|
||||
#include <math.h>
|
||||
#include <stdlib.h>
|
||||
#include "convert.h"
|
||||
#include "statement.h"
|
||||
#include "qresult.h"
|
||||
#include "bind.h"
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@
|
|||
|
||||
#include "psqlodbc.h"
|
||||
|
||||
#include "isql.h"
|
||||
|
||||
/* copy_and_convert results */
|
||||
#define COPY_OK 0
|
||||
#define COPY_UNSUPPORTED_TYPE 1
|
||||
|
|
|
|||
|
|
@ -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 <string.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"
|
||||
|
||||
|
|
|
|||
|
|
@ -12,14 +12,11 @@
|
|||
*-------
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
#include "psqlodbc.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "psqlodbc.h"
|
||||
#include "connection.h"
|
||||
|
||||
#ifndef WIN32
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
*/
|
||||
|
||||
#include "environ.h"
|
||||
|
||||
#include "connection.h"
|
||||
#include "dlg_specific.h"
|
||||
#include "statement.h"
|
||||
|
|
|
|||
|
|
@ -9,10 +9,6 @@
|
|||
#ifndef __ENVIRON_H__
|
||||
#define __ENVIRON_H__
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "psqlodbc.h"
|
||||
|
||||
#ifndef WIN32
|
||||
|
|
|
|||
|
|
@ -13,10 +13,6 @@
|
|||
*-------
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "psqlodbc.h"
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
|
|
|||
|
|
@ -21,9 +21,7 @@
|
|||
|
||||
#ifndef WIN32
|
||||
|
||||
#if HAVE_CONFIG_H
|
||||
#include "config.h" /* produced by configure */
|
||||
#endif
|
||||
#include "gpps.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
|
|
@ -36,7 +34,6 @@
|
|||
#include <sys/types.h>
|
||||
#include <string.h>
|
||||
#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 */
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@
|
|||
#ifndef GPPS_H
|
||||
#define GPPS_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
#include "psqlodbc.h"
|
||||
|
||||
#ifndef WIN32
|
||||
#include <sys/types.h>
|
||||
|
|
|
|||
|
|
@ -16,13 +16,10 @@
|
|||
*--------
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
#include "psqlodbc.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include "psqlodbc.h"
|
||||
|
||||
#ifndef WIN32
|
||||
#include "iodbc.h"
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@
|
|||
*-------
|
||||
*/
|
||||
|
||||
#include "psqlodbc.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "psqlodbc.h"
|
||||
|
||||
#ifndef WIN32
|
||||
#if HAVE_PWD_H
|
||||
#include <pwd.h>
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
*--------
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include "multibyte.h"
|
||||
#include <string.h>
|
||||
|
||||
int multibyte_client_encoding; /* Multibyte Client Encoding. */
|
||||
int multibyte_status; /* Multibyte Odds and ends character. */
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
* Multibyte library header ( psqlODBC Only )
|
||||
*
|
||||
*/
|
||||
#include "psqlodbc.h"
|
||||
|
||||
/* PostgreSQL client encoding */
|
||||
#define SQL_ASCII 0 /* SQL/ASCII */
|
||||
|
|
|
|||
|
|
@ -26,10 +26,6 @@
|
|||
*-------
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "psqlodbc.h"
|
||||
#ifdef WIN32
|
||||
#undef ODBCVER
|
||||
|
|
|
|||
|
|
@ -18,10 +18,6 @@
|
|||
*-------
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "psqlodbc.h"
|
||||
#undef ODBCVER
|
||||
#define ODBCVER 0x0300
|
||||
|
|
|
|||
|
|
@ -13,10 +13,6 @@
|
|||
*--------
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "psqlodbc.h"
|
||||
#include <string.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -22,9 +22,7 @@
|
|||
*/
|
||||
/* Multibyte support Eiji Tokuya 2001-03-15 */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
#include "psqlodbc.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.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 <stdio.h>
|
||||
|
|
|
|||
|
|
@ -16,13 +16,9 @@
|
|||
*--------
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "psqlodbc.h"
|
||||
#include "dlg_specific.h"
|
||||
#include "pgtypes.h"
|
||||
|
||||
#include "dlg_specific.h"
|
||||
#include "statement.h"
|
||||
#include "connection.h"
|
||||
#include "qresult.h"
|
||||
|
|
|
|||
|
|
@ -13,10 +13,6 @@
|
|||
*--------
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "psqlodbc.h"
|
||||
#include "dlg_specific.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 <stdio.h> /* for FILE* pointers: see GLOBAL_VALUES */
|
||||
|
|
|
|||
|
|
@ -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_
|
||||
|
|
|
|||
|
|
@ -15,12 +15,9 @@
|
|||
*-------
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
#include "psqlodbc.h"
|
||||
|
||||
#include <string.h>
|
||||
#include "psqlodbc.h"
|
||||
#include "dlg_specific.h"
|
||||
#include "environ.h"
|
||||
#include "connection.h"
|
||||
|
|
|
|||
|
|
@ -12,10 +12,6 @@
|
|||
*-------
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "socket.h"
|
||||
|
||||
#ifndef WIN32
|
||||
|
|
|
|||
|
|
@ -9,9 +9,7 @@
|
|||
#ifndef __SOCKET_H__
|
||||
#define __SOCKET_H__
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
#include "psqlodbc.h"
|
||||
|
||||
#ifndef WIN32
|
||||
#include <sys/types.h>
|
||||
|
|
|
|||
|
|
@ -12,10 +12,6 @@
|
|||
*-------
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include "statement.h"
|
||||
#include "bind.h"
|
||||
#include "connection.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"
|
||||
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
*--------
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include "tuplelist.h"
|
||||
#include <stdlib.h>
|
||||
#include "tuple.h"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue