From 8864ee0b6b45d52d85f67e3e027e119e2700c3f4 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 7 Jun 1999 14:29:20 +0000
Subject: [PATCH] > 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
---
src/bin/psql/win32.mak | 2 +-
src/interfaces/libpq/libpq.rc | 10 +++++-----
src/interfaces/libpq/win32.h | 6 +++---
src/interfaces/libpq/win32.mak | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/bin/psql/win32.mak b/src/bin/psql/win32.mak
index 65d7e192136..0ebc3e512c3 100644
--- 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 725adbc3515..394a9eb3ca5 100644
--- 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 2565700c92d..d3e9b34815d 100644
--- 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 60c70a9a002..11023cc2cb6 100644
--- 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
--
GitLab