Backpatch BCC compile changes to 8.0.X for psql.

5 files changed, 94 insertions, 111 deletions

diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 92ff20e6d9..0da2263e83 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.131 2005/03/25 00:34:28 tgl Exp $
+# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.132 2005/04/29 13:42:21 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -145,7 +145,8 @@ uninstall: uninstall-lib
 	rm -f $(DESTDIR)$(includedir)/libpq-fe.h $(DESTDIR)$(includedir_internal)/libpq-int.h $(DESTDIR)$(includedir_internal)/pqexpbuffer.h
 
 clean distclean: clean-lib
-	rm -f $(OBJS) crypt.c getaddrinfo.c inet_aton.c noblock.c pgstrcasecmp.c snprintf.c strerror.c open.c thread.c md5.c ip.c encnames.c wchar.c pthread.h
+	# pg_config_paths.h might be left over from a Win32 client-only build
+	rm -f $(OBJS) pg_config_paths.h crypt.c getaddrinfo.c inet_aton.c noblock.c pgstrcasecmp.c snprintf.c strerror.c open.c thread.c md5.c ip.c encnames.c wchar.c pthread.h
 
 maintainer-clean: distclean
 	rm -f $(srcdir)/libpqdll.def $(srcdir)/libpqddll.def $(srcdir)/blibpqdll.def $(srcdir)/libpq.rc
diff --git a/src/interfaces/libpq/bcc32.mak b/src/interfaces/libpq/bcc32.mak
index f7f472312b..8649998d4a 100644
--- a/src/interfaces/libpq/bcc32.mak
+++ b/src/interfaces/libpq/bcc32.mak
@@ -4,7 +4,17 @@
 #        and a Win32 dynamic library libpq.dll with import library libpqdll.lib
 
 # Borland C++ base install directory goes here
-# BCB=d:\Borland\Bcc55
+# BCB=c:\Borland\Bcc55
+
+!IF "$(BCB)" == ""
+!MESSAGE You must edit bcc32.mak and define BCB at the top
+!ERROR misssing BCB
+!ENDIF
+
+!IF "$(__NMAKE__)" == ""
+!MESSAGE You must use the -N compatibility flag, e.g. make -N -f bcc32.make
+!ERROR missing -N
+!ENDIF
 
 !MESSAGE Building the Win32 DLL and Static Library...
 !MESSAGE
@@ -22,7 +32,7 @@ CFG=Release
 !MESSAGE You can specify a configuration when running MAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE
-!MESSAGE make  -DCFG=[Release | Debug] /f bcc32.mak
+!MESSAGE make -N -DCFG=[Release | Debug] -f bcc32.mak
 !MESSAGE
 !MESSAGE Possible choices for configuration are:
 !MESSAGE
@@ -52,7 +62,7 @@ OUTFILENAME=blibpq
 USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP;
 
 CPP=bcc32.exe
-CPP_PROJ = -I$(BCB)\include;..\..\include -WD -c -D$(USERDEFINES) -tWM \
+CPP_PROJ = -I$(BCB)\include;..\..\include -n"$(INTDIR)" -WD -c -D$(USERDEFINES) -tWM \
 		-a8 -X -w-use -w-par -w-pia -w-csu -w-aus -w-ccc
 
 !IFDEF DEBUG
@@ -61,6 +71,8 @@ CPP_PROJ	= $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG
 CPP_PROJ	= $(CPP_PROJ) -O -Oi -OS -DNDEBUG
 !endif
 
+ALL : config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
+
 CLEAN :
 	-@erase "$(INTDIR)\getaddrinfo.obj"
 	-@erase "$(INTDIR)\pgstrcasecmp.obj"
@@ -93,6 +105,7 @@ CLEAN :
 	-@erase "$(OUTDIR)\$(OUTFILENAME).tds"
 	-@erase "$(INTDIR)\pg_config_paths.h"
 
+
 LIB32=tlib.exe
 LIB32_FLAGS= 
 LIB32_OBJS= \
