CVS update: php3

Date: Saturday October 17, 1998 @ 15:32 Author: shane Update of /repository/php3 In directory asf:/u2/tmp/cvs-serv22110 Modified Files: config.w32.h main.c php3_debugger.h win95nt.h Log Message: Get rid of some anoying compiler warnings. is typedefing ntohs in dns.c ok on other platforms? Index: php3/config.w32.h diff -c php3/config.w32.h:1.73 php3/config.w32.h:1.74 *** php3/config.w32.h:1.73 Tue Sep 29 19:33:25 1998 --- php3/config.w32.h Sat Oct 17 15:32:50 1998 *************** *** 201,207 **** --- 201,209 ---- #define HAVE_SETLOCALE 1 /* Define if you have the setvbuf function. */ + #ifndef HAVE_BINDLIB #define HAVE_SETVBUF 1 + #endif /* Define if you have the snprintf function. */ #define HAVE_SNPRINTF 1 Index: php3/main.c diff -c php3/main.c:1.475 php3/main.c:1.476 *** php3/main.c:1.475 Sat Oct 17 14:17:27 1998 --- php3/main.c Sat Oct 17 15:32:50 1998 *************** *** 29,35 **** +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.475 1998/10/17 18:17:27 zeev Exp $ */ /* #define CRASH_DETECTION */ --- 29,35 ---- +----------------------------------------------------------------------+ */ ! /* $Id: main.c,v 1.476 1998/10/17 19:32:50 shane Exp $ */ /* #define CRASH_DETECTION */ *************** *** 384,390 **** if (GLOBAL(debugger_on)) { va_start(args, format); vsnprintf(buffer, sizeof(buffer) - 1, format, args); ! php3_debugger_error(buffer, type, filename, php3_get_lineno()); va_end(args); } #endif --- 384,390 ---- if (GLOBAL(debugger_on)) { va_start(args, format); vsnprintf(buffer, sizeof(buffer) - 1, format, args); ! php3_debugger_error(buffer, type, filename, php3_get_lineno(GLOBAL(current_lineno))); va_end(args); } #endif Index: php3/php3_debugger.h diff -c php3/php3_debugger.h:1.7 php3/php3_debugger.h:1.8 *** php3/php3_debugger.h:1.7 Fri May 15 06:56:24 1998 --- php3/php3_debugger.h Sat Oct 17 15:32:51 1998 *************** *** 36,42 **** #define debugger_module_ptr &debugger_module_entry #if WIN32|WINNT ! typedef int pid_t; #endif typedef struct { --- 36,42 ---- #define debugger_module_ptr &debugger_module_entry #if WIN32|WINNT ! typedef long pid_t; #endif typedef struct { Index: php3/win95nt.h diff -c php3/win95nt.h:1.18 php3/win95nt.h:1.19 *** php3/win95nt.h:1.18 Sat Sep 19 16:21:23 1998 --- php3/win95nt.h Sat Oct 17 15:32:51 1998 *************** *** 20,31 **** #define S_IFLNK _IFLNK #define pclose _pclose #define popen _popen ! #define chdir _chdir #define mkdir(a,b) _mkdir(a) #define rmdir _rmdir #define getpid _getpid #if !(APACHE) ! #define sleep(s) _sleep(s*1000) #endif #define getcwd _getcwd #define snprintf _snprintf --- 20,31 ---- #define S_IFLNK _IFLNK #define pclose _pclose #define popen _popen ! #define chdir(path) SetCurrentDirectory(path) #define mkdir(a,b) _mkdir(a) #define rmdir _rmdir #define getpid _getpid #if !(APACHE) ! #define sleep(t) Sleep(t*1000) #endif #define getcwd _getcwd #define snprintf _snprintf *************** *** 36,42 **** #if !NSAPI #define strcasecmp(s1, s2) stricmp(s1, s2) #define strncasecmp(s1, s2, n) strnicmp(s1, s2, n) ! typedef int pid_t; #endif /* missing in vc5 math.h */ --- 36,42 ---- #if !NSAPI #define strcasecmp(s1, s2) stricmp(s1, s2) #define strncasecmp(s1, s2, n) strnicmp(s1, s2, n) ! typedef long pid_t; #endif /* missing in vc5 math.h */ -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net