Try to get Borland CC to compile.

Backpatch to 8.0.X which doesn't work right now.

diff --git a/src/interfaces/libpq/bcc32.mak b/src/interfaces/libpq/bcc32.mak
index 0d53d0c925648b719731f1c65bb49b73860a7d28..13147cdd9b0efa70935e03cd78ba9754e34c982d 100644 (file)
--- a/src/interfaces/libpq/bcc32.mak
+++ b/src/interfaces/libpq/bcc32.mak
@@ -42,10 +42,12 @@ NULL=nul
 DEBUG=1
 OUTDIR=.\Debug
 INTDIR=.\Debug
-!else
+!ELSE
 OUTDIR=.\Release
 INTDIR=.\Release
-!endif
+!ENDIF
+
+OUTFILENAME=blibpq
 
 USERDEFINES=FRONTEND;NDEBUG;WIN32;_WINDOWS;HAVE_VSNPRINTF;HAVE_STRDUP;
 
@@ -59,16 +61,48 @@ CPP_PROJ    = $(CPP_PROJ) -Od -r- -k -v -y -vi- -D_DEBUG
 CPP_PROJ       = $(CPP_PROJ) -O -Oi -OS -DNDEBUG
 !endif
 
+CLEAN :
+       -@erase "$(INTDIR)\getaddrinfo.obj"
+       -@erase "$(INTDIR)\pgstrcasecmp.obj"
+       -@erase "$(INTDIR)\thread.obj"
+       -@erase "$(INTDIR)\inet_aton.obj"
+       -@erase "$(INTDIR)\crypt.obj"
+       -@erase "$(INTDIR)\noblock.obj"
+       -@erase "$(INTDIR)\md5.obj"
+       -@erase "$(INTDIR)\ip.obj"
+       -@erase "$(INTDIR)\fe-auth.obj"
+       -@erase "$(INTDIR)\fe-protocol2.obj"
+       -@erase "$(INTDIR)\fe-protocol3.obj"
+       -@erase "$(INTDIR)\fe-connect.obj"
+       -@erase "$(INTDIR)\fe-exec.obj"
+       -@erase "$(INTDIR)\fe-lobj.obj"
+       -@erase "$(INTDIR)\fe-misc.obj"
+       -@erase "$(INTDIR)\fe-print.obj"
+       -@erase "$(INTDIR)\fe-secure.obj"
+       -@erase "$(INTDIR)\pqexpbuffer.obj"
+       -@erase "$(INTDIR)\pqsignal.obj"
+       -@erase "$(OUTDIR)\libpqdll.obj"
+       -@erase "$(OUTDIR)\win32.obj"
+       -@erase "$(INTDIR)\wchar.obj"
+       -@erase "$(INTDIR)\encnames.obj"
+       -@erase "$(INTDIR)\pthread-win32.obj"
+       -@erase "$(OUTDIR)\$(OUTFILENAME).lib"
+       -@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
+       -@erase "$(OUTDIR)\libpq.res"
+       -@erase "$(OUTDIR)\$(OUTFILENAME).dll"
+       -@erase "$(OUTDIR)\$(OUTFILENAME).tds"
+       -@erase "$(INTDIR)\pg_config_paths.h"
+
 LIB32=tlib.exe
 LIB32_FLAGS= 
 LIB32_OBJS= \
-       "$(OUTDIR)\win32.obj" \
+       "$(INTDIR)\win32.obj" \
        "$(INTDIR)\getaddrinfo.obj" \
+       "$(INTDIR)\pgstrcasecmp.obj" \
        "$(INTDIR)\thread.obj" \
        "$(INTDIR)\inet_aton.obj" \
        "$(INTDIR)\crypt.obj" \
        "$(INTDIR)\noblock.obj" \
-       "$(INTDIR)\pgstrcasecmp.obj" \
        "$(INTDIR)\md5.obj" \
        "$(INTDIR)\ip.obj" \
        "$(INTDIR)\fe-auth.obj" \
@@ -83,7 +117,8 @@ LIB32_OBJS= \
        "$(INTDIR)\pqexpbuffer.obj" \
        "$(INTDIR)\pqsignal.obj" \
        "$(INTDIR)\wchar.obj" \