@@ -121,15 +134,6 @@ LIB32_OBJS= \
 	"$(INTDIR)\pthread-win32.obj"
 
 
-RSC=brcc32.exe
-RSC_PROJ=-l 0x409 -i$(BCB)\include -fo"$(INTDIR)\libpq.res"
-
-LINK32=ilink32.exe
-LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v
-LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
-
-ALL: config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
-
 config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
 
 ..\..\include\pg_config.h: ..\..\include\pg_config.h.win32
@@ -138,85 +142,91 @@ config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
 pthread.h: pthread.h.win32
 	copy pthread.h.win32 pthread.h
 
-pg_config_paths.h: win32.mak
-	echo #define SYSCONFDIR "" > pg_config_paths.h
+pg_config_paths.h: bcc32.mak
+	echo \#define SYSCONFDIR "" > pg_config_paths.h
 
 "$(OUTDIR)" :
 	@if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-/* @&&! is a Response file, http://users.deltacomm.com/edmulroy/howto8.htm */
+RSC=brcc32.exe
+RSC_PROJ=-l 0x409 -i$(BCB)\include -fo"$(INTDIR)\libpq.res"
+
+LINK32=ilink32.exe
+LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v
+LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
+
+# @<< is a Response file, http://www.opussoftware.com/tutorial/TutMakefile.htm
 
 "$(OUTDIR)\blibpq.dll": "$(OUTDIR)\blibpq.lib" $(LINK32_OBJS) "$(INTDIR)\libpq.res" blibpqdll.def 
-	$(LINK32) @&&!
+	$(LINK32) @<<
 	$(LINK32_FLAGS) +
 	c0d32.obj $(LINK32_OBJS), +
 	$@,, +
 	"$(OUTDIR)\blibpq.lib" import32.lib cw32mti.lib, +
 	blibpqdll.def,"$(INTDIR)\libpq.res"
-!
+<<
 	implib -w "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@
 
 "$(INTDIR)\libpq.res" : "$(INTDIR)" libpq.rc
 	$(RSC) $(RSC_PROJ) libpq.rc
 
 "$(OUTDIR)\blibpq.lib": $(LIB32_OBJS)
-	$(LIB32) $@ @&&!
+	$(LIB32) $@ @<<
 +-"$(**: =" &^
 +-")"
-!
+<<
 
 
 "$(INTDIR)\getaddrinfo.obj" : ..\..\port\getaddrinfo.c
-	$(CPP) @&&!
+	$(CPP) @<<
 	$(CPP_PROJ) ..\..\port\getaddrinfo.c
-!
+<<
 
 "$(INTDIR)\pgstrcasecmp.obj" : ..\..\port\pgstrcasecmp.c
-	$(CPP) @&&!
+	$(CPP) @<<
 	$(CPP_PROJ) ..\..\port\pgstrcasecmp.c
-!
+<<
 
 "$(INTDIR)\thread.obj" : ..\..\port\thread.c
-	$(CPP) @&&!
+	$(CPP) @<<
 	$(CPP_PROJ) ..\..\port\thread.c
-!
+<<
 
 "$(INTDIR)\inet_aton.obj" : ..\..\port\inet_aton.c
-	$(CPP) @&&!
+	$(CPP) @<<
 	$(CPP_PROJ) ..\..\port\inet_aton.c
-!
+<<
 
 "$(INTDIR)\crypt.obj" : ..\..\port\crypt.c
-	$(CPP) @&&!
+	$(CPP) @<<
 	$(CPP_PROJ) ..\..\port\crypt.c
-!
+<<
 
 "$(INTDIR)\noblock.obj" : ..\..\port\noblock.c
-	$(CPP) @&&!
+	$(CPP) @<<
 	$(CPP_PROJ) ..\..\port\noblock.c
-!
+<<
 
 "$(INTDIR)\md5.obj" : ..\..\backend\libpq\md5.c
-	$(CPP) @&&!
+	$(CPP) @<<
 	$(CPP_PROJ) ..\..\backend\libpq\md5.c
