cvs: /php4/ext/standard array.c basic_functions.c basic_functions.h crypt.c dir.c dl.c dns.c dns.h exec.c file.c filestat.c flock_compat.c
flock_compat.h fsock.c fsock.h info.c lcg.c link.c mail.c microtime.c pack.c pageinfo.c parsedate.y string.c syslog.c uniqid.c

andi Thu Feb 10 13:54:26 2000 EDT Modified files: /php4/ext/standard array.c basic_functions.c basic_functions.h crypt.c dir.c dl.c dns.c dns.h exec.c file.c filestat.c flock_compat.c flock_compat.h fsock.c fsock.h info.c lcg.c link.c mail.c microtime.c pack.c pageinfo.c parsedate.y string.c syslog.c uniqid.c Log: - Get rid of some more evil MSVC5's and switch standard/ to use PHP_WIN32 Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.24 php4/ext/standard/array.c:1.25 --- php4/ext/standard/array.c:1.24 Sat Feb 5 07:44:18 2000 +++ php4/ext/standard/array.c Thu Feb 10 13:53:55 2000 @@ -30,7 +30,7 @@ #else #include <strings.h> #endif -#if WIN32|WINNT +#if PHP_WIN32 #include "win32/unistd.h" #endif #include "zend_globals.h" Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.157 php4/ext/standard/basic_functions.c:1.158 --- php4/ext/standard/basic_functions.c:1.157 Thu Feb 10 11:41:19 2000 +++ php4/ext/standard/basic_functions.c Thu Feb 10 13:53:55 2000 @@ -42,7 +42,7 @@ #include <locale.h> #endif #include "safe_mode.h" -#if WIN32|WINNT +#if PHP_WIN32 #include "win32/unistd.h" #endif #include "zend_globals.h" @@ -194,7 +194,7 @@ PHP_FE(gethostbyaddr, NULL) PHP_FE(gethostbyname, NULL) PHP_FE(gethostbynamel, NULL) -#if !(WIN32|WINNT)||HAVE_BINDLIB +#if !(PHP_WIN32)||HAVE_BINDLIB PHP_FE(checkdnsrr, NULL) PHP_FE(getmxrr, second_and_third_args_force_ref) #endif Index: php4/ext/standard/basic_functions.h diff -u php4/ext/standard/basic_functions.h:1.44 php4/ext/standard/basic_functions.h:1.45 --- php4/ext/standard/basic_functions.h:1.44 Mon Jan 31 14:31:00 2000 +++ php4/ext/standard/basic_functions.h Thu Feb 10 13:53:55 2000 @@ -29,7 +29,7 @@ */ -/* $Id: basic_functions.h,v 1.44 2000/01/31 22:31:00 zeev Exp $ */ +/* $Id: basic_functions.h,v 1.45 2000/02/10 21:53:55 andi Exp $ */ #ifndef _BASIC_FUNCTIONS_H #define _BASIC_FUNCTIONS_H @@ -107,7 +107,7 @@ PHP_FUNCTION(extension_loaded); PHP_FUNCTION(get_extension_funcs); -#if MSVC5 +#if PHP_WIN32 typedef unsigned int php_stat_len; #else typedef int php_stat_len; Index: php4/ext/standard/crypt.c diff -u php4/ext/standard/crypt.c:1.16 php4/ext/standard/crypt.c:1.17 --- php4/ext/standard/crypt.c:1.16 Sat Feb 5 07:16:11 2000 +++ php4/ext/standard/crypt.c Thu Feb 10 13:53:55 2000 @@ -17,7 +17,7 @@ | Rasmus Lerdorf <rasmus@lerdorf.on.ca> | +----------------------------------------------------------------------+ */ -/* $Id: crypt.c,v 1.16 2000/02/05 15:16:11 zeev Exp $ */ +/* $Id: crypt.c,v 1.17 2000/02/10 21:53:55 andi Exp $ */ #include <stdlib.h> #include "php.h" @@ -41,7 +41,7 @@ #include <strings.h> #endif -#if MSVC5 +#if PHP_WIN32 #include <process.h> extern char *crypt(char *__key,char *__salt); #endif Index: php4/ext/standard/dir.c diff -u php4/ext/standard/dir.c:1.24 php4/ext/standard/dir.c:1.25 --- php4/ext/standard/dir.c:1.24 Fri Dec 31 17:31:49 1999 +++ php4/ext/standard/dir.c Thu Feb 10 13:53:55 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dir.c,v 1.24 2000/01/01 01:31:49 sas Exp $ */ +/* $Id: dir.c,v 1.25 2000/02/10 21:53:55 andi Exp $ */ /* {{{ includes/startup/misc */ @@ -36,7 +36,7 @@ #include <errno.h> -#if WIN32||WINNT +#if PHP_WIN32 #define NEEDRDH 1 #include "win32/readdir.h" #endif Index: php4/ext/standard/dl.c diff -u php4/ext/standard/dl.c:1.22 php4/ext/standard/dl.c:1.23 --- php4/ext/standard/dl.c:1.22 Thu Feb 10 11:41:19 2000 +++ php4/ext/standard/dl.c Thu Feb 10 13:53:55 2000 @@ -33,7 +33,7 @@ #else #include <strings.h> #endif -#if MSVC5 +#if PHP_WIN32 #include "win32/param.h" #include "win32/winutil.h" #else @@ -113,7 +113,7 @@ } else { error_type = E_CORE_ERROR; } -#if MSVC5 +#if PHP_WIN32 php_error(error_type,"Unable to load dynamic library '%s'<br>\n%s",libpath,php_win_err()); #else php_error(error_type,"Unable to load dynamic library '%s' - %s",libpath,dlerror()); Index: php4/ext/standard/dns.c diff -u php4/ext/standard/dns.c:1.12 php4/ext/standard/dns.c:1.13 --- php4/ext/standard/dns.c:1.12 Fri Dec 31 17:31:51 1999 +++ php4/ext/standard/dns.c Thu Feb 10 13:53:55 2000 @@ -16,13 +16,13 @@ +----------------------------------------------------------------------+ */ -/* $Id: dns.c,v 1.12 2000/01/01 01:31:51 sas Exp $ */ +/* $Id: dns.c,v 1.13 2000/02/10 21:53:55 andi Exp $ */ #include "php.h" #if HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif -#if WIN32|WINNT +#if PHP_WIN32 #if HAVE_BINDLIB #ifndef WINNT #define WINNT 1 @@ -158,7 +158,7 @@ return estrdup(inet_ntoa(in)); } -#if !(WIN32|WINNT)||HAVE_BINDLIB +#if !(PHP_WIN32)||HAVE_BINDLIB /* {{{ proto int checkdnsrr(string host [, string type]) Check DNS records corresponding to a given Internet host name or IP address */ Index: php4/ext/standard/dns.h diff -u php4/ext/standard/dns.h:1.2 php4/ext/standard/dns.h:1.3 --- php4/ext/standard/dns.h:1.2 Sun May 16 04:19:25 1999 +++ php4/ext/standard/dns.h Thu Feb 10 13:53:55 2000 @@ -29,7 +29,7 @@ */ -/* $Id: dns.h,v 1.2 1999/05/16 11:19:25 sas Exp $ */ +/* $Id: dns.h,v 1.3 2000/02/10 21:53:55 andi Exp $ */ #ifndef _DNS_H #define _DNS_H @@ -37,7 +37,7 @@ PHP_FUNCTION(gethostbyaddr); PHP_FUNCTION(gethostbyname); PHP_FUNCTION(gethostbynamel); -#if !(WIN32|WINNT)||(HAVE_BINDLIB) +#if !(PHP_WIN32)||(HAVE_BINDLIB) PHP_FUNCTION(checkdnsrr); PHP_FUNCTION(getmxrr); #endif Index: php4/ext/standard/exec.c diff -u php4/ext/standard/exec.c:1.22 php4/ext/standard/exec.c:1.23 --- php4/ext/standard/exec.c:1.22 Thu Feb 10 11:41:19 2000 +++ php4/ext/standard/exec.c Thu Feb 10 13:53:55 2000 @@ -15,7 +15,7 @@ | Author: Rasmus Lerdorf | +----------------------------------------------------------------------+ */ -/* $Id: exec.c,v 1.22 2000/02/10 19:41:19 zeev Exp $ */ +/* $Id: exec.c,v 1.23 2000/02/10 21:53:55 andi Exp $ */ #include <stdio.h> #include "php.h" @@ -86,7 +86,7 @@ tmp = php_escape_shell_cmd(d); efree(d); d = tmp; -#if WIN32|WINNT +#if PHP_WIN32 fp = popen(d, "rb"); #else fp = popen(d, "r"); @@ -98,7 +98,7 @@ return -1; } } else { /* not safe_mode */ -#if WIN32|WINNT +#if PHP_WIN32 fp = popen(cmd, "rb"); #else fp = popen(cmd, "r"); @@ -363,7 +363,7 @@ } convert_to_string_ex(cmd); -#if WIN32|WINNT +#if PHP_WIN32 if ((in=popen((*cmd)->value.str.val,"rt"))==NULL) { #else if ((in=popen((*cmd)->value.str.val,"r"))==NULL) { Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.63 php4/ext/standard/file.c:1.64 --- php4/ext/standard/file.c:1.63 Tue Feb 8 13:29:18 2000 +++ php4/ext/standard/file.c Thu Feb 10 13:53:55 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.63 2000/02/08 21:29:18 zeev Exp $ */ +/* $Id: file.c,v 1.64 2000/02/10 21:53:55 andi Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -34,7 +34,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#if MSVC5 +#if PHP_WIN32 #include <windows.h> #include <winsock.h> #define O_RDONLY _O_RDONLY @@ -49,7 +49,7 @@ #include "php_string.h" #include "file.h" #if HAVE_PWD_H -#if MSVC5 +#if PHP_WIN32 #include "win32/pwd.h" #else #include <pwd.h> @@ -58,7 +58,7 @@ #ifdef HAVE_SYS_TIME_H #include <sys/time.h> #endif -#if WIN32|WINNT +#if PHP_WIN32 #include <winsock.h> #else #include <netinet/in.h> @@ -832,7 +832,7 @@ int flags; int myflag = 0; -#if WIN32|WINNT +#if PHP_WIN32 /* with ioctlsocket, a non-zero sets nonblocking, a zero sets blocking */ flags = block; if (ioctlsocket(socketd,FIONBIO,&flags)==SOCKET_ERROR){ @@ -1525,7 +1525,7 @@ RETURN_FALSE; } -#if WIN32|WINNT +#if PHP_WIN32 if ((fd_s=open((*source)->value.str.val,O_RDONLY|_O_BINARY))==-1) { #else if ((fd_s=open((*source)->value.str.val,O_RDONLY))==-1) { @@ -1533,7 +1533,7 @@ php_error(E_WARNING,"Unable to open '%s' for reading: %s",(*source)->value.str.val,strerror(errno)); RETURN_FALSE; } -#if WIN32|WINNT +#if PHP_WIN32 if ((fd_t=open((*target)->value.str.val,_O_WRONLY|_O_CREAT|_O_TRUNC|_O_BINARY,_S_IREAD|_S_IWRITE))==-1){ #else if ((fd_t=creat((*target)->value.str.val,0777))==-1) { Index: php4/ext/standard/filestat.c diff -u php4/ext/standard/filestat.c:1.21 php4/ext/standard/filestat.c:1.22 --- php4/ext/standard/filestat.c:1.21 Fri Dec 31 17:31:52 1999 +++ php4/ext/standard/filestat.c Thu Feb 10 13:53:56 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: filestat.c,v 1.21 2000/01/01 01:31:52 sas Exp $ */ +/* $Id: filestat.c,v 1.22 2000/02/10 21:53:56 andi Exp $ */ #include "php.h" #include "safe_mode.h" @@ -46,7 +46,7 @@ #endif #if HAVE_PWD_H -# if MSVC5 +# if PHP_WIN32 # include "win32/pwd.h" # else # include <pwd.h> @@ -54,7 +54,7 @@ #endif #if HAVE_GRP_H -# if MSVC5 +# if PHP_WIN32 # include "win32/grp.h" # else # include <grp.h> @@ -62,7 +62,7 @@ #endif #if HAVE_UTIME -# if MSVC5 +# if PHP_WIN32 # include <sys/utime.h> # else # include <utime.h> Index: php4/ext/standard/flock_compat.c diff -u php4/ext/standard/flock_compat.c:1.4 php4/ext/standard/flock_compat.c:1.5 --- php4/ext/standard/flock_compat.c:1.4 Fri Dec 31 17:31:52 1999 +++ php4/ext/standard/flock_compat.c Thu Feb 10 13:53:56 2000 @@ -15,7 +15,7 @@ | Authors: Sascha Schumann <sas@schell.de> | +----------------------------------------------------------------------+ - $Id: flock_compat.c,v 1.4 2000/01/01 01:31:52 sas Exp $ + $Id: flock_compat.c,v 1.5 2000/02/10 21:53:56 andi Exp $ */ @@ -28,7 +28,7 @@ #include <fcntl.h> #endif -#if WIN32|WINNT +#if PHP_WIN32 #include <windows.h> #include <io.h> #endif @@ -64,7 +64,7 @@ return ret; } -#elif WIN32|WINNT +#elif PHP_WIN32 /* * Program: Unix compatibility routines * @@ -138,7 +138,7 @@ /* Under Win32 MT library, errno is not a variable but a function call, * which cannot be assigned to. */ -#if !(WIN32|WINNT) +#if !(PHP_WIN32) errno = EINVAL; /* bad call */ #endif return -1; Index: php4/ext/standard/flock_compat.h diff -u php4/ext/standard/flock_compat.h:1.3 php4/ext/standard/flock_compat.h:1.4 --- php4/ext/standard/flock_compat.h:1.3 Wed Jun 16 10:06:52 1999 +++ php4/ext/standard/flock_compat.h Thu Feb 10 13:53:56 2000 @@ -9,10 +9,10 @@ int flock(int fd, int operation); #endif -#if WIN32|WINNT +#if PHP_WIN32 # define fsync _commit # define ftruncate chsize -#endif /* WIN32|WINNT */ +#endif /* PHP_WIN32 */ #if !HAVE_INET_ATON #if HAVE_NETINET_IN_H Index: php4/ext/standard/fsock.c diff -u php4/ext/standard/fsock.c:1.44 php4/ext/standard/fsock.c:1.45 --- php4/ext/standard/fsock.c:1.44 Wed Feb 2 10:00:44 2000 +++ php4/ext/standard/fsock.c Thu Feb 10 13:53:56 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fsock.c,v 1.44 2000/02/02 18:00:44 andrei Exp $ */ +/* $Id: fsock.c,v 1.45 2000/02/10 21:53:56 andi Exp $ */ /* Synced with php 3.0 revision 1.121 1999-06-18 [ssb] */ /* Synced with php 3.0 revision 1.133 1999-07-21 [sas] */ @@ -43,14 +43,14 @@ #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif -#ifdef WIN32 +#if PHP_WIN32 #include <winsock.h> #else #include <netinet/in.h> #include <netdb.h> #include <arpa/inet.h> #endif -#ifdef WIN32 +#if PHP_WIN32 #undef AF_UNIX #endif #if defined(AF_UNIX) @@ -89,7 +89,7 @@ #define SEARCHCR() \ p = memchr(READPTR(sock), '\n', MIN(TOREAD(sock), maxlen)); -#if WIN32|WINNT +#if PHP_WIN32 #define EWOULDBLOCK WSAEWOULDBLOCK #else #include "build-defs.h" @@ -158,7 +158,7 @@ struct timeval *timeout) { /* probably won't work on Win32, someone else might try it (read: fix it ;) */ -#if !defined(WIN32) && (defined(O_NONBLOCK) || defined(O_NDELAY)) +#if !PHP_WIN32 && (defined(O_NONBLOCK) || defined(O_NDELAY)) #ifndef O_NONBLOCK #define O_NONBLOCK O_NDELAY @@ -216,7 +216,7 @@ ret = -1; } return ret; -#else /* !defined(WIN32) && ... */ +#else /* !PHP_WIN32 && ... */ return connect(sockfd, addr, addrlen); #endif } @@ -483,7 +483,7 @@ return ret; } -#if !defined(WIN32) && !defined(WINNT) +#if !PHP_WIN32 #undef closesocket #define closesocket close #endif Index: php4/ext/standard/fsock.h diff -u php4/ext/standard/fsock.h:1.24 php4/ext/standard/fsock.h:1.25 --- php4/ext/standard/fsock.h:1.24 Tue Feb 1 12:02:44 2000 +++ php4/ext/standard/fsock.h Thu Feb 10 13:53:56 2000 @@ -27,14 +27,14 @@ | Jim Winstead (jimw@php.net) | +----------------------------------------------------------------------+ */ -/* $Id: fsock.h,v 1.24 2000/02/01 20:02:44 andrei Exp $ */ +/* $Id: fsock.h,v 1.25 2000/02/10 21:53:56 andi Exp $ */ /* Synced with php 3.0 revision 1.24 1999-06-18 [ssb] */ #ifndef _FSOCK_H #define _FSOCK_H -#if WIN32|WINNT +#if PHP_WIN32 # ifndef WINNT # define WINNT 1 # endif Index: php4/ext/standard/info.c diff -u php4/ext/standard/info.c:1.60 php4/ext/standard/info.c:1.61 --- php4/ext/standard/info.c:1.60 Sat Feb 5 14:58:59 2000 +++ php4/ext/standard/info.c Thu Feb 10 13:53:56 2000 @@ -23,7 +23,7 @@ #include "ext/standard/head.h" #include "info.h" #include "SAPI.h" -#ifndef MSVC5 +#if !PHP_WIN32 #include "build-defs.h" #endif #include "zend_globals.h" /* needs ELS */ @@ -108,7 +108,7 @@ char **env,*tmp1,*tmp2; char *php_uname; int expose_php = INI_INT("expose_php"); -#if WIN32|WINNT +#if PHP_WIN32 char php_windows_uname[256]; DWORD dwBuild=0; DWORD dwVersion = GetVersion(); @@ -120,7 +120,7 @@ if (flag & PHP_INFO_GENERAL) { -#if WIN32|WINNT +#if PHP_WIN32 // Get build numbers for Windows NT or Win95 if (dwVersion < 0x80000000){ dwBuild = (DWORD)(HIWORD(dwVersion)); Index: php4/ext/standard/lcg.c diff -u php4/ext/standard/lcg.c:1.6 php4/ext/standard/lcg.c:1.7 --- php4/ext/standard/lcg.c:1.6 Fri Dec 31 17:31:52 1999 +++ php4/ext/standard/lcg.c Thu Feb 10 13:53:56 2000 @@ -29,7 +29,7 @@ static php_lcg_globals lcg_globals; #endif -#if WIN32||WINNT +#if PHP_WIN32 #include <process.h> #endif Index: php4/ext/standard/link.c diff -u php4/ext/standard/link.c:1.16 php4/ext/standard/link.c:1.17 --- php4/ext/standard/link.c:1.16 Fri Dec 31 17:31:52 1999 +++ php4/ext/standard/link.c Thu Feb 10 13:53:56 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: link.c,v 1.16 2000/01/01 01:31:52 sas Exp $ */ +/* $Id: link.c,v 1.17 2000/02/10 21:53:56 andi Exp $ */ #include "php.h" #include "php_filestat.h" @@ -29,14 +29,14 @@ #include <sys/stat.h> #include <string.h> #if HAVE_PWD_H -#if MSVC5 +#if PHP_WIN32 #include "win32/pwd.h" #else #include <pwd.h> #endif #endif #if HAVE_GRP_H -#if MSVC5 +#if PHP_WIN32 #include "win32/grp.h" #else #include <grp.h> Index: php4/ext/standard/mail.c diff -u php4/ext/standard/mail.c:1.16 php4/ext/standard/mail.c:1.17 --- php4/ext/standard/mail.c:1.16 Thu Feb 10 11:41:19 2000 +++ php4/ext/standard/mail.c Thu Feb 10 13:53:56 2000 @@ -16,20 +16,20 @@ +----------------------------------------------------------------------+ */ -/* $Id: mail.c,v 1.16 2000/02/10 19:41:19 zeev Exp $ */ +/* $Id: mail.c,v 1.17 2000/02/10 21:53:56 andi Exp $ */ #include <stdlib.h> #include <ctype.h> #include <stdio.h> #include "php.h" -#ifndef MSVC5 +#if !PHP_WIN32 #include "build-defs.h" #endif #include "php_mail.h" #include "php_ini.h" #if HAVE_SENDMAIL -#if MSVC5 +#if PHP_WIN32 #include "win32/sendmail.h" #endif @@ -102,7 +102,7 @@ int php_mail(char *to, char *subject, char *message, char *headers) { -#if MSVC5 +#if PHP_WIN32 int tsm_err; #else FILE *sendmail; @@ -110,7 +110,7 @@ char *sendmail_path = INI_STR("sendmail_path"); #endif -#if MSVC5 +#if PHP_WIN32 if (TSendMail(INI_STR("SMTP"), &tsm_err, headers, subject, to, message) != SUCCESS){ php_error(E_WARNING, GetSMErrorText(tsm_err)); return 0; @@ -144,7 +144,7 @@ PHP_MINFO_FUNCTION(mail) { -#if MSVC5 +#if PHP_WIN32 PUTS("Internal Sendmail support for Windows 4"); #else php_printf("Path to sendmail: <tt>%s</tt>", INI_STR("sendmail_path")); Index: php4/ext/standard/microtime.c diff -u php4/ext/standard/microtime.c:1.12 php4/ext/standard/microtime.c:1.13 --- php4/ext/standard/microtime.c:1.12 Fri Dec 31 17:31:52 1999 +++ php4/ext/standard/microtime.c Thu Feb 10 13:53:56 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: microtime.c,v 1.12 2000/01/01 01:31:52 sas Exp $ */ +/* $Id: microtime.c,v 1.13 2000/02/10 21:53:56 andi Exp $ */ #include <stdlib.h> #ifdef HAVE_UNISTD_H @@ -31,7 +31,7 @@ #include <stdio.h> #ifdef HAVE_GETTIMEOFDAY -#if MSVC5 +#if PHP_WIN32 #include "win32/time.h" #else #include <sys/time.h> Index: php4/ext/standard/pack.c diff -u php4/ext/standard/pack.c:1.14 php4/ext/standard/pack.c:1.15 --- php4/ext/standard/pack.c:1.14 Fri Dec 31 17:31:52 1999 +++ php4/ext/standard/pack.c Thu Feb 10 13:53:56 2000 @@ -15,7 +15,7 @@ | Authors: Chris Schneider <cschneid@relog.ch> | +----------------------------------------------------------------------+ */ -/* $Id: pack.c,v 1.14 2000/01/01 01:31:52 sas Exp $ */ +/* $Id: pack.c,v 1.15 2000/02/10 21:53:56 andi Exp $ */ #include "php.h" @@ -25,7 +25,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#if MSVC5 +#if PHP_WIN32 #include <windows.h> #include <winsock.h> #define O_RDONLY _O_RDONLY @@ -38,7 +38,7 @@ #include "php_string.h" #include "pack.h" #if HAVE_PWD_H -#if MSVC5 +#if PHP_WIN32 #include "win32/pwd.h" #else #include <pwd.h> Index: php4/ext/standard/pageinfo.c diff -u php4/ext/standard/pageinfo.c:1.14 php4/ext/standard/pageinfo.c:1.15 --- php4/ext/standard/pageinfo.c:1.14 Thu Feb 10 10:19:03 2000 +++ php4/ext/standard/pageinfo.c Thu Feb 10 13:53:56 2000 @@ -15,7 +15,7 @@ | Authors: Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: pageinfo.c,v 1.14 2000/02/10 18:19:03 zeev Exp $ */ +/* $Id: pageinfo.c,v 1.15 2000/02/10 21:53:56 andi Exp $ */ #include "php.h" #include "pageinfo.h" @@ -24,7 +24,7 @@ #include <stdio.h> #include <stdlib.h> #if HAVE_PWD_H -#if MSVC5 +#if PHP_WIN32 #include "win32/pwd.h" #else #include <pwd.h> @@ -34,7 +34,7 @@ #include <unistd.h> #endif #include <sys/stat.h> -#if MSVC5 +#if PHP_WIN32 #include <process.h> #endif Index: php4/ext/standard/parsedate.y diff -u php4/ext/standard/parsedate.y:1.15 php4/ext/standard/parsedate.y:1.16 --- php4/ext/standard/parsedate.y:1.15 Fri Dec 31 18:22:01 1999 +++ php4/ext/standard/parsedate.y Thu Feb 10 13:53:56 2000 @@ -1,5 +1,5 @@ %{ -/* $Revision: 1.15 $ +/* $Revision: 1.16 $ ** ** Originally written by Steven M. Bellovin <smb@research.att.com> while ** at the University of North Carolina at Chapel Hill. Later tweaked by @@ -21,7 +21,7 @@ #include "php.h" -#if WIN32||WINNT +#if PHP_WIN32 #include <malloc.h> #endif @@ -36,7 +36,7 @@ #ifdef HAVE_SYS_TIME_H # include <sys/time.h> #endif -#ifdef WIN32 +#if PHP_WIN32 # include "win32/time.h" #endif Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.94 php4/ext/standard/string.c:1.95 --- php4/ext/standard/string.c:1.94 Thu Feb 10 11:41:19 2000 +++ php4/ext/standard/string.c Thu Feb 10 13:53:56 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.94 2000/02/10 19:41:19 zeev Exp $ */ +/* $Id: string.c,v 1.95 2000/02/10 21:53:56 andi Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -471,14 +471,14 @@ ret = estrdup((*str)->value.str.val); c = ret + (*str)->value.str.len -1; while (*c == '/' -#ifdef MSVC5 +#if PHP_WIN32 || *c == '\\' #endif ) c--; *(c + 1) = '\0'; if ((c = strrchr(ret, '/')) -#ifdef MSVC5 +#if PHP_WIN32 || (c = strrchr(ret, '\\')) #endif ) { @@ -495,14 +495,14 @@ c = str + len - 1; while (*c == '/' -#ifdef MSVC5 +#if PHP_WIN32 || *c == '\\' #endif ) c--; /* strip trailing slashes */ *(c + 1) = '\0'; if ((c = strrchr(str, '/')) -#ifdef MSVC5 +#if PHP_WIN32 || (c = strrchr(str, '\\')) #endif ) Index: php4/ext/standard/syslog.c diff -u php4/ext/standard/syslog.c:1.13 php4/ext/standard/syslog.c:1.14 --- php4/ext/standard/syslog.c:1.13 Sat Feb 5 07:16:11 2000 +++ php4/ext/standard/syslog.c Thu Feb 10 13:53:56 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: syslog.c,v 1.13 2000/02/05 15:16:11 zeev Exp $ */ +/* $Id: syslog.c,v 1.14 2000/02/10 21:53:56 andi Exp $ */ #include "php.h" #include "php_ini.h" @@ -26,7 +26,7 @@ #if HAVE_UNISTD_H #include <unistd.h> #endif -#if MSVC5 +#if PHP_WIN32 #include "win32/syslog.h" #else #include <syslog.h> @@ -77,7 +77,7 @@ /* AIX doesn't have LOG_AUTHPRIV */ REGISTER_LONG_CONSTANT("LOG_AUTHPRIV", LOG_AUTHPRIV, CONST_CS | CONST_PERSISTENT); #endif -#ifndef MSVC5 +#if !PHP_WIN32 REGISTER_LONG_CONSTANT("LOG_LOCAL0", LOG_LOCAL0, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("LOG_LOCAL1", LOG_LOCAL1, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("LOG_LOCAL2", LOG_LOCAL2, CONST_CS | CONST_PERSISTENT); @@ -160,7 +160,7 @@ /* AIX doesn't have LOG_AUTHPRIV */ SET_VAR_LONG("LOG_AUTHPRIV", LOG_AUTHPRIV); #endif -#ifndef MSVC5 +#if !PHP_WIN32 SET_VAR_LONG("LOG_LOCAL0", LOG_LOCAL0); SET_VAR_LONG("LOG_LOCAL1", LOG_LOCAL1); SET_VAR_LONG("LOG_LOCAL2", LOG_LOCAL2); Index: php4/ext/standard/uniqid.c diff -u php4/ext/standard/uniqid.c:1.15 php4/ext/standard/uniqid.c:1.16 --- php4/ext/standard/uniqid.c:1.15 Fri Dec 31 17:31:53 1999 +++ php4/ext/standard/uniqid.c Thu Feb 10 13:53:56 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: uniqid.c,v 1.15 2000/01/01 01:31:53 sas Exp $ */ +/* $Id: uniqid.c,v 1.16 2000/02/10 21:53:56 andi Exp $ */ #include "php.h" @@ -29,7 +29,7 @@ #include <errno.h> #include <stdio.h> -#if MSVC5 +#if PHP_WIN32 #include "win32/time.h" #else #include <sys/time.h> @@ -64,7 +64,7 @@ php_error(E_WARNING, "The prefix to uniqid should not be more than 114 characters."); return; } -#if HAVE_USLEEP && !(WIN32|WINNT) +#if HAVE_USLEEP && !(PHP_WIN32) if (!MORE_ENTROPY) { usleep(1); }