> Here is a small patch that should only affect win32 building

> (native win32, not cygnus).
> It does the following:
> Patches two win32.mak files to DEFINE HAVE_VSNPRINTF and
> HAVE_STRDUP. This is required to build at all.
> Bumps the version number on libpq.dll from 6.4 to 6.5.
> Required for install programs to work.
> Adds defintions for BLCKSZ and MAXIMUM_ALIGN to "win32.h" in
> the client-side libpiq directory.
>
> All these files are only used when building on native win32,
> so it should be safe I think.
>
> Again, really sorry to throw this in so late, but I would
> hate to do the same thing as with 6.4 (which required 6.4.1
> to at all compile on Win32).
>
> Thanks,
>
>   //Magnus

diff --git a/src/bin/psql/win32.mak b/src/bin/psql/win32.mak
index 65d7e1921366076b00d12f713ff2f7de64917bc7..0ebc3e512c34b6c34b5630301c858a592681eac9 100644 (file)
--- a/src/bin/psql/win32.mak
+++ b/src/bin/psql/win32.mak
@@ -28,7 +28,7 @@ CLEAN :
 
 CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
  "_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \
- /I ..\..\include /I ..\..\interfaces\libpq
+ /I ..\..\include /I ..\..\interfaces\libpq /D "HAVE_STRDUP" /D "BLCKSZ=8192"
 
 !IFDEF        MULTIBYTE
 !IFNDEF MBFLAGS

diff --git a/src/interfaces/libpq/libpq.rc b/src/interfaces/libpq/libpq.rc
index 725adbc35159c6def882e08c2a9dd44880c8d8c7..394a9eb3ca58ad23da74d95aed5f1dcca039ddaf 100644 (file)
--- a/src/interfaces/libpq/libpq.rc
+++ b/src/interfaces/libpq/libpq.rc
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,4,0,0
- PRODUCTVERSION 6,4,0,0
+ FILEVERSION 6,5,0,0
+ PRODUCTVERSION 6,5,0,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0
  FILEOS VOS__WINDOWS32
@@ -15,13 +15,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "PostgreSQL Access Library\0"
-            VALUE "FileVersion", "6, 4, 0, 0\0"
+            VALUE "FileVersion", "6, 5, 0, 0\0"
             VALUE "InternalName", "libpq\0"
-            VALUE "LegalCopyright", "Copyright (C) 1998\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
             VALUE "ProductName", "PostgreSQL\0"
-            VALUE "ProductVersion", "6, 4, 0, 0\0"
+            VALUE "ProductVersion", "6, 5, 0, 0\0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/src/interfaces/libpq/win32.h b/src/interfaces/libpq/win32.h
index 2565700c92d66a2b42fce127b2da4e8c5e97ed00..d3e9b34815d06dc6b9d8ec9d75b4474d4671f9cc 100644 (file)
--- a/src/interfaces/libpq/win32.h
+++ b/src/interfaces/libpq/win32.h
@@ -29,7 +29,7 @@
  * Parts of config.h that you get with autoconf on other systems
  */
 
-/*
- * Default port to connect to
- */
 #define DEF_PGPORT "5432"
+#define BLCKSZ 8192
+#define MAXIMUM_ALIGNOF 4
+

diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index 60c70a9a002e34f99911eab27ce518449801b773..11023cc2cb634de360ef7a26df9472131ddf0362 100644 (file)
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -43,7 +43,7 @@ CLEAN :
 
 CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D\
  "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" /YX\
- /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c  /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP"
 
 !IFDEF MULTIBYTE
 !IFNDEF        MBFLAGS