*** empty log message ***

diff --git a/ext/mysql/mysql.dsp b/ext/mysql/mysql.dsp
index 53b23a79d8f349fa94c7270aca2a76f5032957a9..564baad048a1683fae8d5888dcec90e8a6fea3d7 100644 (file)
--- a/ext/mysql/mysql.dsp
+++ b/ext/mysql/mysql.dsp
@@ -55,7 +55,7 @@ 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
-# ADD 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 libmySQL.lib php4nts.lib /nologo /dll /machine:I386 /out:"Release/php_mysql.dll" /libpath:"..\..\..\MySQL\libmysql\Release" /libpath:"..\..\Release"\r
+# ADD 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 libmySQL.lib php4nts.lib /nologo /dll /machine:I386 /out:"Release/php_mysql.dll" /libpath:"..\..\..\MySQL\lib\opt" /libpath:"..\..\Release"\r
 \r
 !ELSEIF  "$(CFG)" == "mysql - Win32 Debug"\r
 \r
@@ -81,7 +81,7 @@ 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
-# ADD 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 libmySQL.lib php4nts.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_mysql.dll" /pdbtype:sept /libpath:"..\..\..\MySQL\libmysql\Debug" /libpath:"..\..\Debug"\r
+# ADD 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 libmySQL.lib php4nts.lib /nologo /dll /debug /machine:I386 /out:"Debug/php_mysql.dll" /pdbtype:sept /libpath:"..\..\..\MySQL\lib\Debug" /libpath:"..\..\Debug"\r
 \r
 !ELSEIF  "$(CFG)" == "mysql - Win32 Debug_TS"\r
 \r
@@ -107,7 +107,7 @@ 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
-# ADD 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 libmySQL.lib php4ts.lib /nologo /dll /debug /machine:I386 /out:"Debug_TS/php_mysql.dll" /pdbtype:sept /libpath:"..\..\..\MySQL\libmysql\Debug" /libpath:"..\..\Debug_TS"\r
+# ADD 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 libmySQL.lib php4ts.lib /nologo /dll /debug /machine:I386 /out:"Debug_TS/php_mysql.dll" /pdbtype:sept /libpath:"..\..\..\MySQL\lib\Debug" /libpath:"..\..\Debug_TS"\r
 \r
 !ELSEIF  "$(CFG)" == "mysql - Win32 Release_TS"\r
 \r

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index 8304a0bb838096a87e2371ef92b6f53839100d49..992ea3a07d0c586b8487f3a9496eb273db4ed755 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -774,7 +774,7 @@ static int oci_ping(oci_server *server)
 
 /* {{{ oci_debug() */
 
-static void oci_debug(const char *format,...)
+static void oci_debug(const char *format, ...)
 {
        OCILS_FETCH();
 

diff --git a/main/main.c b/main/main.c
index 2e6f8a2d3412f15262c9fde6bd223c37e0756812..d78bddb2833948ddd2adba6cc0c92ba8629fd37a 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -288,7 +288,7 @@ PHPAPI int php_write(void *buf, int size)
        return PHPWRITE(buf, size);
 }
 
