*** configure.in.orig	Fri Sep 21 11:33:46 2007
--- configure.in	Thu Sep 27 13:48:25 2007
***************
*** 318,324 ****
  
  # We already have this in Makefile.win32, but configure needs it too
  if test "$PORTNAME" = "win32"; then
!   CPPFLAGS="$CPPFLAGS -I$srcdir/src/include/port/win32 -DEXEC_BACKEND"
  fi
  
  # Check if the compiler still works with the template settings
--- 318,324 ----
  
  # We already have this in Makefile.win32, but configure needs it too
  if test "$PORTNAME" = "win32"; then
!   CPPFLAGS="$CPPFLAGS -I$srcdir/src/include/port/win32"
  fi
  
  # Check if the compiler still works with the template settings
*** configure.orig	Fri Sep 21 11:33:44 2007
--- configure	Thu Sep 27 13:48:25 2007
***************
*** 3257,3263 ****
  
  # We already have this in Makefile.win32, but configure needs it too
  if test "$PORTNAME" = "win32"; then
!   CPPFLAGS="$CPPFLAGS -I$srcdir/src/include/port/win32 -DEXEC_BACKEND"
  fi
  
  # Check if the compiler still works with the template settings
--- 3257,3263 ----
  
  # We already have this in Makefile.win32, but configure needs it too
  if test "$PORTNAME" = "win32"; then
!   CPPFLAGS="$CPPFLAGS -I$srcdir/src/include/port/win32"
  fi
  
  # Check if the compiler still works with the template settings
*** src/bin/initdb/Makefile.orig	Sat Jan  6 07:19:47 2007
--- src/bin/initdb/Makefile	Thu Sep 27 13:48:25 2007
***************
*** 14,20 ****
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
  
! override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
  
  OBJS=	initdb.o $(WIN32RES)
  
--- 14,20 ----
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
  
! override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
  
  OBJS=	initdb.o $(WIN32RES)
  
*** src/bin/pg_config/Makefile.orig	Sat Jan  6 07:19:48 2007
--- src/bin/pg_config/Makefile	Thu Sep 27 13:48:25 2007
***************
*** 19,25 ****
  STD_CPPFLAGS := $(filter-out -I$(top_srcdir)/src/include -I$(top_builddir)/src/include,$(CPPFLAGS))
  STD_LDFLAGS := $(filter-out -L$(top_builddir)/src/port,$(LDFLAGS))
  
- override CPPFLAGS += -DFRONTEND
  override CPPFLAGS += -DVAL_CONFIGURE="\"$(configure_args)\""
  override CPPFLAGS += -DVAL_CC="\"$(CC)\""
  override CPPFLAGS += -DVAL_CPPFLAGS="\"$(STD_CPPFLAGS)\""
--- 19,24 ----
*** src/bin/pg_controldata/Makefile.orig	Sat Jan  6 07:19:48 2007
--- src/bin/pg_controldata/Makefile	Thu Sep 27 13:48:25 2007
***************
*** 13,20 ****
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
  
- override CPPFLAGS += -DFRONTEND
- 
  OBJS= pg_controldata.o pg_crc.o $(WIN32RES)
  
  all: submake-libpgport pg_controldata
--- 13,18 ----
*** src/bin/pg_ctl/Makefile.orig	Sat Jan  6 07:19:48 2007
--- src/bin/pg_ctl/Makefile	Thu Sep 27 13:48:25 2007
***************
*** 14,20 ****
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
  
! override CPPFLAGS := -DFRONTEND -DDEF_PGPORT=$(DEF_PGPORT) -I$(libpq_srcdir) $(CPPFLAGS)
  
  OBJS=	pg_ctl.o $(WIN32RES)
  
--- 14,20 ----
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
  
! override CPPFLAGS := -DDEF_PGPORT=$(DEF_PGPORT) -I$(libpq_srcdir) $(CPPFLAGS)
  
  OBJS=	pg_ctl.o $(WIN32RES)
  
*** src/bin/pg_dump/Makefile.orig	Sat Jan  6 07:19:48 2007
--- src/bin/pg_dump/Makefile	Thu Sep 27 13:48:25 2007
***************
*** 14,20 ****
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
  
! override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
  
  OBJS=	pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
  	pg_backup_files.o pg_backup_null.o pg_backup_tar.o \
--- 14,20 ----
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
  
! override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
  
  OBJS=	pg_backup_archiver.o pg_backup_db.o pg_backup_custom.o \
  	pg_backup_files.o pg_backup_null.o pg_backup_tar.o \
*** src/bin/pg_resetxlog/Makefile.orig	Sat Jan  6 07:19:48 2007
--- src/bin/pg_resetxlog/Makefile	Thu Sep 27 13:48:25 2007
***************
*** 13,20 ****
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
  
