From b14295cfe4f2a738a0b023d10bc508da2c458bdb Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Thu, 12 Jun 2003 08:15:29 +0000 Subject: Attached is the complete diff against current CVS. Compiles on BCC 5.5 and VC++ 6.0 (with warnings). Karl Waclawek --- src/interfaces/libpq/bcc32.mak | 22 ++++++++++++++++++---- src/interfaces/libpq/blibpqdll.def | 4 ++-- src/interfaces/libpq/fe-connect.c | 6 +++++- src/interfaces/libpq/fe-misc.c | 5 ++++- src/interfaces/libpq/libpqdll.def | 2 +- src/interfaces/libpq/win32.mak | 37 +++++++++++++++++++++++++++++++++++++ 6 files changed, 67 insertions(+), 9 deletions(-) (limited to 'src/interfaces/libpq') diff --git a/src/interfaces/libpq/bcc32.mak b/src/interfaces/libpq/bcc32.mak index 985143ac875..0cb9faefedd 100644 --- a/src/interfaces/libpq/bcc32.mak +++ b/src/interfaces/libpq/bcc32.mak @@ -4,7 +4,7 @@ # and a Win32 dynamic library libpq.dll with import library libpqdll.lib # Borland C++ base install directory goes here -BCB=d:\Borland\Bcc55 +# BCB=d:\Borland\Bcc55 !MESSAGE Building the Win32 DLL and Static Library... !MESSAGE @@ -63,9 +63,16 @@ LIB32=tlib.exe LIB32_FLAGS= LIB32_OBJS= \ "$(OUTDIR)\win32.obj" \ + "$(INTDIR)\getaddrinfo.obj" \ + "$(INTDIR)\inet_aton.obj" \ + "$(INTDIR)\crypt.obj" \ + "$(INTDIR)\path.obj" \ "$(INTDIR)\dllist.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" \ @@ -77,7 +84,7 @@ LIB32_OBJS= \ "$(INTDIR)\encnames.obj" RSC=brcc32.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\libpq.res" +RSC_PROJ=-l 0x409 -i$(BCB)\include -fo"$(INTDIR)\libpq.res" LINK32=ilink32.exe LINK32_FLAGS = -Gn -L$(BCB)\lib;$(INTDIR); -x -Tpd -v @@ -86,16 +93,23 @@ LINK32_OBJS= "$(INTDIR)\libpqdll.obj" # --------------------------------------------------------------------------- .path.obj = $(INTDIR) -.path.c = .;..\..\backend\libpq;..\..\backend\lib;..\..\backend\utils\mb +.path.c = .;..\..\port;..\..\backend\libpq;..\..\backend\lib;..\..\backend\utils\mb # --------------------------------------------------------------------------- ALL: "$(OUTDIR)" "$(OUTDIR)\blibpq.dll" "$(OUTDIR)\blibpq.lib" CLEAN : + -@erase "$(INTDIR)\getaddrinfo.obj" + -@erase "$(INTDIR)\inet_aton.obj" + -@erase "$(INTDIR)\crypt.obj" + -@erase "$(INTDIR)\path.obj" -@erase "$(INTDIR)\dllist.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" @@ -125,7 +139,7 @@ CLEAN : "$(OUTDIR)\blibpq.lib" import32.lib cw32mti.lib, + blibpqdll.def,"$(INTDIR)\libpq.res" ! - implib -a "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@ + implib -w "$(OUTDIR)\blibpqdll.lib" blibpqdll.def $@ "$(INTDIR)\libpq.res" : "$(INTDIR)" libpq.rc $(RSC) $(RSC_PROJ) libpq.rc diff --git a/src/interfaces/libpq/blibpqdll.def b/src/interfaces/libpq/blibpqdll.def index 77a996bfe59..8445a29b1b4 100644 --- a/src/interfaces/libpq/blibpqdll.def +++ b/src/interfaces/libpq/blibpqdll.def @@ -96,7 +96,7 @@ EXPORTS _pg_encoding_to_char @ 92 _pg_utf_mblen @ 93 _PQunescapeBytea @ 94 - _PQfreeMem @ 95 + _PQfreemem @ 95 ; Aliases for MS compatible names PQconnectdb = _PQconnectdb @@ -193,5 +193,5 @@ EXPORTS pg_encoding_to_char = _pg_encoding_to_char pg_utf_mblen = _pg_utf_mblen PQunescapeBytea = _PQunescapeBytea - PQfreeMem = _PQfreeMem + PQfreemem = _PQfreemem diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 04ca6cb9259..74e8ab55722 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.246 2003/06/12 08:11:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.247 2003/06/12 08:15:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -49,6 +49,10 @@ #include "libpq/ip.h" #include "mb/pg_wchar.h" +/* For FNCTL_NONBLOCK */ +#if defined(WIN32) || defined(__BEOS__) +long ioctlsocket_ret; +#endif #define PGPASSFILE ".pgpass" diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index 0b59e6f5d5c..f456365348e 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -23,7 +23,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.94 2003/06/12 08:11:07 momjian Exp $ + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.95 2003/06/12 08:15:29 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -33,8 +33,11 @@ #include #include #include + +#if !defined(_MSC_VER) && !defined(__BORLANDC__) #include #include +#endif #ifdef WIN32 #include "win32.h" diff --git a/src/interfaces/libpq/libpqdll.def b/src/interfaces/libpq/libpqdll.def index e48959f0866..f8432fc713a 100644 --- a/src/interfaces/libpq/libpqdll.def +++ b/src/interfaces/libpq/libpqdll.def @@ -96,5 +96,5 @@ EXPORTS pg_encoding_to_char @ 92 pg_utf_mblen @ 93 PQunescapeBytea @ 94 - PQfreeMem @ 95 + PQfreemem @ 95 diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak index 5563c9e9a3b..11450a55858 100644 --- a/src/interfaces/libpq/win32.mak +++ b/src/interfaces/libpq/win32.mak @@ -36,9 +36,16 @@ OutDir=.\Release ALL : "$(OUTDIR)\libpq.lib" "$(OUTDIR)\libpq.dll" CLEAN : + -@erase "$(INTDIR)\getaddrinfo.obj" + -@erase "$(INTDIR)\inet_aton.obj" + -@erase "$(INTDIR)\crypt.obj" + -@erase "$(INTDIR)\path.obj" -@erase "$(INTDIR)\dllist.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" @@ -72,9 +79,16 @@ LIB32=link.exe -lib LIB32_FLAGS=$(LOPT) /nologo /out:"$(OUTDIR)\libpq.lib" LIB32_OBJS= \ "$(OUTDIR)\win32.obj" \ + "$(INTDIR)\getaddrinfo.obj" \ + "$(INTDIR)\inet_aton.obj" \ + "$(INTDIR)\crypt.obj" \ + "$(INTDIR)\path.obj" \ "$(INTDIR)\dllist.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" \ @@ -112,6 +126,25 @@ LINK32_OBJS= \ $(LINK32_FLAGS) $(LINK32_OBJS) << +"$(OUTDIR)\getaddrinfo.obj" : ..\..\port\getaddrinfo.c + $(CPP) @<< + $(CPP_PROJ) ..\..\port\getaddrinfo.c +<< + +"$(OUTDIR)\inet_aton.obj" : ..\..\port\inet_aton.c + $(CPP) @<< + $(CPP_PROJ) ..\..\port\inet_aton.c +<< + +"$(OUTDIR)\crypt.obj" : ..\..\port\crypt.c + $(CPP) @<< + $(CPP_PROJ) ..\..\port\crypt.c +<< + +"$(OUTDIR)\path.obj" : ..\..\port\path.c + $(CPP) @<< + $(CPP_PROJ) ..\..\port\path.c +<< "$(OUTDIR)\dllist.obj" : ..\..\backend\lib\dllist.c $(CPP) @<< @@ -124,6 +157,10 @@ LINK32_OBJS= \ $(CPP_PROJ) ..\..\backend\libpq\md5.c << +"$(OUTDIR)\ip.obj" : ..\..\backend\libpq\ip.c + $(CPP) @<< + $(CPP_PROJ) ..\..\backend\libpq\ip.c +<< "$(INTDIR)\wchar.obj" : ..\..\backend\utils\mb\wchar.c $(CPP) @<< -- cgit v1.2.3