cvs: /php4 main.c php.h php4dllts.dsp php4ts.dsp /php4/ext/mysql mysql.dsp /php4/ext/oci8 oci8.c /php4/sapi/isapi php4isapi.dsp /php4/win32 syslog.h
wsyslog.c

zeev Sat Feb 19 05:11:33 2000 EDT Modified files: /php4 main.c php.h php4dllts.dsp php4ts.dsp /php4/ext/mysql mysql.dsp /php4/ext/oci8 oci8.c /php4/sapi/isapi php4isapi.dsp /php4/win32 syslog.h wsyslog.c Log: Index: php4/main.c diff -u php4/main.c:1.210 php4/main.c:1.211 --- php4/main.c:1.210 Thu Feb 17 12:32:51 2000 +++ php4/main.c Sat Feb 19 05:11:01 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.210 2000/02/17 20:32:51 ssb Exp $ */ +/* $Id: main.c,v 1.211 2000/02/19 13:11:01 zeev Exp $ */ #include <stdio.h> @@ -288,7 +288,7 @@ 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 @@ /* 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; Index: php4/php.h diff -u php4/php.h:1.63 php4/php.h:1.64 --- php4/php.h:1.63 Fri Feb 18 02:13:15 2000 +++ php4/php.h Sat Feb 19 05:11:01 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.63 2000/02/18 10:13:15 sas Exp $ */ +/* $Id: php.h,v 1.64 2000/02/19 13:11:01 zeev Exp $ */ #ifndef _PHP_H #define _PHP_H @@ -246,11 +246,11 @@ #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); Index: php4/php4dllts.dsp diff -u php4/php4dllts.dsp:1.53 php4/php4dllts.dsp:1.54 --- php4/php4dllts.dsp:1.53 Sat Feb 12 07:47:51 2000 +++ php4/php4dllts.dsp Sat Feb 19 05:11:01 2000 @@ -54,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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" +# 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" !ELSEIF "$(CFG)" == "php4dllts - Win32 Release_TS" Index: php4/php4ts.dsp diff -u php4/php4ts.dsp:1.19 php4/php4ts.dsp:1.20 --- php4/php4ts.dsp:1.19 Fri Feb 11 08:28:49 2000 +++ php4/php4ts.dsp Sat Feb 19 05:11:01 2000 @@ -77,7 +77,7 @@ # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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" +# 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" # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "php4ts - Win32 Release_TS_inline" Index: php4/ext/mysql/mysql.dsp diff -u php4/ext/mysql/mysql.dsp:1.8 php4/ext/mysql/mysql.dsp:1.9 --- php4/ext/mysql/mysql.dsp:1.8 Sat Feb 12 11:46:45 2000 +++ php4/ext/mysql/mysql.dsp Sat Feb 19 05:11:01 2000 @@ -55,7 +55,7 @@ # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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" +# 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" !ELSEIF "$(CFG)" == "mysql - Win32 Debug" @@ -81,7 +81,7 @@ # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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" +# 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" !ELSEIF "$(CFG)" == "mysql - Win32 Debug_TS" @@ -107,7 +107,7 @@ # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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" +# 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" !ELSEIF "$(CFG)" == "mysql - Win32 Release_TS" Index: php4/ext/oci8/oci8.c diff -u php4/ext/oci8/oci8.c:1.54 php4/ext/oci8/oci8.c:1.55 --- php4/ext/oci8/oci8.c:1.54 Thu Feb 10 11:41:19 2000 +++ php4/ext/oci8/oci8.c Sat Feb 19 05:11:02 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: oci8.c,v 1.54 2000/02/10 19:41:19 zeev Exp $ */ +/* $Id: oci8.c,v 1.55 2000/02/19 13:11:02 zeev Exp $ */ /* TODO list: * @@ -774,7 +774,7 @@ /* {{{ oci_debug() */ -static void oci_debug(const char *format,...) +static void oci_debug(const char *format, ...) { OCILS_FETCH(); Index: php4/sapi/isapi/php4isapi.dsp diff -u php4/sapi/isapi/php4isapi.dsp:1.6 php4/sapi/isapi/php4isapi.dsp:1.7 --- php4/sapi/isapi/php4isapi.dsp:1.6 Fri Feb 11 08:28:50 2000 +++ php4/sapi/isapi/php4isapi.dsp Sat Feb 19 05:11:02 2000 @@ -41,6 +41,7 @@ # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug_TS" # PROP Intermediate_Dir "Debug_TS" +# 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 "PHP4ISAPI_EXPORTS" /YX /FD /GZ /c # 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 @@ -53,7 +54,7 @@ # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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" +# 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" !ELSEIF "$(CFG)" == "php4isapi - Win32 Release_TS" Index: php4/win32/syslog.h diff -u php4/win32/syslog.h:1.1 php4/win32/syslog.h:1.2 --- php4/win32/syslog.h:1.1 Wed Apr 7 14:05:12 1999 +++ php4/win32/syslog.h Sat Feb 19 05:11:02 2000 @@ -67,7 +67,7 @@ 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 */ Index: php4/win32/wsyslog.c diff -u php4/win32/wsyslog.c:1.3 php4/win32/wsyslog.c:1.4 --- php4/win32/wsyslog.c:1.3 Fri Apr 23 17:12:00 1999 +++ php4/win32/wsyslog.c Sat Feb 19 05:11:02 2000 @@ -73,7 +73,7 @@ * parameters */ -void syslog(int priority, const char *message,...) +void syslog(int priority, const char *message, ...) { va_list args; LPTSTR strs[2];