- override CPPFLAGS += -DFRONTEND
- 
  OBJS= pg_resetxlog.o pg_crc.o $(WIN32RES)
  
  all: submake-libpgport pg_resetxlog
--- 13,18 ----
*** src/bin/psql/Makefile.orig	Sat Jan  6 07:19:48 2007
--- src/bin/psql/Makefile	Thu Sep 27 13:48:25 2007
***************
*** 17,23 ****
  
  REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
  
! override CPPFLAGS := -DFRONTEND -I$(srcdir) -I$(libpq_srcdir) -I$(top_srcdir)/src/bin/pg_dump $(CPPFLAGS)
  
  OBJS=	command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
  	startup.o prompt.o variables.o large_obj.o print.o describe.o \
--- 17,23 ----
  
  REFDOCDIR= $(top_srcdir)/doc/src/sgml/ref
  
! override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(top_srcdir)/src/bin/pg_dump $(CPPFLAGS)
  
  OBJS=	command.o common.o help.o input.o stringutils.o mainloop.o copy.o \
  	startup.o prompt.o variables.o large_obj.o print.o describe.o \
*** src/bin/scripts/Makefile.orig	Sat Jan  6 07:19:50 2007
--- src/bin/scripts/Makefile	Thu Sep 27 13:48:25 2007
***************
*** 16,22 ****
  
  PROGRAMS = createdb createlang createuser dropdb droplang dropuser clusterdb vacuumdb reindexdb
  
! override CPPFLAGS := -DFRONTEND -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir) $(CPPFLAGS)
  
  all: submake-libpq submake-backend $(PROGRAMS)
  
--- 16,22 ----
  
  PROGRAMS = createdb createlang createuser dropdb droplang dropuser clusterdb vacuumdb reindexdb
  
! override CPPFLAGS := -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir) $(CPPFLAGS)
  
  all: submake-libpq submake-backend $(PROGRAMS)
  
*** src/include/c.h.orig	Thu Sep  6 03:10:48 2007
--- src/include/c.h	Thu Sep 27 13:48:25 2007
***************
*** 830,840 ****
  #define HAVE_STRTOULL 1
  #endif
  
! /* EXEC_BACKEND defines */
! #ifdef EXEC_BACKEND
! #define NON_EXEC_STATIC
! #else
! #define NON_EXEC_STATIC static
  #endif
  
  /* /port compatibility functions */
--- 830,838 ----
  #define HAVE_STRTOULL 1
  #endif
  
! /* If BACKEND (definition place of FRONTEND is postgres_fe.h */
! #if defined(WIN32) && !defined(FRONTEND)
! #define EXEC_BACKEND 1
  #endif
  
  /* /port compatibility functions */
*** src/include/port.h.orig	Fri Jul 13 08:28:49 2007
--- src/include/port.h	Thu Sep 27 13:48:25 2007
***************
*** 93,98 ****
--- 93,105 ----
  #define DEVTTY "/dev/tty"
  #endif
  
+ /* EXEC_BACKEND defines */
+ #ifdef EXEC_BACKEND
+ #define NON_EXEC_STATIC
+ #else
+ #define NON_EXEC_STATIC static
+ #endif
+ 
  /*
   *	Win32 needs double quotes at the beginning and end of system()
   *	strings.  If not, it gets confused with multiple quoted strings.
*** src/include/postgres_fe.h.orig	Sat Jan  6 07:19:50 2007
--- src/include/postgres_fe.h	Thu Sep 27 14:02:37 2007
***************
*** 18,23 ****
--- 18,27 ----
  #ifndef POSTGRES_FE_H
  #define POSTGRES_FE_H
  
+ #ifndef FRONTEND
+ #define FRONTEND 1
+ #endif
+ 
  #include "c.h"
  
  #endif   /* POSTGRES_FE_H */
*** src/interfaces/ecpg/ecpglib/Makefile.orig	Tue Aug 14 19:01:52 2007
--- src/interfaces/ecpg/ecpglib/Makefile	Thu Sep 27 13:48:25 2007
***************
*** 17,24 ****
  SO_MINOR_VERSION= 0
  DLTYPE= library
  
! override CPPFLAGS := -DFRONTEND \
! 	-I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
  	-I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS)
  override CFLAGS += $(PTHREAD_CFLAGS)
  
--- 17,23 ----
  SO_MINOR_VERSION= 0
  DLTYPE= library
  
! override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
  	-I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS)
  override CFLAGS += $(PTHREAD_CFLAGS)
  
*** src/interfaces/ecpg/include/Makefile.orig	Thu Nov 30 06:21:03 2006
--- src/interfaces/ecpg/include/Makefile	Thu Sep 27 13:48:25 2007
***************
*** 2,9 ****
  top_builddir = ../../../..
  include $(top_builddir)/src/Makefile.global
  
