- Fix win32/mysql.

- Revert cryptic WS commit on php4dllts.dsp.

diff --git a/ext/mysql/libmysql/config-win.h b/ext/mysql/libmysql/config-win.h
index 2b0e520bcdeba155f22993455667738ecdbd5543..a737130e84e057b60ffaf56b682ce5744248ad9c 100644 (file)
--- a/ext/mysql/libmysql/config-win.h
+++ b/ext/mysql/libmysql/config-win.h
@@ -239,7 +239,7 @@ inline double ulonglong2double(ulonglong value)
 #define HAVE_ALLOCA
 #define HAVE_STRPBRK
 #define HAVE_STRSTR
-#define HAVE_COMPRESS
+/* #define HAVE_COMPRESS     -- not with PHP, please */ 
 
 #ifdef NOT_USED
 #define HAVE_SNPRINTF          /* Gave link error */
@@ -273,6 +273,7 @@ inline double ulonglong2double(ulonglong value)
 #define FN_ROOTDIR     "\\"
 #define FN_NETWORK_DRIVES      /* Uses \\ to indicate network drives */
 #define FN_NO_CASE_SENCE       /* Files are not case-sensitive */
+#define FN_LOWER_CASE TRUE  /* Files are represented in lower case */
 #define MY_NFILE       1024
 
 #define DO_NOT_REMOVE_THREAD_WRAPPERS

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index 65e42cf6b5dc5828db2d8babd8d33fc1279500ef..b667e90f3ea0693528f71229f41866df74ef77a6 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -1,42 +1,26 @@
 # Microsoft Developer Studio Project File - Name="php4dllts" - Package Owner=<4>\r
 # Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-\r
 # ** DO NOT EDIT **\r
 \r
-\r
-\r
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
 \r
 CFG=php4dllts - Win32 Debug_TS\r
-\r
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-\r
 !MESSAGE use the Export Makefile command and run\r
-\r
 !MESSAGE \r
 !MESSAGE NMAKE /f "php4dllts.mak".\r
 !MESSAGE \r
-\r
 !MESSAGE You can specify a configuration when running NMAKE\r
-\r
 !MESSAGE by defining the macro CFG on the command line. For example:\r
-\r
 !MESSAGE \r
 !MESSAGE NMAKE /f "php4dllts.mak" CFG="php4dllts - Win32 Debug_TS"\r
 !MESSAGE \r
-\r
 !MESSAGE Possible choices for configuration are:\r
-\r
 !MESSAGE \r
-\r
 !MESSAGE "php4dllts - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
-\r
 !MESSAGE "php4dllts - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library")\r
-\r
 !MESSAGE "php4dllts - Win32 Release_TS_inline" (based on "Win32 (x86) Dynamic-Link Library")\r
-\r
 !MESSAGE "php4dllts - Win32 Release_TSDbg" (based on "Win32 (x86) Dynamic-Link Library")\r
-\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -71,11 +55,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-\r
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"..\Debug_TS\php4ts_debug.dll" /pdbtype:sept /libpath:"..\TSRM\Debug_TS" /libpath:"..\Zend\Debug_TS" /libpath:"..\..\bindlib_w32\Debug" /libpath:"..\ext\mysql\libmysql\Debug_TS" /libpath:"Debug_TS"\r
 \r
-\r
-\r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
 \r
 # PROP BASE Use_MFC 0\r
@@ -100,11 +81,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-\r
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS" /libpath:"Release_TS"\r
 \r
-\r
-\r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS_inline"\r
 \r
 # PROP BASE Use_MFC 0\r
@@ -130,11 +108,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib /nologo /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"Release_TS/php4ts.dll" /libpath:"TSRM\Release_TS" /libpath:"Zend\Release_TS" /libpath:"..\bindlib_w32\Release"\r
-\r
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS_inline\php4ts.dll" /libpath:"..\TSRM\Release_TS_inline" /libpath:"..\Zend\Release_TS_inline" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS_inline" /libpath:"Release_TS_Inline"\r
 \r
