mirror of
https://github.com/postgres/postgres.git
synced 2025-07-09 22:41:56 +03:00
> 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
This commit is contained in:
@ -28,7 +28,7 @@ CLEAN :
|
|||||||
|
|
||||||
CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
|
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 \
|
"_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
|
!IFDEF MULTIBYTE
|
||||||
!IFNDEF MBFLAGS
|
!IFNDEF MBFLAGS
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#include <winver.h>
|
#include <winver.h>
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION 6,4,0,0
|
FILEVERSION 6,5,0,0
|
||||||
PRODUCTVERSION 6,4,0,0
|
PRODUCTVERSION 6,5,0,0
|
||||||
FILEFLAGSMASK 0x3fL
|
FILEFLAGSMASK 0x3fL
|
||||||
FILEFLAGS 0
|
FILEFLAGS 0
|
||||||
FILEOS VOS__WINDOWS32
|
FILEOS VOS__WINDOWS32
|
||||||
@ -15,13 +15,13 @@ BEGIN
|
|||||||
BEGIN
|
BEGIN
|
||||||
VALUE "CompanyName", "\0"
|
VALUE "CompanyName", "\0"
|
||||||
VALUE "FileDescription", "PostgreSQL Access Library\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 "InternalName", "libpq\0"
|
||||||
VALUE "LegalCopyright", "Copyright (C) 1998\0"
|
VALUE "LegalCopyright", "Copyright (C) 1999\0"
|
||||||
VALUE "LegalTrademarks", "\0"
|
VALUE "LegalTrademarks", "\0"
|
||||||
VALUE "OriginalFilename", "libpq.dll\0"
|
VALUE "OriginalFilename", "libpq.dll\0"
|
||||||
VALUE "ProductName", "PostgreSQL\0"
|
VALUE "ProductName", "PostgreSQL\0"
|
||||||
VALUE "ProductVersion", "6, 4, 0, 0\0"
|
VALUE "ProductVersion", "6, 5, 0, 0\0"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
* Parts of config.h that you get with autoconf on other systems
|
* Parts of config.h that you get with autoconf on other systems
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
* Default port to connect to
|
|
||||||
*/
|
|
||||||
#define DEF_PGPORT "5432"
|
#define DEF_PGPORT "5432"
|
||||||
|
#define BLCKSZ 8192
|
||||||
|
#define MAXIMUM_ALIGNOF 4
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ CLEAN :
|
|||||||
|
|
||||||
CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D\
|
CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D\
|
||||||
"WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" /YX\
|
"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
|
!IFDEF MULTIBYTE
|
||||||
!IFNDEF MBFLAGS
|
!IFNDEF MBFLAGS
|
||||||
|
Reference in New Issue
Block a user