cvs: /php3/functions php3_unified_odbc.h /php3/win32 db2.dsp
| From: | Jim Winstead | Date: | Fri, 16 Jul 1999 14:25:29 +0000 |
| Subject: | cvs: /php3/functions php3_unified_odbc.h /php3/win32 db2.dsp | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-8608@lists.php.net to get a copy of this message | ||
jim Fri Jul 16 14:25:29 1999 EDT
Modified files:
/php3/functions php3_unified_odbc.h
/php3/win32 db2.dsp
Log:
Fix IBM DB2 compile under Windows. (And some missed HAVE_DB2->HAVE_IBMDB2 conversions. Rasmus,
go directly to jail, do not pass go, and do not collect $200. :)
Index: php3/functions/php3_unified_odbc.h
diff -u php3/functions/php3_unified_odbc.h:1.52 php3/functions/php3_unified_odbc.h:1.53
--- php3/functions/php3_unified_odbc.h:1.52 Thu Jul 15 11:55:40 1999
+++ php3/functions/php3_unified_odbc.h Fri Jul 16 14:25:28 1999
@@ -29,7 +29,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php3_unified_odbc.h,v 1.52 1999/07/15 15:55:40 rasmus Exp $ */
+/* $Id: php3_unified_odbc.h,v 1.53 1999/07/16 18:25:28 jim Exp $ */
#ifndef _UNIFIED_ODBC_H
#define _UNIFIED_ODBC_H
@@ -379,7 +379,7 @@
extern UODBC_FUNCTION(longreadlen);
typedef struct UODBC_CONNECTION {
-#if HAVE_DB2
+#if HAVE_IBMDB2
SQLHANDLE hdbc;
#else
HDBC hdbc;
@@ -398,7 +398,7 @@
} UODBC_RESULT_VALUE;
typedef struct UODBC_RESULT {
-#if HAVE_DB2
+#if HAVE_IBMDB2
SQLHANDLE stmt;
#else
HSTMT stmt;
@@ -413,7 +413,7 @@
} UODBC_RESULT;
typedef struct {
-#if HAVE_DB2
+#if HAVE_IBMDB2
SQLHANDLE henv;
#else
HENV henv;
Index: php3/win32/db2.dsp
diff -u php3/win32/db2.dsp:1.1 php3/win32/db2.dsp:1.2
--- php3/win32/db2.dsp:1.1 Mon Jun 28 17:43:31 1999
+++ php3/win32/db2.dsp Fri Jul 16 14:25:29 1999
@@ -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 "DB2_EXPORTS" /YX /FD
/c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "include/db2" /I ".." /I
"include" /D HAVE_UODBC=1 /D HAVE_DB2=1 /D "UODBC_UNIQUE_NAMES" /D
"COMPILE_DL" /D "MSVC5" /D "NDEBUG" /D "WIN32" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DB2_EXPORTS" /YX /FD
/c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "include/db2" /I ".." /I
"include" /D "NDEBUG" /D HAVE_UODBC=1 /D HAVE_IBMDB2=1 /D
"UODBC_UNIQUE_NAMES" /D "COMPILE_DL" /D "MSVC5" /D "WIN32"
/D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DB2_EXPORTS" /YX
/FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DB2_EXPORTS" /YX /FD
/GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "include/db2" /I ".." /I
"include" /D HAVE_UODBC=1 /D HAVE_DB2=1 /D "UODBC_UNIQUE_NAMES" /D
"COMPILE_DL" /D "MSVC5" /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DB2_EXPORTS" /YX /FD
/GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "include/db2" /I ".." /I
"include" /D "_DEBUG" /D HAVE_UODBC=1 /D HAVE_IBMDB2=1 /D
"UODBC_UNIQUE_NAMES" /D "COMPILE_DL" /D "MSVC5" /D "WIN32"
/D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DB2_EXPORTS" /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"