Back-port several small portability fixes to get contrib building

cleanly on AIX in the 8.0 branch.  Rocco Altier

diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index f4b0d0b50177b5b1f292d0d36fa639f1f09417dd..47e5c3ea25bb05c528e11d4883d1246f2cada627 100644 (file)
--- 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 7bbc996d51f273a229340a973f08445bd6443e29..b2a82688194fb2ad55d60ce2c5219de6a5fb7437 100644 (file)
--- a/contrib/tsearch2/dict.c
+++ b/contrib/tsearch2/dict.c
@@ -2,16 +2,15 @@
  * interface functions to dictionary
  * Teodor Sigaev <[email protected]>
  */
-#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 a8fb20453ba2125bed97bbadc0cfff28cef5112f..ab1d2925f864756133dfc5b09c29db770531bbbd 100644 (file)
--- a/contrib/tsearch2/dict_ex.c
+++ b/contrib/tsearch2/dict_ex.c
@@ -2,10 +2,6 @@
  * example of dictionary
  * Teodor Sigaev <[email protected]>
  */
-#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 5725c8fb3629020d8efaa3d3c475879e80c301e2..a66a55f1505dcb2fcb5017a74a4c37f3ee93afe3 100644 (file)
--- a/contrib/tsearch2/dict_ispell.c
+++ b/contrib/tsearch2/dict_ispell.c
@@ -2,12 +2,10 @@
  * ISpell interface
  * Teodor Sigaev <[email protected]>
  */
-#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 51dba0444994e36eb8017aaa8c3b86287054151b..ddb9cd169eab2a5c117709c77682aca7ad6495f3 100644 (file)
--- a/contrib/tsearch2/dict_snowball.c
+++ b/contrib/tsearch2/dict_snowball.c
@@ -3,9 +3,6 @@
  * http://snowball.tartarus.org/
  * Teodor Sigaev <[email protected]>
  */
-#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 046a59490394195501c35adf1178f6edaba7448a..df616e0aad28d06592f8593626c352c1ad0cb752 100644 (file)
--- a/contrib/tsearch2/dict_syn.c
+++ b/contrib/tsearch2/dict_syn.c
@@ -2,13 +2,10 @@
  * ISpell interface
  * Teodor Sigaev <[email protected]>
  */
-#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 0837451f22727e040ea176555dfc452a69d2cb97..af83b6506d47dace4588c54396647ca5d88e5d73 100644 (file)
--- a/contrib/tsearch2/prs_dcfg.c
+++ b/contrib/tsearch2/prs_dcfg.c
@@ -2,12 +2,10 @@
  * Simple config parser
  * Teodor Sigaev <[email protected]>
  */
-#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 c152b1ac2386a9b890cde14b5f5b8f3ba60b1697..9aa0e2214f6bf96acbf5121edf90b34519570f4f 100644 (file)
--- a/contrib/tsearch2/snmap.c
+++ b/contrib/tsearch2/snmap.c
@@ -2,11 +2,8 @@
  * simple but fast map from str to Oid
  * Teodor Sigaev <[email protected]>
  */
-#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 3c64cb0a932e466e72e9ec51d35f733d37b7f683..ac8381904e614d9ab784cad1784b1356b56e2acf 100644 (file)
--- a/contrib/tsearch2/ts_cfg.c
+++ b/contrib/tsearch2/ts_cfg.c
@@ -2,17 +2,16 @@
  * interface functions to tscfg
  * Teodor Sigaev <[email protected]>
  */
-#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 33bfd4d87e817523b8917bfa79cf30eae243bf1d..39cd673bb0b43bd616ecca72389784a58d7f3e69 100644 (file)
--- a/contrib/tsearch2/wparser.c
+++ b/contrib/tsearch2/wparser.c
@@ -2,17 +2,16 @@
  * interface functions to parser
  * Teodor Sigaev <[email protected]>
  */
-#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 93368b1e8974ea89b5de8e30c0e92fae81fa6e40..a33bacf31bc2df599a2341eae93e0cb909c585a1 100644 (file)
--- a/contrib/tsearch2/wparser_def.c
+++ b/contrib/tsearch2/wparser_def.c
@@ -2,11 +2,8 @@
  * default word parser
  * Teodor Sigaev <[email protected]>
  */
-#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 9a194654b948717c499284093a4d368c09448973..2bbdc8eb3699f1c997a92c85fe38ec6bda560320 100644 (file)
--- 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 [email protected] [email protected]
 
 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 4c1f65d7767cfbc24f86c0f77abd97a55d2509ba..d4d875f14b013a33d5d94313eb834d1c2b256eef 100644 (file)
--- 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,