Skip to content

Commit 968d773

Browse files
peterepetere
committed
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.
1 parent 7326e78 commit 968d773

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+574
-643
lines changed

‎configure

Lines changed: 413 additions & 414 deletions
Large diffs are not rendered by default.

‎configure.in

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ undefine([infodir])
2323
undefine([info])
2424

2525
AC_PREFIX_DEFAULT(/usr/local/pgsql)
26-
AC_CONFIG_HEADER(src/include/config.h)
26+
AC_CONFIG_HEADER(src/include/pg_config.h)
2727

2828
AC_PREREQ(2.13)
2929
AC_CONFIG_AUX_DIR(config)
@@ -80,8 +80,7 @@ nextstep*) template=nextstep ;;
8080
univel) template=univel ;;
8181
esac ;;
8282
sysv4*) template=svr4 ;;
83-
sysv5uw*) template=unixware ;;
84-
sysv5*) template=unixware ;;
83+
sysv5*) template=unixware ;;
8584
ultrix*) template=ultrix4 ;;
8685
esac
8786

@@ -108,7 +107,7 @@ AC_SUBST(PORTNAME)
108107

109108
AC_LINK_FILES([src/backend/port/dynloader/${template}.c], [src/backend/port/dynloader.c])
110109
AC_LINK_FILES([src/backend/port/dynloader/${template}.h], [src/include/dynloader.h])
111-
AC_LINK_FILES([src/include/port/${template}.h], [src/include/os.h])
110+
AC_LINK_FILES([src/include/port/${template}.h], [src/include/pg_config_os.h])
112111
AC_LINK_FILES([src/makefiles/Makefile.${template}], [src/Makefile.port])
113112

114113
# Pick right test-and-set (TAS) code. Most platforms have inline
@@ -941,7 +940,7 @@ AC_TRY_LINK([#include <math.h>],
941940

942941
dnl Cannot use AC_CHECK_FUNC because sigsetjmp may be a macro
943942
dnl (especially on GNU libc)
944-
dnl See also comments in config.h.
943+
dnl See also comments in pg_config.h.
945944
AC_MSG_CHECKING(for sigsetjmp)
946945
AC_TRY_LINK([#include <setjmp.h>],
947946
[sigjmp_buf x; sigsetjmp(x, 1);],
@@ -1204,6 +1203,6 @@ AC_OUTPUT(
12041203
src/backend/port/Makefile
12051204
],
12061205
[
1207-
# Update timestamp for config.h (see Makefile.global)
1206+
# Update timestamp for pg_config.h (see Makefile.global)
12081207
test x"$CONFIG_HEADERS" != x"" && echo >src/include/stamp-h
12091208
])

‎doc/FAQ

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@
559559
In PostgreSQL 6.5 and up, the default limit is 32 processes. You can
560560
increase it by restarting the postmaster with a suitable -N value.
561561
With the default configuration you can set -N as large as 1024. If you
562-
need more, increase MAXBACKENDS in include/config.h and rebuild. You
562+
need more, increase MAXBACKENDS in include/pg_config.h and rebuild. You
563563
can set the default value of -N at configuration time, if you like,
564564
using configure's --with-maxbackends switch.
565565

‎doc/FAQ_german

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@
682682
Wert dadurch erh�hen, da� Du den postmaster mit einem entsprechenden
683683
-N Wert neu startest. In der Standardkonfiguration kannst Du -N auf
684684
maximal 1024 setzen. Falls Du mehr brauchst, erh�he MAXBACKENDS in
685-
include/config.h und kompiliere das Paket neu. Du kannst den
685+
include/pg_config.h und kompiliere das Paket neu. Du kannst den
686686
Standardwert von -N w�hrend der Konfiguration setzen, indem Du
687687
--with-maxbackends angibst. Anmerkung: Falls Du -N gr��er als 32
688688
einstellst, solltest Du -B auf einen Wert, h�her als 64 setzen. F�r

‎doc/src/FAQ/FAQ.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ <H4><A name="3.9">3.9</A>) I get 'Sorry, too many clients' when
725725
can increase it by restarting the <I>postmaster</I> with a suitable
726726
<I>-N</I> value. With the default configuration you can set
727727
<I>-N</I> as large as 1024. If you need more, increase
728-
<SMALL>MAXBACKENDS</SMALL> in <I>include/config.h</I> and rebuild.
728+
<SMALL>MAXBACKENDS</SMALL> in <I>include/pg_config.h</I> and rebuild.
729729
You can set the default value of <I>-N</I> at configuration time,
730730
if you like, using <I>configure's</I> <I>--with-maxbackends</I>
731731
switch.</P>

‎doc/src/FAQ/FAQ_german.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ <H4><a name="3.12">3.12</a>) Ich bekomme die Meldung "Sorry, too many clients",
712712
In Postgres 6.5 sind das normalerweise 32 Prozesse. Du kannst diesen Wert dadurch erh&ouml;hen,
713713
da&szlig; Du den postmaster mit einem entsprechenden <I>-N</I> Wert neu startest.
714714
In der Standardkonfiguration kannst Du <I>-N</I> auf maximal 1024 setzen.
715-
Falls Du mehr brauchst, erh&ouml;he <I>MAXBACKENDS</I> in <I>include/config.h</I> und
715+
Falls Du mehr brauchst, erh&ouml;he <I>MAXBACKENDS</I> in <I>include/pg_config.h</I> und
716716
kompiliere das Paket neu.
717717
Du kannst den Standardwert von <I>-N</I> w&auml;hrend der Konfiguration
718718
setzen, indem Du <I>--with-maxbackends</I> angibst.

‎doc/src/sgml/indices.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/indices.sgml,v 1.21 2001/08/21 16:35:59 tgl Exp $ -->
1+
<!-- $Header: /cvsroot/pgsql/doc/src/sgml/indices.sgml,v 1.22 2001/08/24 14:07:48 petere Exp $ -->
22

33
<chapter id="indexes">
44
<title id="indexes-title">Indexes</title>
@@ -238,7 +238,7 @@ CREATE INDEX test2_mm_idx ON test2 (major, minor);
238238
Currently, only the B-tree implementation supports multi-column
239239
indexes. Up to 16 columns may be specified. (This limit can be
240240
altered when building <productname>Postgres</productname>; see the
241-
file <filename>config.h</filename>.)
241+
file <filename>pg_config.h</filename>.)
242242
</para>
243243