! override CPPFLAGS := -DFRONTEND \
! 	-I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
  	-I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS)
  
  informix_esql_dir = $(pkgincludedir)/informix/esql
--- 2,8 ----
  top_builddir = ../../../..
  include $(top_builddir)/src/Makefile.global
  
! override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
  	-I$(libpq_srcdir) -I$(top_builddir)/src/port $(CPPFLAGS)
  
  informix_esql_dir = $(pkgincludedir)/informix/esql
*** src/interfaces/ecpg/pgtypeslib/Makefile.orig	Sun Jan 21 02:16:17 2007
--- src/interfaces/ecpg/pgtypeslib/Makefile	Thu Sep 27 13:48:25 2007
***************
*** 17,24 ****
  SO_MINOR_VERSION= 3
  DLTYPE= library
  
! override CPPFLAGS := -DFRONTEND \
! 	-I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
  	-I$(top_srcdir)/src/include/utils -I$(libpq_srcdir) $(CPPFLAGS)
  override CFLAGS += $(PTHREAD_CFLAGS)
  
--- 17,23 ----
  SO_MINOR_VERSION= 3
  DLTYPE= library
  
! override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include \
  	-I$(top_srcdir)/src/include/utils -I$(libpq_srcdir) $(CPPFLAGS)
  override CFLAGS += $(PTHREAD_CFLAGS)
  
*** src/tools/findoidjoins/Makefile.orig	Sat Jan  6 07:20:04 2007
--- src/tools/findoidjoins/Makefile	Thu Sep 27 13:48:25 2007
***************
*** 12,18 ****
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
  
! override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
  
  OBJS= findoidjoins.o
  
--- 12,18 ----
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
  
! override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
  
  OBJS= findoidjoins.o
  
*** src/tools/fsync/Makefile.orig	Sat Jan  6 07:20:05 2007
--- src/tools/fsync/Makefile	Thu Sep 27 13:48:25 2007
***************
*** 12,18 ****
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
  
! override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) $(CPPFLAGS)
  
  OBJS= test_fsync.o
  
--- 12,18 ----
  top_builddir = ../../..
  include $(top_builddir)/src/Makefile.global
  
! override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
  
  OBJS= test_fsync.o
  
*** src/tools/msvc/Project.pm.orig	Wed Aug 22 00:10:41 2007
--- src/tools/msvc/Project.pm	Thu Sep 27 13:50:04 2007
***************
*** 489,495 ****
  	ConfigurationType="$cfgtype" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2" WholeProgramOptimization="$p->{wholeopt}">
  	<Tool Name="VCCLCompilerTool" Optimization="$p->{opt}"
  		AdditionalIncludeDirectories="$self->{prefixincludes}src/include;src/include/port/win32;src/include/port/win32_msvc;$self->{includes}"
! 		PreprocessorDefinitions="WIN32;_WINDOWS;__WINDOWS__;__WIN32__;EXEC_BACKEND;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE$self->{defines}$p->{defs}"
  		StringPooling="$p->{strpool}"
  		RuntimeLibrary="$p->{runtime}" DisableSpecificWarnings="$self->{disablewarnings}"
  EOF
--- 489,495 ----
  	ConfigurationType="$cfgtype" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="FALSE" CharacterSet="2" WholeProgramOptimization="$p->{wholeopt}">
  	<Tool Name="VCCLCompilerTool" Optimization="$p->{opt}"
  		AdditionalIncludeDirectories="$self->{prefixincludes}src/include;src/include/port/win32;src/include/port/win32_msvc;$self->{includes}"
! 		PreprocessorDefinitions="WIN32;_WINDOWS;__WINDOWS__;__WIN32__;WIN32_STACK_RLIMIT=4194304;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE$self->{defines}$p->{defs}"
  		StringPooling="$p->{strpool}"
  		RuntimeLibrary="$p->{runtime}" DisableSpecificWarnings="$self->{disablewarnings}"
  EOF
*** src/tools/msvc/Mkvcbuild.pm.orig	Wed Aug 22 00:10:41 2007
--- src/tools/msvc/Mkvcbuild.pm	Thu Sep 27 13:48:25 2007
***************
*** 341,347 ****
      $pgregress->AddFile('src\test\regress\pg_regress_main.c');
      $pgregress->AddIncludeDir('src\port');
      $pgregress->AddDefine('HOST_TUPLE="i686-pc-win32vc"');
-     $pgregress->AddDefine('FRONTEND');
      $pgregress->AddReference($libpgport);
  
      $solution->Save();
--- 341,346 ----
***************
*** 359,365 ****
  
      my $p = $solution->AddProject($n,'exe','bin');
      $p->AddDir('src\bin\\' . $n);
-     $p->AddDefine('FRONTEND');
      $p->AddReference($libpgport);
      if ($uselibpq)
      {
--- 358,363 ----