cvs: php4 /ext/pgsql/ pgsql.dsp php_pgsql.h
| From: | Frank M. Kromann | Date: | Tue, 06 Jun 2000 07:26:04 +0000 |
| Subject: | cvs: php4 /ext/pgsql/ pgsql.dsp php_pgsql.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-44@lists.php.net to get a copy of this message | ||
fmk Tue Jun 6 00:26:04 2000 EDT
Modified files:
/php4/ext/pgsql pgsql.dsp php_pgsql.h
Log:
Adding correct compiler directives for Win32 compilation
Index: php4/ext/pgsql/pgsql.dsp
diff -u php4/ext/pgsql/pgsql.dsp:1.6 php4/ext/pgsql/pgsql.dsp:1.7
--- php4/ext/pgsql/pgsql.dsp:1.6 Tue May 23 02:22:00 2000
+++ php4/ext/pgsql/pgsql.dsp Tue Jun 6 00:26:04 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" /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
# 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" /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 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.12 php4/ext/pgsql/php_pgsql.h:1.13
--- php4/ext/pgsql/php_pgsql.h:1.12 Sun Jun 4 13:24:07 2000
+++ php4/ext/pgsql/php_pgsql.h Tue Jun 6 00:26:04 2000
@@ -17,12 +17,12 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pgsql.h,v 1.12 2000/06/04 20:24:07 jah Exp $ */
+/* $Id: php_pgsql.h,v 1.13 2000/06/06 07:26:04 fmk Exp $ */
#ifndef _PHP_PGSQL_H
#define _PHP_PGSQL_H
-#if COMPILE_DL
+#if COMPILE_DL || COMPILE_DL_PGSQL
#undef HAVE_PGSQL
#define HAVE_PGSQL 1
#endif