244244
<para>

‎src/Makefile.global.in

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.131 2001/07/15 11:20:01 petere Exp $
2+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.132 2001/08/24 14:07:48 petere Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -321,20 +321,20 @@ STRTOUL = @STRTOUL@
321321
$(top_builddir)/src/Makefile.global: $(top_srcdir)/src/Makefile.global.in $(top_builddir)/config.status
322322
cd $(top_builddir) && CONFIG_FILES=src/Makefile.global CONFIG_HEADERS= ./config.status
323323

324-
# Remake config.h from config.h.in if the latter changed.
325-
# config.status will not change the timestamp on config.h if it
324+
# Remake pg_config.h from pg_config.h.in if the latter changed.
325+
# config.status will not change the timestamp on pg_config.h if it
326326
# doesn't change, so as to avoid recompiling the entire tree
327327
# unnecessarily. Therefore we make config.status update a timestamp file
328328
# stamp-h everytime it runs, so that we don't trigger this rule everytime.
329-
# (We do trigger the null rule for stamp-h to config.h everytime; so it's
329+
# (We do trigger the null rule for stamp-h to pg_config.h everytime; so it's
330330
# important for that rule to be null!)
331331
#
332332
# Of course you need to turn on dependency tracking to get any
333-
# dependencies on config.h.
334-
$(top_builddir)/src/include/config.h: $(top_builddir)/src/include/stamp-h
333+
# dependencies on pg_config.h.
334+
$(top_builddir)/src/include/pg_config.h: $(top_builddir)/src/include/stamp-h
335335

336-
$(top_builddir)/src/include/stamp-h: $(top_srcdir)/src/include/config.h.in $(top_builddir)/config.status
337-
cd $(top_builddir) && CONFIG_FILES= CONFIG_HEADERS=src/include/config.h ./config.status
336+
$(top_builddir)/src/include/stamp-h: $(top_srcdir)/src/include/pg_config.h.in $(top_builddir)/config.status
337+
cd $(top_builddir) && CONFIG_FILES= CONFIG_HEADERS=src/include/pg_config.h ./config.status
338338

339339
# When configure changes, rerun configure with the same options as
340340
# last time. To change configure, you need to run autoconf manually.

‎src/backend/access/transam/Makefile

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/transam
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.13 2000/10/13 12:05:21 vadim Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.14 2001/08/24 14:07:48 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -19,17 +19,8 @@ all: SUBSYS.o
1919
SUBSYS.o: $(OBJS)
2020
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
2121

22-
depend dep:
23-
$(CC) -MM $(CFLAGS) *.c >depend
24-
2522
clean:
2623
rm -f SUBSYS.o $(OBJS)
2724