-       "$(INTDIR)\encnames.obj"
+       "$(INTDIR)\encnames.obj" \
+       "$(INTDIR)\pthread-win32.obj"
 
 
 RSC=brcc32.exe
@@ -95,37 +130,6 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj"
 
 ALL: config "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib"
 
-CLEAN :
-       -@erase "$(INTDIR)\getaddrinfo.obj"
-       -@erase "$(INTDIR)\thread.obj"
-       -@erase "$(INTDIR)\inet_aton.obj"
-       -@erase "$(INTDIR)\crypt.obj"
-       -@erase "$(INTDIR)\md5.obj"
-       -@erase "$(INTDIR)\ip.obj"
-       -@erase "$(INTDIR)\fe-auth.obj"
-       -@erase "$(INTDIR)\fe-protocol2.obj"
-       -@erase "$(INTDIR)\fe-protocol3.obj"
-       -@erase "$(INTDIR)\fe-connect.obj"
-       -@erase "$(INTDIR)\fe-exec.obj"
-       -@erase "$(INTDIR)\fe-lobj.obj"
-       -@erase "$(INTDIR)\fe-misc.obj"
-       -@erase "$(INTDIR)\fe-print.obj"
-       -@erase "$(INTDIR)\fe-secure.obj"
-       -@erase "$(INTDIR)\pqexpbuffer.obj"
-       -@erase "$(INTDIR)\pqsignal.obj"
-       -@erase "$(OUTDIR)\libpqdll.obj"
-       -@erase "$(OUTDIR)\win32.obj"
-       -@erase "$(INTDIR)\wchar.obj"
-       -@erase "$(INTDIR)\encnames.obj"
-       -@erase "$(INTDIR)\noblock.obj"
-       -@erase "$(INTDIR)\pgstrcasecmp.obj"
-       -@erase "$(OUTDIR)\libpq.res"
-       -@erase "$(OUTDIR)\blibpq.lib"
-       -@erase "$(OUTDIR)\blibpqdll.lib"
-       -@erase "$(OUTDIR)\blibpq.dll"
-       -@erase "$(OUTDIR)\blibpq.tds"
-       -@erase "$(INTDIR)\pg_config_paths.h"
-
 config: ..\..\include\pg_config.h pthread.h pg_config_paths.h
 
 ..\..\include\pg_config.h: ..\..\include\pg_config.h.win32

diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index 0377f43b548e4d7f27debe23daed5dcd45f9756e..2838f3c6c9154f13494222c451897e519a40d840 100644 (file)
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -41,7 +41,7 @@ CPP_OBJS=.\Release/
 !ENDIF
 
 
-ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll" 
+ALL : config "$(OUTDIR)\$(OUTFILENAME).lib" "$(OUTDIR)\$(OUTFILENAME).dll"
 
 CLEAN :
        -@erase "$(INTDIR)\getaddrinfo.obj"
@@ -65,16 +65,16 @@ CLEAN :
        -@erase "$(INTDIR)\pqsignal.obj"
        -@erase "$(OUTDIR)\libpqdll.obj"
        -@erase "$(OUTDIR)\win32.obj"
+       -@erase "$(INTDIR)\wchar.obj"
+       -@erase "$(INTDIR)\encnames.obj"
+       -@erase "$(INTDIR)\pthread-win32.obj"
        -@erase "$(OUTDIR)\$(OUTFILENAME).lib"
-       -@erase "$(OUTDIR)\$(OUTFILENAME).dll"
+       -@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
        -@erase "$(OUTDIR)\libpq.res"
+       -@erase "$(OUTDIR)\$(OUTFILENAME).dll"
        -@erase "*.pch"
        -@erase "$(OUTDIR)\libpq.pch"
        -@erase "$(OUTDIR)\$(OUTFILENAME)dll.exp"
-       -@erase "$(OUTDIR)\$(OUTFILENAME)dll.lib"
-       -@erase "$(INTDIR)\wchar.obj"
-       -@erase "$(INTDIR)\encnames.obj"
-       -@erase "$(INTDIR)\pthread-win32.obj"
        -@erase "$(INTDIR)\pg_config_paths.h"