-!
+<<
 
 "$(INTDIR)\ip.obj" : ..\..\backend\libpq\ip.c
-	$(CPP) @&&!
+	$(CPP) @<<
 	$(CPP_PROJ) ..\..\backend\libpq\ip.c
-!
+<<
 
 "$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c
-	$(CPP) @&&!
-	$(CPP_PROJ) /I "." ..\..\backend\utils\mb\wchar.c
-!
+	$(CPP) @<<
+	$(CPP_PROJ) /I"." ..\..\backend\utils\mb\wchar.c
+<<
 
 
 "$(INTDIR)\encnames.obj" : ..\..\backend\utils\mb\encnames.c
-	$(CPP) @&&!
-	$(CPP_PROJ) /I "." ..\..\backend\utils\mb\encnames.c
-!
+	$(CPP) @<<
+	$(CPP_PROJ) /I"." ..\..\backend\utils\mb\encnames.c
+<<
 
 .c.obj:
-	$(CPP) -o"$(INTDIR)\$&" $(CPP_PROJ) $<
-
+	$(CPP) $(CPP_PROJ) $<
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index 3b8d962932..a8ef01ad0d 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.166 2004/12/31 22:03:50 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-exec.c,v 1.167 2005/04/29 13:42:21 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2294,7 +2294,7 @@ PQisnonblocking(const PGconn *conn)
 int
 PQflush(PGconn *conn)
 {
-	return (pqFlush(conn));
+	return pqFlush(conn);
 }
 
 
diff --git a/src/interfaces/libpq/pthread-win32.c b/src/interfaces/libpq/pthread-win32.c
index 838840af21..5c5236f99f 100644
--- a/src/interfaces/libpq/pthread-win32.c
+++ b/src/interfaces/libpq/pthread-win32.c
@@ -5,14 +5,14 @@
 *
 * Copyright (c) 2004-2005, PostgreSQL Global Development Group
 * IDENTIFICATION
-*	$PostgreSQL: pgsql/src/interfaces/libpq/pthread-win32.c,v 1.4 2005/01/01 20:44:31 tgl Exp $
+*	$PostgreSQL: pgsql/src/interfaces/libpq/pthread-win32.c,v 1.5 2005/04/29 13:42:21 momjian Exp $
 *
 *-------------------------------------------------------------------------
 */
 
 
 #include <windows.h>
-#include <pthread.h>
+#include "pthread.h"
 
 HANDLE
 pthread_self()
diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index 7fae0f9b53..a1ce3ea02d 100644
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -78,6 +78,34 @@ CLEAN :
 	-@erase "$(INTDIR)\pg_config_paths.h"
 
 
+LIB32=link.exe -lib
+LIB32_FLAGS=$(LOPT) /nologo /out:"$(OUTDIR)\$(OUTFILENAME).lib" 
+LIB32_OBJS= \
+	"$(INTDIR)\win32.obj" \
+	"$(INTDIR)\getaddrinfo.obj" \
+	"$(INTDIR)\pgstrcasecmp.obj" \
+	"$(INTDIR)\thread.obj" \
+	"$(INTDIR)\inet_aton.obj" \
+	"$(INTDIR)\crypt.obj" \
+	"$(INTDIR)\noblock.obj" \
+	"$(INTDIR)\md5.obj" \
+	"$(INTDIR)\ip.obj" \
+	"$(INTDIR)\fe-auth.obj" \
+	"$(INTDIR)\fe-protocol2.obj" \
+	"$(INTDIR)\fe-protocol3.obj" \
+	"$(INTDIR)\fe-connect.obj" \
+	"$(INTDIR)\fe-exec.obj" \
+	"$(INTDIR)\fe-lobj.obj" \
+	"$(INTDIR)\fe-misc.obj" \
+	"$(INTDIR)\fe-print.obj" \
+	"$(INTDIR)\fe-secure.obj" \
+	"$(INTDIR)\pqexpbuffer.obj" \
+	"$(INTDIR)\pqsignal.obj" \
+	"$(INTDIR)\wchar.obj" \
+	"$(INTDIR)\encnames.obj" \
+	"$(INTDIR)\pthread-win32.obj"
+
+
 config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
 
 ..\..\include\pg_config.h: ..\..\include\pg_config.h.win32