28-
# ensure that version checks in xlog.c get recompiled when config.h or
29-
# catversion.h changes, even if "make depend" hasn't been done.
30-
xlog.o: xlog.c $(top_builddir)/src/include/config.h $(top_srcdir)/src/include/catalog/catversion.h
31-
32-
ifeq (depend,$(wildcard depend))
33-
include depend
34-
endif
35-
25+
# ensure that version checks in xlog.c get recompiled when catversion.h changes
26+
xlog.o: xlog.c $(top_srcdir)/src/include/catalog/catversion.h

‎src/backend/catalog/Makefile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# Makefile for catalog
44
#
5-
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.35 2001/06/12 05:55:49 tgl Exp $
5+
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.36 2001/08/24 14:07:48 petere Exp $
66
#
77
#-------------------------------------------------------------------------
88

@@ -37,7 +37,7 @@ POSTGRES_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\
3737
pg_includes := $(sort -I$(top_srcdir)/src/include -I$(top_builddir)/src/include)
3838

3939
postgres.bki postgres.description: genbki.sh $(POSTGRES_BKI_SRCS) \
40-
$(top_srcdir)/src/include/postgres_ext.h $(top_builddir)/src/include/config.h
40+
$(top_srcdir)/src/include/postgres_ext.h $(top_builddir)/src/include/pg_config.h
4141
CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $< $(BKIOPTS) -o postgres $(pg_includes) $(POSTGRES_BKI_SRCS) --set-version=$(VERSION)
4242

4343
.PHONY: install-bki
@@ -55,11 +55,3 @@ uninstall-bki:
5555

5656
clean:
5757
rm -f SUBSYS.o $(OBJS) $(BKIFILES)
58-
59-
60-
depend dep:
61-
$(CC) -MM $(CFLAGS) *.c >depend
62-
63-
ifeq (depend,$(wildcard depend))
64-
include depend
65-
endif

‎src/backend/catalog/genbki.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#
1111
#
1212
# IDENTIFICATION
13-
# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh,v 1.21 2001/08/10 18:57:33 tgl Exp $
13+
# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh,v 1.22 2001/08/24 14:07:48 petere Exp $
1414
#
1515
# NOTES
1616
# non-essential whitespace is removed from the generated file.
@@ -66,7 +66,7 @@ do
6666
echo " $CMDNAME [ -D define [...] ] [ -I dir ] --set-version=VERSION -o prefix files..."
6767
echo
6868
echo "Options:"
69-
echo " -I path to postgres_ext.h and config.h files"
69+
echo " -I path to postgres_ext.h and pg_config.h files"
7070
echo " -o prefix of output files"
7171
echo " --set-version PostgreSQL version number for initdb cross-check"
7272
echo
@@ -126,12 +126,12 @@ for dir in $INCLUDE_DIRS; do
126126
fi
127127
done
128128

129-
# Get INDEX_MAX_KEYS and DEFAULT_ATTSTATTARGET from config.h
129+
# Get INDEX_MAX_KEYS and DEFAULT_ATTSTATTARGET from pg_config.h
130130
# (who needs consistency?)
131131
for dir in $INCLUDE_DIRS; do
132-
if [ -f "$dir/config.h" ]; then
133-
INDEXMAXKEYS=`grep '#define[ ]*INDEX_MAX_KEYS' $dir/config.h | $AWK '{ print $3 }'`
134-
DEFAULTATTSTATTARGET=`grep '#define[ ]*DEFAULT_ATTSTATTARGET' $dir/config.h | $AWK '{ print $3 }'`
132+
if [ -f "$dir/pg_config.h" ]; then
133+
INDEXMAXKEYS=`grep '#define[ ]*INDEX_MAX_KEYS' $dir/pg_config.h | $AWK '{ print $3 }'`
134+
DEFAULTATTSTATTARGET=`grep '#define[ ]*DEFAULT_ATTSTATTARGET' $dir/pg_config.h | $AWK '{ print $3 }'`
135135
break
136136
fi
137137
done
@@ -146,7 +146,7 @@ done
146146
export BKIOBJECTID
147147

148148
# NOTE: we assume here that FUNC_MAX_ARGS has the same value as INDEX_MAX_KEYS,
149-
# and don't read it separately from config.h. This is OK because both of them
149+
# and don't read it separately from pg_config.h. This is OK because both of them
150150
# must be equal to the length of oidvector.
151151

152152
INDEXMAXKEYS2=`expr $INDEXMAXKEYS '*' 2` || exit

