Index: contrib/cube/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql/contrib/cube/Makefile,v
retrieving revision 1.12
diff -c -r1.12 Makefile
*** contrib/cube/Makefile	20 Aug 2004 20:13:02 -0000	1.12
--- contrib/cube/Makefile	28 Jul 2005 17:52:56 -0000
***************
*** 9,14 ****
--- 9,15 ----
  
  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)
Index: contrib/tsearch2/dict.c
===================================================================
RCS file: /projects/cvsroot/pgsql/contrib/tsearch2/dict.c,v
retrieving revision 1.6.4.1
diff -c -r1.6.4.1 dict.c
*** contrib/tsearch2/dict.c	31 Mar 2005 15:10:48 -0000	1.6.4.1
--- contrib/tsearch2/dict.c	28 Jul 2005 17:52:56 -0000
***************
*** 2,17 ****
   * interface functions to dictionary
   * Teodor Sigaev <teodor@sigaev.ru>
   */
! #include <errno.h>
! #include <stdlib.h>
! #include <string.h>
  #include <ctype.h>
  
- #include "postgres.h"
- #include "fmgr.h"
- #include "utils/array.h"
  #include "catalog/pg_type.h"
  #include "executor/spi.h"
  
  #include "dict.h"
  #include "common.h"
--- 2,16 ----
   * interface functions to dictionary
   * Teodor Sigaev <teodor@sigaev.ru>
   */
! #include "postgres.h"
! 
  #include <ctype.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"
Index: contrib/tsearch2/dict_ex.c
===================================================================
RCS file: /projects/cvsroot/pgsql/contrib/tsearch2/dict_ex.c,v
retrieving revision 1.3
diff -c -r1.3 dict_ex.c
*** contrib/tsearch2/dict_ex.c	4 Aug 2003 00:43:11 -0000	1.3
--- contrib/tsearch2/dict_ex.c	28 Jul 2005 17:52:56 -0000
***************
*** 2,11 ****
   * example of dictionary
   * Teodor Sigaev <teodor@sigaev.ru>
   */
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
- 
  #include "postgres.h"
  
  #include "dict.h"
--- 2,7 ----
Index: contrib/tsearch2/dict_ispell.c
===================================================================
RCS file: /projects/cvsroot/pgsql/contrib/tsearch2/dict_ispell.c,v
retrieving revision 1.5
diff -c -r1.5 dict_ispell.c
*** contrib/tsearch2/dict_ispell.c	7 May 2004 00:24:57 -0000	1.5
--- contrib/tsearch2/dict_ispell.c	28 Jul 2005 17:52:56 -0000
***************
*** 2,13 ****
   * ISpell interface
   * Teodor Sigaev <teodor@sigaev.ru>
   */
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
- 
  #include "postgres.h"
  
  #include "dict.h"
  #include "common.h"
  #include "ispell/spell.h"
--- 2,11 ----
   * ISpell interface
   * Teodor Sigaev <teodor@sigaev.ru>
   */
  #include "postgres.h"
  
+ #include <ctype.h>
+ 
  #include "dict.h"
  #include "common.h"
  #include "ispell/spell.h"
Index: contrib/tsearch2/dict_snowball.c
===================================================================
RCS file: /projects/cvsroot/pgsql/contrib/tsearch2/dict_snowball.c,v
retrieving revision 1.3
diff -c -r1.3 dict_snowball.c
*** contrib/tsearch2/dict_snowball.c	4 Aug 2003 00:43:11 -0000	1.3
--- contrib/tsearch2/dict_snowball.c	28 Jul 2005 17:52:56 -0000
***************
*** 3,11 ****
   * http://snowball.tartarus.org/
   * Teodor Sigaev <teodor@sigaev.ru>
   */
- #include <stdlib.h>
- #include <string.h>
- 
  #include "postgres.h"
  
  #include "dict.h"