@@ -87,7 +115,7 @@ pthread.h: pthread.h.win32
 	copy pthread.h.win32 pthread.h
 
 pg_config_paths.h: win32.mak
-	echo #define SYSCONFDIR "" > pg_config_paths.h
+	echo \#define SYSCONFDIR "" > pg_config_paths.h
 
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
@@ -107,34 +135,6 @@ CPP_PROJ=$(CPP_PROJ) /D ENABLE_THREAD_SAFETY
 
 CPP_SBRS=.
 
-LIB32=link.exe -lib
-LIB32_FLAGS=$(LOPT) /nologo /out:"$(OUTDIR)\$(OUTFILENAME).lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\win32.obj" \
-	"$(INTDIR)\getaddrinfo.obj" \
-	"$(INTDIR)\pgstrcasecmp.obj" \
-	"$(INTDIR)\thread.obj" \
-	"$(INTDIR)\inet_aton.obj" \
-        "$(INTDIR)\crypt.obj" \
-	"$(INTDIR)\noblock.obj" \
-	"$(INTDIR)\md5.obj" \
-	"$(INTDIR)\ip.obj" \
-	"$(INTDIR)\fe-auth.obj" \
-	"$(INTDIR)\fe-protocol2.obj" \
-	"$(INTDIR)\fe-protocol3.obj" \
-	"$(INTDIR)\fe-connect.obj" \
-	"$(INTDIR)\fe-exec.obj" \
-	"$(INTDIR)\fe-lobj.obj" \
-	"$(INTDIR)\fe-misc.obj" \
-	"$(INTDIR)\fe-print.obj" \
-	"$(INTDIR)\fe-secure.obj" \
-	"$(INTDIR)\pqexpbuffer.obj" \
-	"$(INTDIR)\pqsignal.obj" \
-	"$(INTDIR)\wchar.obj" \
-	"$(INTDIR)\encnames.obj" \
-	"$(INTDIR)\pthread-win32.obj"
-
-
 RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res"
 
 LINK32=link.exe
@@ -148,7 +148,7 @@ LINK32_OBJS= \
 	"$(OUTDIR)\libpq.res"
 
 
-/* @<< is a Response file, http://www.opussoftware.com/tutorial/TutMakefile.htm */
+# @<< is a Response file, http://www.opussoftware.com/tutorial/TutMakefile.htm
 
 "$(OUTDIR)\$(OUTFILENAME).lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
 	$(LIB32) @<<
@@ -206,42 +206,14 @@ LINK32_OBJS= \
 
 "$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c
 	$(CPP) @<<
-	$(CPP_PROJ) /I "." ..\..\backend\utils\mb\wchar.c
+	$(CPP_PROJ) /I"." ..\..\backend\utils\mb\wchar.c
 <<
 
 
 "$(INTDIR)\encnames.obj" : ..\..\backend\utils\mb\encnames.c
 	$(CPP) @<<
-	$(CPP_PROJ) /I "." ..\..\backend\utils\mb\encnames.c
+	$(CPP_PROJ) /I"." ..\..\backend\utils\mb\encnames.c
 <<
 
-
-.c{$(CPP_OBJS)}.obj::
-	$(CPP) @<<
-	$(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
-	$(CPP) @<<
-	$(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
-	$(CPP) @<<
-	$(CPP_PROJ) $< 
-<<
-
-.c{$(CPP_SBRS)}.sbr::
-	$(CPP) @<<
-	$(CPP_PROJ) $< 
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
-	$(CPP) @<<
-	$(CPP_PROJ) $< 
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
-	$(CPP) @<<
-	$(CPP_PROJ) $< 
-<<
+.c.obj:
+	$(CPP) $(CPP_PROJ) $<