‎src/backend/libpq/pqsignal.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.20 2001/03/22 03:59:30 momjian Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/libpq/pqsignal.c,v 1.21 2001/08/24 14:07:49 petere Exp $
1313
*
1414
* NOTES
1515
* This shouldn't be in libpq, but the monitor and some other
1616
* things need it...
1717
*
1818
* A NOTE ABOUT SIGNAL HANDLING ACROSS THE VARIOUS PLATFORMS.
1919
*
20-
* config.h defines the macro HAVE_POSIX_SIGNALS for some platforms and
20+
* pg_config.h defines the macro HAVE_POSIX_SIGNALS for some platforms and
2121
* not for others. This file and pqsignal.h use that macro to decide
2222
* how to handle signalling.
2323
*

‎src/backend/port/gethostname.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
/* $Id: gethostname.c,v 1.4 1998/09/01 03:24:25 momjian Exp $ */
1+
/* $Id: gethostname.c,v 1.5 2001/08/24 14:07:49 petere Exp $ */
2+
3+
#include "c.h"
24

35
#include <sys/types.h>
46
#include <string.h>
57

68
#include <sys/utsname.h>
79

8-
#include "config.h"
9-
1010
int
1111
gethostname(char *name, int namelen)
1212
{

‎src/backend/port/inet_aton.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: inet_aton.c,v 1.18 2000/12/03 20:45:34 tgl Exp $
1+
/* $Id: inet_aton.c,v 1.19 2001/08/24 14:07:49 petere Exp $
22
*
33
* This inet_aton() function was taken from the GNU C library and
44
* incorporated into Postgres for those systems which do not have this
@@ -42,12 +42,12 @@
4242
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
4343
* SUCH DAMAGE. */
4444

45+
#include "c.h"
46+
4547
#include <sys/types.h>
4648
#include <netinet/in.h>
4749
#include <ctype.h>
4850

49-
#include "config.h"
50-
5151
/*
5252
* Check whether "cp" is a valid ascii representation
5353
* of an Internet address and convert to a binary address.

‎src/backend/port/isinf.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
/* $Id: isinf.c,v 1.15 2000/04/12 17:15:28 momjian Exp $ */
1+
/* $Id: isinf.c,v 1.16 2001/08/24 14:07:49 petere Exp $ */
22

3-
#include <math.h>
3+
#include "c.h"
44

5-
#include "config.h"
5+
#include <math.h>
66

77
#if HAVE_FPCLASS /* this is _not_ HAVE_FP_CLASS, and not
88
* typo */

‎src/backend/port/qnx4/isnan.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/isnan.c,v 1.2 2000/04/12 17:15:30 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/isnan.c,v 1.3 2001/08/24 14:07:49 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15-
#include "os.h"
15+
#include "c.h"
1616

1717
unsigned char __nan[8] = __nan_bytes;
1818

‎src/backend/port/qnx4/rint.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/rint.c,v 1.2 2000/04/12 17:15:30 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/rint.c,v 1.3 2001/08/24 14:07:49 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15+
#include "c.h"
1516
#include <math.h>
16-
#include "os.h"
1717

1818
double
1919
rint(double x)

‎src/backend/port/qnx4/sem.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,20 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.c,v 1.5 2001/05/24 15:53:33 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/sem.c,v 1.6 2001/08/24 14:07:49 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15+
#include "postgres.h"
16+
1517
#include <errno.h>
1618
#include <semaphore.h>
1719
#include <string.h>
1820
#include <sys/types.h>
1921
#include <unistd.h>
2022
#include <fcntl.h>
2123
#include <sys/mman.h>
22-
#include "postgres.h"
2324
#include "storage/ipc.h"
2425
#include "storage/proc.h"
2526
#include <sys/sem.h>

‎src/backend/port/qnx4/shm.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/shm.c,v 1.5 2001/05/24 15:53:33 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/shm.c,v 1.6 2001/08/24 14:07:49 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15+
#include "postgres.h"
16+
1517
#include <errno.h>
1618
#include <fcntl.h>
1719
#include <stdlib.h>

‎src/backend/port/qnx4/tstrint.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstrint.c,v 1.2 2000/04/12 17:15:30 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/port/qnx4/Attic/tstrint.c,v 1.3 2001/08/24 14:07:49 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414

15+
#include "c.h"
16+
1517
#include <errno.h>
1618
#include <stdio.h>
1719
#include <stdlib.h>
18-
#include "os.h"
1920

2021

2122
int

0 commit comments

Comments
 (0)