--- 3,8 ----
Index: contrib/tsearch2/dict_syn.c
===================================================================
RCS file: /projects/cvsroot/pgsql/contrib/tsearch2/dict_syn.c,v
retrieving revision 1.4
diff -c -r1.4 dict_syn.c
*** contrib/tsearch2/dict_syn.c	2 Apr 2004 00:41:18 -0000	1.4
--- contrib/tsearch2/dict_syn.c	28 Jul 2005 17:52:56 -0000
***************
*** 2,14 ****
   * ISpell interface
   * Teodor Sigaev <teodor@sigaev.ru>
   */
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
- #include <errno.h>
- 
  #include "postgres.h"
  
  #include "dict.h"
  #include "common.h"
  
--- 2,11 ----
   * ISpell interface
   * Teodor Sigaev <teodor@sigaev.ru>
   */
  #include "postgres.h"
  
+ #include <ctype.h>
+ 
  #include "dict.h"
  #include "common.h"
  
Index: contrib/tsearch2/prs_dcfg.c
===================================================================
RCS file: /projects/cvsroot/pgsql/contrib/tsearch2/prs_dcfg.c,v
retrieving revision 1.5
diff -c -r1.5 prs_dcfg.c
*** contrib/tsearch2/prs_dcfg.c	2 Apr 2004 00:41:18 -0000	1.5
--- contrib/tsearch2/prs_dcfg.c	28 Jul 2005 17:52:56 -0000
***************
*** 2,13 ****
   * Simple config parser
   * Teodor Sigaev <teodor@sigaev.ru>
   */
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
- 
  #include "postgres.h"
  
  #include "dict.h"
  #include "common.h"
  
--- 2,11 ----
   * Simple config parser
   * Teodor Sigaev <teodor@sigaev.ru>
   */
  #include "postgres.h"
  
+ #include <ctype.h>
+ 
  #include "dict.h"
  #include "common.h"
  
Index: contrib/tsearch2/snmap.c
===================================================================
RCS file: /projects/cvsroot/pgsql/contrib/tsearch2/snmap.c,v
retrieving revision 1.6
diff -c -r1.6 snmap.c
*** contrib/tsearch2/snmap.c	29 Aug 2004 05:06:39 -0000	1.6
--- contrib/tsearch2/snmap.c	28 Jul 2005 17:52:56 -0000
***************
*** 2,12 ****
   * 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"
  
--- 2,9 ----
   * simple but fast map from str to Oid
   * Teodor Sigaev <teodor@sigaev.ru>
   */
  #include "postgres.h"
+ 
  #include "snmap.h"
  #include "common.h"
  
Index: contrib/tsearch2/ts_cfg.c
===================================================================
RCS file: /projects/cvsroot/pgsql/contrib/tsearch2/ts_cfg.c,v
retrieving revision 1.11.4.1
diff -c -r1.11.4.1 ts_cfg.c
*** contrib/tsearch2/ts_cfg.c	31 Mar 2005 15:10:48 -0000	1.11.4.1
--- contrib/tsearch2/ts_cfg.c	28 Jul 2005 17:52:56 -0000
***************
*** 2,18 ****
   * interface functions to tscfg
   * Teodor Sigaev <teodor@sigaev.ru>
   */
! #include <errno.h>
! #include <stdlib.h>
! #include <string.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 "ts_cfg.h"
  #include "dict.h"
--- 2,17 ----
   * interface functions to tscfg
   * Teodor Sigaev <teodor@sigaev.ru>
   */
! #include "postgres.h"
! 
  #include <ctype.h>
  #include <locale.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"
Index: contrib/tsearch2/wparser.c
===================================================================
RCS file: /projects/cvsroot/pgsql/contrib/tsearch2/wparser.c,v
retrieving revision 1.6.4.1
diff -c -r1.6.4.1 wparser.c
*** contrib/tsearch2/wparser.c	31 Mar 2005 15:10:48 -0000	1.6.4.1
--- contrib/tsearch2/wparser.c	28 Jul 2005 17:52:56 -0000
***************
*** 2,18 ****
   * interface functions to parser
   * Teodor Sigaev <teodor@sigaev.ru>
   */
! #include <errno.h>
! #include <stdlib.h>
! #include <string.h>
  #include <ctype.h>
  
- #include "postgres.h"
- #include "fmgr.h"
- #include "utils/array.h"
  #include "catalog/pg_type.h"
  #include "executor/spi.h"
  #include "funcapi.h"
  
  #include "wparser.h"
  #include "ts_cfg.h"
