- Update postgress to build on Windows

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 01fb17f88033a05a51d042d02fe04f38b9975b23..f934502cb814472a362277ab105225d45d06f42a 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -21,10 +21,6 @@
 
 #include <stdlib.h>
 
-#ifdef COMPILE_DL_PGSQL
-#include "dl/phpdl.h"
-#endif
-
 #define PHP_PGSQL_PRIVATE 1
 
 #include "php.h"

diff --git a/ext/pgsql/pgsql.dsp b/ext/pgsql/pgsql.dsp
index 677767f01454e8028fb3b53649596235fa8d1acf..349b9f79f3072a26d89d9b6b12537e9194575664 100644 (file)
--- a/ext/pgsql/pgsql.dsp
+++ b/ext/pgsql/pgsql.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGSQL_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\PostgreSQL\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "PGSQL_EXPORTS" /D HAVE_PGSQL=1 /D "COMPILE_DL_PGSQL" /D "ZTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D COMPILE_DL_PGSQL=1 /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\PostgreSQL\include" /I "..\..\..\bindlib_w32" /D "NDEBUG" /D "ZTS" /D ZEND_DEBUG=0 /D "PGSQL_EXPORTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D "COMPILE_DL_PGSQL" /FD /c\r
 # SUBTRACT CPP /YX\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "pgsql___Win32_Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGSQL_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "PGSQL_EXPORTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D COMPILE_DL_PGSQL=1 /YX /FD /GZ /c\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "PGSQL_EXPORTS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZEND_WIN32" /D "PHP_WIN32" /D "COMPILE_DL_PGSQL" /D ZEND_DEBUG=0 /YX /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r

diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h
index d1b5a78af775a471fb8b367e5d5c2d6656908098..0ce9756cd44b7b8caf591bdba18008b43c23aabf 100644 (file)
--- a/ext/pgsql/php_pgsql.h
+++ b/ext/pgsql/php_pgsql.h
@@ -22,7 +22,7 @@
 #ifndef _PHP_PGSQL_H
 #define _PHP_PGSQL_H
 
-#if COMPILE_DL || COMPILE_DL_PGSQL
+#ifdef COMPILE_DL_PGSQL
 #undef HAVE_PGSQL
 #define HAVE_PGSQL 1
 #endif
@@ -37,7 +37,7 @@ extern zend_module_entry pgsql_module_entry;
 #include <postgres.h>
 #include <libpq-fe.h>
 
-#if (WIN32||WINNT)
+#ifdef PHP_WIN32
 #define INV_WRITE            0x00020000
 #define INV_READ             0x00040000
 #else