aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--contrib/cube/Makefile3
-rw-r--r--contrib/tsearch2/dict.c11
-rw-r--r--contrib/tsearch2/dict_ex.c4
-rw-r--r--contrib/tsearch2/dict_ispell.c6
-rw-r--r--contrib/tsearch2/dict_snowball.c3
-rw-r--r--contrib/tsearch2/dict_syn.c7
-rw-r--r--contrib/tsearch2/prs_dcfg.c6
-rw-r--r--contrib/tsearch2/snmap.c5
-rw-r--r--contrib/tsearch2/ts_cfg.c11
-rw-r--r--contrib/tsearch2/wparser.c11
-rw-r--r--contrib/tsearch2/wparser_def.c5
-rw-r--r--src/backend/Makefile18
-rw-r--r--src/port/getopt_long.c11
13 files changed, 42 insertions, 59 deletions
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index f4b0d0b5017..47e5c3ea25b 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.12 2004/08/20 20:13:02 momjian Exp $
+# $PostgreSQL: pgsql/contrib/cube/Makefile,v 1.12.4.1 2005/08/02 01:35:21 tgl Exp $
MODULE_big = cube
OBJS= cube.o cubeparse.o
@@ -9,6 +9,7 @@ REGRESS = cube
EXTRA_CLEAN = cubeparse.c cubeparse.h cubescan.c y.tab.c y.tab.h
+SHLIB_LINK += $(filter -lm, $(LIBS))
ifdef USE_PGXS
PGXS = $(shell pg_config --pgxs)
diff --git a/contrib/tsearch2/dict.c b/contrib/tsearch2/dict.c
index 7bbc996d51f..b2a82688194 100644
--- a/contrib/tsearch2/dict.c
+++ b/contrib/tsearch2/dict.c
@@ -2,16 +2,15 @@
* interface functions to dictionary
* Teodor Sigaev <teodor@sigaev.ru>
*/
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
+#include "postgres.h"
+
#include <ctype.h>
-#include "postgres.h"
-#include "fmgr.h"
-#include "utils/array.h"
#include "catalog/pg_type.h"
#include "executor/spi.h"
+#include "fmgr.h"
+#include "utils/array.h"
+#include "utils/memutils.h"
#include "dict.h"
#include "common.h"
diff --git a/contrib/tsearch2/dict_ex.c b/contrib/tsearch2/dict_ex.c
index a8fb20453ba..ab1d2925f86 100644
--- a/contrib/tsearch2/dict_ex.c
+++ b/contrib/tsearch2/dict_ex.c
@@ -2,10 +2,6 @@
* example of dictionary
* Teodor Sigaev <teodor@sigaev.ru>
*/
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
#include "postgres.h"
#include "dict.h"
diff --git a/contrib/tsearch2/dict_ispell.c b/contrib/tsearch2/dict_ispell.c
index 5725c8fb362..a66a55f1505 100644
--- a/contrib/tsearch2/dict_ispell.c
+++ b/contrib/tsearch2/dict_ispell.c
@@ -2,12 +2,10 @@
* ISpell interface
* Teodor Sigaev <teodor@sigaev.ru>
*/
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
#include "postgres.h"
+#include <ctype.h>
+
#include "dict.h"
#include "common.h"
#include "ispell/spell.h"
diff --git a/contrib/tsearch2/dict_snowball.c b/contrib/tsearch2/dict_snowball.c
index 51dba044499..ddb9cd169ea 100644
--- a/contrib/tsearch2/dict_snowball.c
+++ b/contrib/tsearch2/dict_snowball.c
@@ -3,9 +3,6 @@
* http://snowball.tartarus.org/
* Teodor Sigaev <teodor@sigaev.ru>
*/
-#include <stdlib.h>
-#include <string.h>
-
#include "postgres.h"
#include "dict.h"
diff --git a/contrib/tsearch2/dict_syn.c b/contrib/tsearch2/dict_syn.c
index 046a5949039..df616e0aad2 100644
--- a/contrib/tsearch2/dict_syn.c
+++ b/contrib/tsearch2/dict_syn.c
@@ -2,13 +2,10 @@
* ISpell interface
* Teodor Sigaev <teodor@sigaev.ru>
*/
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-
#include "postgres.h"
+#include <ctype.h>
+
#include "dict.h"
#include "common.h"
diff --git a/contrib/tsearch2/prs_dcfg.c b/contrib/tsearch2/prs_dcfg.c
index 0837451f227..af83b6506d4 100644
--- a/contrib/tsearch2/prs_dcfg.c
+++ b/contrib/tsearch2/prs_dcfg.c
@@ -2,12 +2,10 @@
* Simple config parser
* Teodor Sigaev <teodor@sigaev.ru>
*/
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
#include "postgres.h"
+#include <ctype.h>
+
#include "dict.h"
#include "common.h"
diff --git a/contrib/tsearch2/snmap.c b/contrib/tsearch2/snmap.c
index c152b1ac238..9aa0e2214f6 100644
--- a/contrib/tsearch2/snmap.c
+++ b/contrib/tsearch2/snmap.c
@@ -2,11 +2,8 @@
* simple but fast map from str to Oid
* Teodor Sigaev <teodor@sigaev.ru>
*/
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
#include "postgres.h"
+
#include "snmap.h"
#include "common.h"
diff --git a/contrib/tsearch2/ts_cfg.c b/contrib/tsearch2/ts_cfg.c
index 3c64cb0a932..ac8381904e6 100644
--- a/contrib/tsearch2/ts_cfg.c
+++ b/contrib/tsearch2/ts_cfg.c
@@ -2,17 +2,16 @@
* interface functions to tscfg
* Teodor Sigaev <teodor@sigaev.ru>
*/
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
+#include "postgres.h"
+
#include <ctype.h>
#include <locale.h>
-#include "postgres.h"
-#include "fmgr.h"
-#include "utils/array.h"
#include "catalog/pg_type.h"
#include "executor/spi.h"
+#include "fmgr.h"
+#include "utils/array.h"
+#include "utils/memutils.h"
#include "ts_cfg.h"
#include "dict.h"
diff --git a/contrib/tsearch2/wparser.c b/contrib/tsearch2/wparser.c
index 33bfd4d87e8..39cd673bb0b 100644
--- a/contrib/tsearch2/wparser.c
+++ b/contrib/tsearch2/wparser.c
@@ -2,17 +2,16 @@
* interface functions to parser
* Teodor Sigaev <teodor@sigaev.ru>
*/
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
+#include "postgres.h"
+
#include <ctype.h>
-#include "postgres.h"
-#include "fmgr.h"
-#include "utils/array.h"
#include "catalog/pg_type.h"
#include "executor/spi.h"
+#include "fmgr.h"
#include "funcapi.h"
+#include "utils/array.h"
+#include "utils/memutils.h"
#include "wparser.h"
#include "ts_cfg.h"
diff --git a/contrib/tsearch2/wparser_def.c b/contrib/tsearch2/wparser_def.c
index 93368b1e897..a33bacf31bc 100644
--- a/contrib/tsearch2/wparser_def.c
+++ b/contrib/tsearch2/wparser_def.c
@@ -2,11 +2,8 @@
* default word parser
* Teodor Sigaev <teodor@sigaev.ru>
*/
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-
#include "postgres.h"
+
#include "utils/builtins.h"
#include "dict.h"
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 9a194654b94..2bbdc8eb369 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $PostgreSQL: pgsql/src/backend/Makefile,v 1.107.4.1 2005/01/26 21:57:32 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/Makefile,v 1.107.4.2 2005/08/02 01:35:22 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -17,19 +17,21 @@ DIRS := access bootstrap catalog parser commands executor lib libpq \
main nodes optimizer port postmaster regex rewrite \
storage tcop utils $(top_builddir)/src/timezone
-OBJS := $(DIRS:%=%/SUBSYS.o)
+SUBSYSOBJS := $(DIRS:%=%/SUBSYS.o)
+
+OBJS := $(SUBSYSOBJS) $(top_builddir)/src/port/libpgport_srv.a
+
+# We put libpgport into OBJS, so remove it from LIBS
+LIBS := $(patsubst -lpgport, , $(LIBS))
ifeq ($(PORTNAME), qnx4)
# This file crashes qnx4's wlink and is therefore not in
# bootstrap/SUBSYS.o on that platform. (Wotta hack ... is it still
# necessary?) [ Yes, until the Watcom compiler goes open source it's
# effectively unsupported ]
-OBJS+= bootstrap/bootstrap.o
+OBJS += bootstrap/bootstrap.o
endif
-# Use server version of port library
-LIBS := $(patsubst -lpgport,-lpgport_srv, $(LIBS))
-
##########################################################################
all: submake-libpgport postgres $(POSTGRES_IMP)
@@ -69,7 +71,7 @@ postgres: $(OBJS) $(DLLINIT) postgres.def libpostgres.a $(WIN32RES)
rm -f $@.exp $@.base
postgres.def: $(OBJS)
- $(DLLTOOL) --export-all --output-def $@ $^ $(top_builddir)/src/port/libpgport.a
+ $(DLLTOOL) --export-all --output-def $@ $^
libpostgres.a: postgres.def
$(DLLTOOL) --dllname postgres.exe --def postgres.def --output-lib $@
@@ -98,7 +100,7 @@ endif
endif # aix
# Parallel make trickery
-$(OBJS): $(DIRS:%=%-recursive) ;
+$(SUBSYSOBJS): $(DIRS:%=%-recursive) ;
.PHONY: $(DIRS:%=%-recursive)
# Update the commonly used headers before building the subdirectories
diff --git a/src/port/getopt_long.c b/src/port/getopt_long.c
index 4c1f65d7767..d4d875f14b0 100644
--- a/src/port/getopt_long.c
+++ b/src/port/getopt_long.c
@@ -35,19 +35,22 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $PostgreSQL: pgsql/src/port/getopt_long.c,v 1.3 2003/11/29 19:52:13 pgsql Exp $
+ * $PostgreSQL: pgsql/src/port/getopt_long.c,v 1.3.4.1 2005/08/02 01:35:23 tgl Exp $
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "c.h"
#include "getopt_long.h"
+#ifndef HAVE_INT_OPTRESET
+int optreset;
+#endif
+
#define BADCH '?'
#define BADARG ':'
#define EMSG ""
+
int
getopt_long(int argc, char *const argv[],
const char *optstring,
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-23 05:15:04 +0000