-\r
-\r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TSDbg"\r
 \r
 # PROP BASE Use_MFC 0\r
@@ -160,11 +135,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TS\php4ts.dll" /libpath:"..\TSRM\Release_TS" /libpath:"..\Zend\Release_TS" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TS" /libpath:"Release_TS"\r
-\r
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib wsock32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZendTS.lib TSRM.lib resolv.lib libmysql.lib /nologo /version:4.0 /dll /debug /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libcmt.lib" /out:"..\Release_TSDbg\php4ts.dll" /libpath:"..\TSRM\Release_TSDbg" /libpath:"..\Zend\Release_TSDbg" /libpath:"..\..\bindlib_w32\Release" /libpath:"..\ext\mysql\libmysql\Release_TSDbg" /libpath:"Release_TSDbg"\r
 \r
-\r
-\r
 !ENDIF \r
 \r
 # Begin Target\r
@@ -346,15 +318,10 @@ SOURCE=..\ext\standard\cyr_convert.h
 # Begin Source File\r
 \r
 SOURCE="..\main\fopen_wrappers.h"\r
-\r
 # End Source File\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\main\getopt.h\r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -364,15 +331,10 @@ SOURCE=..\main\internal_functions_registry.h
 \r
 SOURCE=..\main\logos.h\r
 # End Source File\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\main\output.h\r
-\r
 # End Source File\r
-\r
 # Begin Source File\r
 \r
 SOURCE=..\main\php.h\r
@@ -1473,105 +1435,55 @@ SOURCE=..\ext\bcmath\libbcmath\src\private.h
 \r
 # End Source File\r
 # End Group\r
-\r
 # End Group\r
-\r
 # Begin Group "COM"\r
 \r
-\r
-\r
 # PROP Default_Filter ""\r
-\r
 # Begin Group "Source Files No. 9"\r
 \r
-\r
-\r
 # PROP Default_Filter ".c"\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\com\COM.c\r
-\r
 # End Source File\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\com\conversion.c\r
-\r
 # End Source File\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\com\dispatch.c\r
-\r
 # End Source File\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\com\VARIANT.c\r
-\r
 # End Source File\r
-\r
 # End Group\r
-\r
 # Begin Group "Header Files No. 9"\r
 \r
-\r
-\r
 # PROP Default_Filter ".h"\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\com\com.h\r
-\r
 # End Source File\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\com\conversion.h\r
-\r
 # End Source File\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\com\php_COM.h\r
-\r
 # End Source File\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\com\php_VARIANT.h\r
-\r
 # End Source File\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\com\variant.h\r
-\r
 # End Source File\r
-\r
 # End Group\r
-\r
 # End Group\r
-\r
 # Begin Group "Standard"\r
 \r
 # PROP Default_Filter ""\r
@@ -1864,15 +1776,10 @@ SOURCE=..\ext\standard\flock_compat.h
 # Begin Source File\r
 \r
 SOURCE=..\ext\standard\fsock.h\r
-\r
 # End Source File\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\functions\global.h\r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -1896,16 +1803,10 @@ SOURCE=..\ext\session\mod_user.h
 # End Source File\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\bcmath\number.h\r
-\r
 # End Source File\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\standard\pageinfo.h\r
 # End Source File\r
 # Begin Source File\r
@@ -1974,76 +1875,43 @@ SOURCE=..\ext\standard\php_string.h
 # End Source File\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\standard\php_syslog.h\r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\functions\phpdir.h\r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\functions\phpmath.h\r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\standard\reg.h\r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\standard\scanf.h\r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\standard\type.h\r
-\r
 # End Source File\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\standard\uniqid.h\r
-\r
 # End Source File\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\standard\url.h\r
-\r
 # End Source File\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\standard\url_scanner.h\r
-\r
 # End Source File\r
-\r
 # Begin Source File\r
 \r
-\r
-\r
 SOURCE=..\ext\standard\url_scanner_ex.h\r
-\r
 # End Source File\r
 # End Group\r
 # End Group\r