Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit8864ee0

Browse files
committed
> 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
1 parentbad3b30 commit8864ee0

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

‎src/bin/psql/win32.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ CLEAN :
2828

2929
CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
3030
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c\
31-
/I ..\..\include /I ..\..\interfaces\libpq
31+
/I ..\..\include /I ..\..\interfaces\libpq /D "HAVE_STRDUP" /D "BLCKSZ=8192"
3232

3333
!IFDEF MULTIBYTE
3434
!IFNDEF MBFLAGS

‎src/interfaces/libpq/libpq.rc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include <winver.h>
22

33
VS_VERSION_INFO VERSIONINFO
4-
FILEVERSION 6,4,0,0
5-
PRODUCTVERSION 6,4,0,0
4+
FILEVERSION 6,5,0,0
5+
PRODUCTVERSION 6,5,0,0
66
FILEFLAGSMASK 0x3fL
77
FILEFLAGS 0
88
FILEOS VOS__WINDOWS32
@@ -15,13 +15,13 @@ BEGIN
1515
BEGIN
1616
VALUE "CompanyName", "\0"
1717
VALUE "FileDescription", "PostgreSQL Access Library\0"
18-
VALUE "FileVersion", "6,4, 0, 0\0"
18+
VALUE "FileVersion", "6,5, 0, 0\0"
1919
VALUE "InternalName", "libpq\0"
20-
VALUE "LegalCopyright", "Copyright (C)1998\0"
20+
VALUE "LegalCopyright", "Copyright (C)1999\0"
2121
VALUE "LegalTrademarks", "\0"
2222
VALUE "OriginalFilename", "libpq.dll\0"
2323
VALUE "ProductName", "PostgreSQL\0"
24-
VALUE "ProductVersion", "6,4, 0, 0\0"
24+
VALUE "ProductVersion", "6,5, 0, 0\0"
2525
END
2626
END
2727
BLOCK "VarFileInfo"

‎src/interfaces/libpq/win32.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* Parts of config.h that you get with autoconf on other systems
3030
*/
3131

32-
/*
33-
* Default port to connect to
34-
*/
3532
#defineDEF_PGPORT "5432"
33+
#defineBLCKSZ 8192
34+
#defineMAXIMUM_ALIGNOF 4
35+

‎src/interfaces/libpq/win32.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ CLEAN :
4343

4444
CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D\
4545
"WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" /YX\
46-
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
46+
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP"
4747

4848
!IFDEF MULTIBYTE
4949
!IFNDEFMBFLAGS

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp