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 failed
to compile without that.
3) Changed makefiles to use "/MD" and link both psql and libpq.dll against
MSVCRT.DLL instead of a static library. This takes care of the
crash-upon-free in psql.

I *think* this is what is on the "Open 7.1 Items" list as "Magnus Hagander
ODBC Issues?". It has nothing to do with ODBC, but it's the only issue I've
been involved with...

Magnus Hagander

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index f4054dff0275f6baef51baf86cfa57fe5b17e20e..a46106d1d064221bc5d422d58d7cc7cd07a06be5 100644 (file)
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.44 2001/01/24 03:42:37 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/command.c,v 1.45 2001/01/27 21:49:58 momjian Exp $
  */
 #include "postgres.h"
 #include "command.h"
@@ -19,7 +19,7 @@
 #else
 #include 
 #include 
-#include nctl.h>
+#include cntl.h>
 #endif
 
 #include "libpq-fe.h"

diff --git a/src/bin/psql/win32.mak b/src/bin/psql/win32.mak
index 0365a0031161e10db5379de41ec3be9738cbf6ab..2d08e9b5d0ed8315690093f3c300d2a7f8724a08 100644 (file)
--- a/src/bin/psql/win32.mak
+++ b/src/bin/psql/win32.mak
@@ -38,7 +38,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D\
+CPP_PROJ=/nologo /MD /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 /D "HAVE_STRDUP"
 

diff --git a/src/include/config.h.win32 b/src/include/config.h.win32
index aae6444dd970eb558ba8333adae42de8163ae76f..ec836d8190db96179400fdcf036a702767766604 100644 (file)
--- a/src/include/config.h.win32
+++ b/src/include/config.h.win32
@@ -3,7 +3,7 @@
  */
 
 
-#define PG_VERSION 7.1
+#define PG_VERSION "7.1"
 #define PG_VERSION_STR "7.1 (win32)"
 
 #define SYSCONFDIR ""

diff --git a/src/interfaces/libpq/win32.mak b/src/interfaces/libpq/win32.mak
index eda99d815ba9522aa33e4f29064a8c9c11453919..b4fbeda5886642f9e6e66a78792b32a613daed7e 100644 (file)
--- a/src/interfaces/libpq/win32.mak
+++ b/src/interfaces/libpq/win32.mak
@@ -48,7 +48,7 @@ CLEAN :
 "$(OUTDIR)" :
     if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
 
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D\
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\include" /D "NDEBUG" /D\
  "WIN32" /D "_WINDOWS" /Fp"$(INTDIR)\libpq.pch" /YX\
  /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c  /D "HAVE_VSNPRINTF" /D "HAVE_STRDUP"