cvs: php4 /ext/pgsql/ pgsql.c pgsql.dsp php_pgsql.h

andi Fri Jun 9 15:39:56 2000 EDT Modified files: /php4/ext/pgsql pgsql.c pgsql.dsp php_pgsql.h Log: - Update postgress to build on Windows Index: php4/ext/pgsql/pgsql.c diff -u php4/ext/pgsql/pgsql.c:1.54 php4/ext/pgsql/pgsql.c:1.55 --- php4/ext/pgsql/pgsql.c:1.54 Sun Jun 4 16:06:11 2000 +++ php4/ext/pgsql/pgsql.c Fri Jun 9 15:39:56 2000 @@ -17,13 +17,9 @@ +----------------------------------------------------------------------+ */ -/* $Id: pgsql.c,v 1.54 2000/06/04 23:06:11 jah Exp $ */ +/* $Id: pgsql.c,v 1.55 2000/06/09 22:39:56 andi Exp $ */ #include <stdlib.h> - -#ifdef COMPILE_DL_PGSQL -#include "dl/phpdl.h" -#endif #define PHP_PGSQL_PRIVATE 1 Index: php4/ext/pgsql/pgsql.dsp diff -u php4/ext/pgsql/pgsql.dsp:1.7 php4/ext/pgsql/pgsql.dsp:1.8 --- php4/ext/pgsql/pgsql.dsp:1.7 Tue Jun 6 00:26:04 2000 +++ php4/ext/pgsql/pgsql.dsp Fri Jun 9 15:39:56 2000 @@ -43,7 +43,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PGSQL_EXPORTS" /YX /FD /c -# 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 +# 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 # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -69,7 +69,7 @@ # PROP Intermediate_Dir "pgsql___Win32_Debug" # PROP Target_Dir "" # 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 -# 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 +# 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 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" Index: php4/ext/pgsql/php_pgsql.h diff -u php4/ext/pgsql/php_pgsql.h:1.13 php4/ext/pgsql/php_pgsql.h:1.14 --- php4/ext/pgsql/php_pgsql.h:1.13 Tue Jun 6 00:26:04 2000 +++ php4/ext/pgsql/php_pgsql.h Fri Jun 9 15:39:56 2000 @@ -17,12 +17,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pgsql.h,v 1.13 2000/06/06 07:26:04 fmk Exp $ */ +/* $Id: php_pgsql.h,v 1.14 2000/06/09 22:39:56 andi Exp $ */ #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 @@ #include <postgres.h> #include <libpq-fe.h> -#if (WIN32||WINNT) +#ifdef PHP_WIN32 #define INV_WRITE 0x00020000 #define INV_READ 0x00040000 #else