-PHPAPI int php_printf(const char *format,...)
+PHPAPI int php_printf(const char *format, ...)
 {
        va_list args;
        int ret;
@@ -305,7 +305,7 @@ PHPAPI int php_printf(const char *format,...)
 
 
 /* extended error handling function */
-PHPAPI void php_error(int type, const char *format,...)
+PHPAPI void php_error(int type, const char *format, ...)
 {
        va_list args;
        char *error_filename = NULL;

diff --git a/main/php.h b/main/php.h
index ff9ddc4e041dc0f8fa1e89ca39b12cf5265c92ef..d60a8f1f96d330207ad76acc87060a7225b3dc90 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -246,11 +246,11 @@ extern char **environ;
 #endif
 
 extern void phperror(char *error);
-extern PHPAPI void php_error(int type, const char *format,...);
+extern PHPAPI void php_error(int type, const char *format, ...);
 extern PHPAPI int php_write(void *buf, int size);
-extern PHPAPI int php_printf(const char *format,...);
+extern PHPAPI int php_printf(const char *format, ...);
 extern void php_log_err(char *log_message);
-extern int Debug(char *format,...);
+extern int Debug(char *format, ...);
 extern int cfgparse(void);
 
 extern void html_putc(char c);

diff --git a/php4dllts.dsp b/php4dllts.dsp
index be6eb8adeabe4c55daacc98b0e5b4f81e58f0575..09c8969d6db8c6e42e6d9b572f095bea6302cd0b 100644 (file)
--- a/php4dllts.dsp
+++ b/php4dllts.dsp
@@ -54,7 +54,7 @@ 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
-# 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 /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /nodefaultlib:"libc" /out:"Debug_TS/php4ts.dll" /pdbtype:sept /libpath:"TSRM\Debug_TS" /libpath:"Zend\Debug_TS" /libpath:"..\bindlib_w32\Debug"\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 /nologo /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"\r
 \r
 !ELSEIF  "$(CFG)" == "php4dllts - Win32 Release_TS"\r
 \r

diff --git a/php4ts.dsp b/php4ts.dsp
index da327a1a737ce7be6dad4fce374bf2afc1133c72..d3c0ee5b215fb3bd81fc8caa13ae7e70c33ca06e 100644 (file)
--- a/php4ts.dsp
+++ b/php4ts.dsp
@@ -77,7 +77,7 @@ 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 /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 winmm.lib wsock32.lib netapi32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /version:3.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"Debug_TS\php.exe" /pdbtype:sept /libpath:"Debug_TS"\r
+# ADD LINK32 winmm.lib netapi32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /version:3.0 /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd" /nodefaultlib:"libcmt" /out:"Debug_TS\php.exe" /pdbtype:sept /libpath:"Debug_TS"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "php4ts - Win32 Release_TS_inline"\r

diff --git a/sapi/isapi/php4isapi.dsp b/sapi/isapi/php4isapi.dsp
index 3e68296c68f662cc014861b64ab3735ea648370d..b0740bfa840fb9a0111558d8d562efb1b02188ed 100644 (file)
--- a/sapi/isapi/php4isapi.dsp
+++ b/sapi/isapi/php4isapi.dsp
@@ -41,6 +41,7 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "Debug_TS"\r
 # PROP Intermediate_Dir "Debug_TS"\r
+# PROP Ignore_Export_Lib 0\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 "PHP4ISAPI_EXPORTS" /YX /FD /GZ /c\r
 # ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\win32" /I "..\..\Zend" /I "..\.." /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "PHP4ISAPI_EXPORTS" /D "COMPILE_LIBZEND" /D ZEND_DEBUG=1 /D "MSVC5" /D "ZTS" /D "WIN32" /D "_MBCS" /D "ZEND_WIN32" /D "PHP_WIN32" /FR /YX /FD /GZ /c\r
@@ -53,7 +54,7 @@ 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
-# 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 php4ts.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /pdbtype:sept /libpath:"..\..\Debug_TS"\r
+# ADD LINK32 wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt" /pdbtype:sept /libpath:"..\..\Debug_TS"\r
 \r
 !ELSEIF  "$(CFG)" == "php4isapi - Win32 Release_TS"\r
 \r

diff --git a/win32/syslog.h b/win32/syslog.h
index 22239fb4e59c8c0bdaaa251f65e7eb86a88a56a2..53fd3e67035bd7c8ec1be75d7b6d4810fe59ac37 100644 (file)
--- a/win32/syslog.h
+++ b/win32/syslog.h
@@ -67,7 +67,7 @@ extern void closelog(void);
 extern void openlog(const char *, int, int);
 // setlogmask not implemented
 //extern int    setlogmask (int);
-extern void syslog(int, const char *,...);
+extern void syslog(int, const char *, ...);
 
 
 #endif                                                 /* _SYS_LOG_H */

diff --git a/win32/wsyslog.c b/win32/wsyslog.c
index 616b6f8a0776881ee9456cdadc6d18e7df68ce84..7db5156011cb59aae81a2766144ef3934aa117ab 100644 (file)
--- a/win32/wsyslog.c
+++ b/win32/wsyslog.c
@@ -73,7 +73,7 @@ void closelog(void)
  *      parameters
  */
 
-void syslog(int priority, const char *message,...)
+void syslog(int priority, const char *message, ...)
 {
        va_list args;
        LPTSTR strs[2];