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

Commitd7f0b7e

Browse files
committed
Here is an update on the Win32 patch. Modified files are 'config.h.win32'
and two 'win32.mak'. Addresses the following:1) Oops. Spelled fcntl.h wrong in the last one. D'uh.2) PG_VERSION changed to be defined with " around it. psql/command.c failedto compile without that.3) Changed makefiles to use "/MD" and link both psql and libpq.dll againstMSVCRT.DLL instead of a static library. This takes care of thecrash-upon-free in psql.I *think* this is what is on the "Open 7.1 Items" list as "Magnus HaganderODBC Issues?". It has nothing to do with ODBC, but it's the only issue I'vebeen involved with...Magnus Hagander
1 parentb72ca55 commitd7f0b7e

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

‎src/bin/psql/command.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Group
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.44 2001/01/24 03:42:37 momjian Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.45 2001/01/27 21:49:58 momjian Exp $
77
*/
88
#include"postgres.h"
99
#include"command.h"
@@ -19,7 +19,7 @@
1919
#else
2020
#include<win32.h>
2121
#include<io.h>
22-
#include<fnctl.h>
22+
#include<fcntl.h>
2323
#endif
2424

2525
#include"libpq-fe.h"

‎src/bin/psql/win32.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ CLEAN :
3838
"$(OUTDIR)" :
3939
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
4040

41-
CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
41+
CPP_PROJ=/nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
4242
"_MBCS" /Fp"$(INTDIR)\psql.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c\
4343
/I ..\..\include /I ..\..\interfaces\libpq /D "HAVE_STRDUP"
4444

‎src/include/config.h.win32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44

55

6-
#define PG_VERSION 7.1
6+
#define PG_VERSION"7.1"
77
#define PG_VERSION_STR "7.1 (win32)"
88

99
#define SYSCONFDIR ""

‎src/interfaces/libpq/win32.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ CLEAN :
4848
"$(OUTDIR)" :
4949
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
5050

51-
CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D\
51+
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D\
5252
"WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" /YX\
5353
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP"
5454

0 commit comments

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