--- 2,17 ----
   * interface functions to parser
   * Teodor Sigaev <teodor@sigaev.ru>
   */
! #include "postgres.h"
! 
  #include <ctype.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"
Index: contrib/tsearch2/wparser_def.c
===================================================================
RCS file: /projects/cvsroot/pgsql/contrib/tsearch2/wparser_def.c,v
retrieving revision 1.11
diff -c -r1.11 wparser_def.c
*** contrib/tsearch2/wparser_def.c	21 Oct 2004 19:49:27 -0000	1.11
--- contrib/tsearch2/wparser_def.c	28 Jul 2005 17:52:57 -0000
***************
*** 2,12 ****
   * 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"
--- 2,9 ----
   * default word parser
   * Teodor Sigaev <teodor@sigaev.ru>
   */
  #include "postgres.h"
+ 
  #include "utils/builtins.h"
  
  #include "dict.h"
Index: src/backend/Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql/src/backend/Makefile,v
retrieving revision 1.107.4.1
diff -c -r1.107.4.1 Makefile
*** src/backend/Makefile	26 Jan 2005 21:57:32 -0000	1.107.4.1
--- src/backend/Makefile	28 Jul 2005 17:52:57 -0000
***************
*** 17,35 ****
  	main nodes optimizer port postmaster regex rewrite \
  	storage tcop utils $(top_builddir)/src/timezone
  
! OBJS := $(DIRS:%=%/SUBSYS.o)
  
  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
  endif
  
- # Use server version of port library
- LIBS := $(patsubst -lpgport,-lpgport_srv, $(LIBS))
- 
  ##########################################################################
  
  all: submake-libpgport postgres $(POSTGRES_IMP)
--- 17,37 ----
  	main nodes optimizer port postmaster regex rewrite \
  	storage tcop utils $(top_builddir)/src/timezone
  
! 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
  endif
  
  ##########################################################################
  
  all: submake-libpgport postgres $(POSTGRES_IMP)
***************
*** 69,75 ****
  	rm -f $@.exp $@.base
  
  postgres.def: $(OBJS)
! 	$(DLLTOOL) --export-all --output-def $@ $^ $(top_builddir)/src/port/libpgport.a
  
  libpostgres.a: postgres.def
  	$(DLLTOOL) --dllname postgres.exe --def postgres.def --output-lib $@
--- 71,77 ----
  	rm -f $@.exp $@.base
  
  postgres.def: $(OBJS)
! 	$(DLLTOOL) --export-all --output-def $@ $^
  
  libpostgres.a: postgres.def
  	$(DLLTOOL) --dllname postgres.exe --def postgres.def --output-lib $@
***************
*** 98,104 ****
  endif # aix
  
  # Parallel make trickery
! $(OBJS): $(DIRS:%=%-recursive) ;
  
  .PHONY: $(DIRS:%=%-recursive)
  # Update the commonly used headers before building the subdirectories
--- 100,106 ----
  endif # aix
  
  # Parallel make trickery
! $(SUBSYSOBJS): $(DIRS:%=%-recursive) ;
  
  .PHONY: $(DIRS:%=%-recursive)
  # Update the commonly used headers before building the subdirectories
Index: src/port/getopt_long.c
===================================================================
RCS file: /projects/cvsroot/pgsql/src/port/getopt_long.c,v
retrieving revision 1.3
diff -c -r1.3 getopt_long.c
*** src/port/getopt_long.c	29 Nov 2003 19:52:13 -0000	1.3
--- src/port/getopt_long.c	28 Jul 2005 17:52:58 -0000
***************
*** 38,53 ****
   * $PostgreSQL: pgsql/src/port/getopt_long.c,v 1.3 2003/11/29 19:52:13 pgsql Exp $
   */
  
! #include <stdio.h>
! #include <stdlib.h>
! #include <string.h>
  
  #include "getopt_long.h"
  
  #define BADCH	'?'
  #define BADARG	':'
  #define EMSG	""
  
  int
  getopt_long(int argc, char *const argv[],
  			const char *optstring,
--- 38,56 ----
   * $PostgreSQL: pgsql/src/port/getopt_long.c,v 1.3 2003/11/29 19:52:13 pgsql Exp $
   */
  
! #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,