Skip to content
Browse files

Fine tune Andi's patch

  • Loading branch information...
1 parent 80f4886 commit 80bdd19e031ca0dac2dfd4cb62ff43558d477663 @zsuraski zsuraski committed
Showing with 127 additions and 135 deletions.
  1. +3 −3 Zend/zend-scanner.l
  2. +3 −9 Zend/zend.h
  3. +1 −1 Zend/zend_API.h
  4. +1 −1 Zend/zend_alloc.c
  5. +1 −1 Zend/zend_config.w32.h
  6. +1 −1 Zend/zend_constants.c
  7. +1 −1 Zend/zend_execute.c
  8. +1 −1 Zend/zend_extensions.c
  9. +1 −1 ext/filepro/filepro.c
  10. +2 −2 ext/imap/imap.c
  11. +2 −2 ext/session/mod_files.c
  12. +1 −1 ext/session/session.c
  13. +1 −1 ext/snmp/snmp.c
  14. +1 −1 ext/standard/array.c
  15. +2 −2 ext/standard/basic_functions.c
  16. +1 −1 ext/standard/basic_functions.h
  17. +1 −1 ext/standard/crypt.c
  18. +1 −1 ext/standard/dir.c
  19. +2 −2 ext/standard/dl.c
  20. +2 −2 ext/standard/dns.c
  21. +1 −1 ext/standard/dns.h
  22. +3 −3 ext/standard/exec.c
  23. +6 −6 ext/standard/file.c
  24. +3 −3 ext/standard/filestat.c
  25. +3 −3 ext/standard/flock_compat.c
  26. +2 −2 ext/standard/flock_compat.h
  27. +6 −6 ext/standard/fsock.c
  28. +1 −1 ext/standard/fsock.h
  29. +3 −3 ext/standard/info.c
  30. +1 −1 ext/standard/lcg.c
  31. +2 −2 ext/standard/link.c
  32. +5 −5 ext/standard/mail.c
  33. +1 −1 ext/standard/microtime.c
  34. +2 −2 ext/standard/pack.c
  35. +2 −2 ext/standard/pageinfo.c
  36. +2 −2 ext/standard/parsedate.y
  37. +4 −4 ext/standard/string.c
  38. +3 −3 ext/standard/syslog.c
  39. +2 −2 ext/standard/uniqid.c
  40. +5 −5 ext/zlib/zlib.c
  41. +1 −1 main/SAPI.c
  42. +1 −1 main/SAPI.h
  43. +3 −3 main/configuration-parser.y
  44. +9 −9 main/fopen_wrappers.c
  45. +2 −2 main/fopen_wrappers.h
  46. +11 −11 main/main.c
  47. +1 −1 main/mergesort.c
  48. +4 −6 main/php.h
  49. +7 −7 main/php_realpath.c
  50. +2 −2 sapi/cgi/cgi_main.c
View
6 Zend/zend-scanner.l
@@ -33,7 +33,7 @@
%{
-#if ZEND_WIN32
+#ifdef ZEND_WIN32
#include <winsock.h>
#include <io.h>
#endif
@@ -57,7 +57,7 @@
# ifdef HAVE_STDIOSTREAM_H
# include <stdiostream.h>
# endif
-# if ZEND_WIN32
+# ifdef ZEND_WIN32
# include <strstrea.h>
# else
# include <strstream.h>
@@ -668,7 +668,7 @@ int yyFlexLexer::yylex()
/* redefine YY_INPUT to handle urls for win32*/
-#if 0 /*ZEND_WIN32*/
+#if 0 /*defined(ZEND_WIN32)*/
#define YY_INPUT(buf,result,max_size) \
if ( yyin->_tmpfname != "url" ){ \
if ( yy_current_buffer->yy_is_interactive ) \
View
12 Zend/zend.h
@@ -37,13 +37,7 @@
* general definitions
*/
-#if (defined(WINNT) && WINNT) || (defined(WIN32) && WIN32)
-#define ZEND_WIN32 1
-#else
-#define ZEND_WIN32 0
-#endif
-
-#if ZEND_WIN32
+#ifdef ZEND_WIN32
# include "zend_config.w32.h"
#else
# include "zend_config.h"
@@ -69,7 +63,7 @@
# define DL_FETCH_SYMBOL dlsym
# define DL_HANDLE void *
# define ZEND_EXTENSIONS_SUPPORT 1
-#elif (ZEND_WIN32)
+#elif defined(ZEND_WIN32)
# define DL_LOAD(libname) LoadLibrary(libname)
# define DL_FETCH_SYMBOL GetProcAddress
# define DL_UNLOAD FreeLibrary
@@ -356,7 +350,7 @@ END_EXTERN_C()
#define ZEND_MAX_RESERVED_RESOURCES 1
-#if (ZEND_WIN32)
+#ifdef ZEND_WIN32
/* Only use this macro if you know for sure that all of the switches values
are covered by its case statements */
#define EMPTY_SWITCH_DEFAULT_CASE() \
View
2 Zend/zend_API.h
@@ -84,7 +84,7 @@ ZEND_API void wrong_param_count(void);
#define BYREF_ALLOW 2
#define BYREF_FORCE_REST 3
-#if !(ZEND_WIN32)
+#ifndef ZEND_WIN32
#define DLEXPORT
#endif
View
2 Zend/zend_alloc.c
@@ -447,7 +447,7 @@ void zend_debug_alloc_output(char *format, ...)
vsprintf(output_buf, format, args);
va_end(args);
-#if ZEND_WIN32
+#ifdef ZEND_WIN32
OutputDebugString(output_buf);
#else
fprintf(stderr, output_buf);
View
2 Zend/zend_config.w32.h
@@ -51,7 +51,7 @@ typedef unsigned int uint;
/* This will cause the compilation process to be MUCH longer, but will generate
* a much quicker PHP binary
*/
-#ifdef ZEND_WIN32_FORCE_INLINE
+#ifdef defined(ZEND_WIN32)_FORCE_INLINE
# define inline __forceinline
#else
# define inline
View
2 Zend/zend_constants.c
@@ -79,7 +79,7 @@ void clean_module_constants(int module_number)
int zend_startup_constants(ELS_D)
{
-#if ZEND_WIN32
+#ifdef ZEND_WIN32
DWORD dwBuild=0;
DWORD dwVersion = GetVersion();
DWORD dwWindowsMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));
View
2 Zend/zend_execute.c
@@ -967,7 +967,7 @@ static int zend_check_symbol(zval **pz)
#endif
-#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && (ZEND_WIN32))
+#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32))
# define do_alloca(p) alloca(p)
# define free_alloca(p)
#else
View
2 Zend/zend_extensions.c
@@ -49,7 +49,7 @@ int zend_load_extension(char *path)
handle = DL_LOAD(path);
if (!handle) {
-#if !(ZEND_WIN32)
+#ifndef ZEND_WIN32
fprintf(stderr, "Failed loading %s: %s\n", path, dlerror());
#else
fprintf(stderr, "Failed loading %s\n", path);
View
2 ext/filepro/filepro.c
@@ -27,7 +27,7 @@
#include "safe_mode.h"
#include "fopen-wrappers.h"
#include <string.h>
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include <windows.h>
#else
#include <sys/param.h>
View
4 ext/imap/imap.c
@@ -3441,14 +3441,14 @@ PHP_FUNCTION(imap_mail_compose)
#if !(WIN32|WINNT)
int _php_imap_mail(char *to, char *subject, char *message, char *headers, char *cc, char *bcc, char* rpath)
{
-#if PHP_WIN32
+#ifdef PHP_WIN32
int tsm_err;
#else
FILE *sendmail;
int ret;
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
if (imap_TSendMail(INI_STR("smtp"),&tsm_err,headers,subject,to,message,cc,bcc,rpath) != SUCCESS){
php_error(E_WARNING, GetSMErrorText(tsm_err));
return 0;
View
4 ext/session/mod_files.c
@@ -30,7 +30,7 @@
#include <dirent.h>
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
#define NEEDRDH 1
#include "win32/readdir.h"
#endif
@@ -56,7 +56,7 @@ ps_module ps_mod_files = {
PS_MOD(files)
};
-#if PHP_WIN32
+#ifdef PHP_WIN32
#define DIR_DELIMITER '\\'
#else
#define DIR_DELIMITER '/'
View
2 ext/session/session.c
@@ -19,7 +19,7 @@
#include "php.h"
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/time.h"
#else
#include <sys/time.h>
View
2 ext/snmp/snmp.c
@@ -25,7 +25,7 @@
#endif
#include "php_snmp.h"
#include <sys/types.h>
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include <winsock.h>
#include <errno.h>
#include <process.h>
View
2 ext/standard/array.c
@@ -30,7 +30,7 @@
#else
#include <strings.h>
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/unistd.h"
#endif
#include "zend_globals.h"
View
4 ext/standard/basic_functions.c
@@ -42,7 +42,7 @@
#include <locale.h>
#endif
#include "safe_mode.h"
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/unistd.h"
#endif
#include "zend_globals.h"
@@ -194,7 +194,7 @@ function_entry basic_functions[] = {
PHP_FE(gethostbyaddr, NULL)
PHP_FE(gethostbyname, NULL)
PHP_FE(gethostbynamel, NULL)
-#if !(PHP_WIN32)||HAVE_BINDLIB
+#if !defined(PHP_WIN32)||HAVE_BINDLIB
PHP_FE(checkdnsrr, NULL)
PHP_FE(getmxrr, second_and_third_args_force_ref)
#endif
View
2 ext/standard/basic_functions.h
@@ -107,7 +107,7 @@ PHP_FUNCTION(get_loaded_extensions);
PHP_FUNCTION(extension_loaded);
PHP_FUNCTION(get_extension_funcs);
-#if PHP_WIN32
+#ifdef PHP_WIN32
typedef unsigned int php_stat_len;
#else
typedef int php_stat_len;
View
2 ext/standard/crypt.c
@@ -41,7 +41,7 @@
#include <strings.h>
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include <process.h>
extern char *crypt(char *__key,char *__salt);
#endif
View
2 ext/standard/dir.c
@@ -36,7 +36,7 @@
#include <errno.h>
-#if PHP_WIN32
+#ifdef PHP_WIN32
#define NEEDRDH 1
#include "win32/readdir.h"
#endif
View
4 ext/standard/dl.c
@@ -33,7 +33,7 @@
#else
#include <strings.h>
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/param.h"
#include "win32/winutil.h"
#else
@@ -113,7 +113,7 @@ void php_dl(pval *file,int type,pval *return_value)
} else {
error_type = E_CORE_ERROR;
}
-#if PHP_WIN32
+#ifdef 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());
View
4 ext/standard/dns.c
@@ -22,7 +22,7 @@
#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
#if HAVE_BINDLIB
#ifndef WINNT
#define WINNT 1
@@ -158,7 +158,7 @@ char *php_gethostbyname(char *name)
return estrdup(inet_ntoa(in));
}
-#if !(PHP_WIN32)||HAVE_BINDLIB
+#if !defined(PHP_WIN32)||HAVE_BINDLIB
/* {{{ proto int checkdnsrr(string host [, string type])
Check DNS records corresponding to a given Internet host name or IP address */
View
2 ext/standard/dns.h
@@ -37,7 +37,7 @@
PHP_FUNCTION(gethostbyaddr);
PHP_FUNCTION(gethostbyname);
PHP_FUNCTION(gethostbynamel);
-#if !(PHP_WIN32)||(HAVE_BINDLIB)
+#if !defined(PHP_WIN32)||(HAVE_BINDLIB)
PHP_FUNCTION(checkdnsrr);
PHP_FUNCTION(getmxrr);
#endif
View
6 ext/standard/exec.c
@@ -86,7 +86,7 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value)
tmp = php_escape_shell_cmd(d);
efree(d);
d = tmp;
-#if PHP_WIN32
+#ifdef PHP_WIN32
fp = popen(d, "rb");
#else
fp = popen(d, "r");
@@ -98,7 +98,7 @@ static int _Exec(int type, char *cmd, pval *array, pval *return_value)
return -1;
}
} else { /* not safe_mode */
-#if PHP_WIN32
+#ifdef PHP_WIN32
fp = popen(cmd, "rb");
#else
fp = popen(cmd, "r");
@@ -363,7 +363,7 @@ PHP_FUNCTION(shell_exec)
}
convert_to_string_ex(cmd);
-#if PHP_WIN32
+#ifdef PHP_WIN32
if ((in=popen((*cmd)->value.str.val,"rt"))==NULL) {
#else
if ((in=popen((*cmd)->value.str.val,"r"))==NULL) {
View
12 ext/standard/file.c
@@ -34,7 +34,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#if PHP_WIN32
+#ifdef 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 PHP_WIN32
+#ifdef 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 PHP_WIN32
+#ifdef PHP_WIN32
#include <winsock.h>
#else
#include <netinet/in.h>
@@ -832,7 +832,7 @@ PHPAPI int php_set_sock_blocking(int socketd, int block)
int flags;
int myflag = 0;
-#if PHP_WIN32
+#ifdef 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 @@ PHP_FUNCTION(copy)
RETURN_FALSE;
}
-#if PHP_WIN32
+#ifdef 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_FUNCTION(copy)
php_error(E_WARNING,"Unable to open '%s' for reading: %s",(*source)->value.str.val,strerror(errno));
RETURN_FALSE;
}
-#if PHP_WIN32
+#ifdef 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) {
View
6 ext/standard/filestat.c
@@ -46,7 +46,7 @@
#endif
#if HAVE_PWD_H
-# if PHP_WIN32
+# ifdef PHP_WIN32
# include "win32/pwd.h"
# else
# include <pwd.h>
@@ -54,7 +54,7 @@
#endif
#if HAVE_GRP_H
-# if PHP_WIN32
+# ifdef PHP_WIN32
# include "win32/grp.h"
# else
# include <grp.h>
@@ -62,7 +62,7 @@
#endif
#if HAVE_UTIME
-# if PHP_WIN32
+# ifdef PHP_WIN32
# include <sys/utime.h>
# else
# include <utime.h>
View
6 ext/standard/flock_compat.c
@@ -28,7 +28,7 @@
#include <fcntl.h>
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include <windows.h>
#include <io.h>
#endif
@@ -64,7 +64,7 @@ int flock(int fd, int operation)
return ret;
}
-#elif PHP_WIN32
+#elif defined(PHP_WIN32)
/*
* Program: Unix compatibility routines
*
@@ -138,7 +138,7 @@ int flock(int fd, int operation)
/* Under Win32 MT library, errno is not a variable but a function call,
* which cannot be assigned to.
*/
-#if !(PHP_WIN32)
+#if !defined(PHP_WIN32)
errno = EINVAL; /* bad call */
#endif
return -1;
View
4 ext/standard/flock_compat.h
@@ -9,10 +9,10 @@
int flock(int fd, int operation);
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
# define fsync _commit
# define ftruncate chsize
-#endif /* PHP_WIN32 */
+#endif /* defined(PHP_WIN32) */
#if !HAVE_INET_ATON
#if HAVE_NETINET_IN_H
View
12 ext/standard/fsock.c
@@ -43,14 +43,14 @@
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include <winsock.h>
#else
#include <netinet/in.h>
#include <netdb.h>
#include <arpa/inet.h>
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
#undef AF_UNIX
#endif
#if defined(AF_UNIX)
@@ -89,7 +89,7 @@ extern int le_fp;
#define SEARCHCR() \
p = memchr(READPTR(sock), '\n', MIN(TOREAD(sock), maxlen));
-#if PHP_WIN32
+#ifdef PHP_WIN32
#define EWOULDBLOCK WSAEWOULDBLOCK
#else
#include "build-defs.h"
@@ -158,7 +158,7 @@ PHPAPI int connect_nonb(int sockfd,
struct timeval *timeout)
{
/* probably won't work on Win32, someone else might try it (read: fix it ;) */
-#if !PHP_WIN32 && (defined(O_NONBLOCK) || defined(O_NDELAY))
+#if !defined(PHP_WIN32) && (defined(O_NONBLOCK) || defined(O_NDELAY))
#ifndef O_NONBLOCK
#define O_NONBLOCK O_NDELAY
@@ -216,7 +216,7 @@ PHPAPI int connect_nonb(int sockfd,
ret = -1;
}
return ret;
-#else /* !PHP_WIN32 && ... */
+#else /* !defined(PHP_WIN32) && ... */
return connect(sockfd, addr, addrlen);
#endif
}
@@ -483,7 +483,7 @@ int php_sockdestroy(int socket)
return ret;
}
-#if !PHP_WIN32
+#if !defined(PHP_WIN32)
#undef closesocket
#define closesocket close
#endif
View
2 ext/standard/fsock.h
@@ -34,7 +34,7 @@
#ifndef _FSOCK_H
#define _FSOCK_H
-#if PHP_WIN32
+#ifdef PHP_WIN32
# ifndef WINNT
# define WINNT 1
# endif
View
6 ext/standard/info.c
@@ -23,7 +23,7 @@
#include "ext/standard/head.h"
#include "info.h"
#include "SAPI.h"
-#if !PHP_WIN32
+#if !defined(PHP_WIN32)
#include "build-defs.h"
#endif
#include "zend_globals.h" /* needs ELS */
@@ -108,7 +108,7 @@ PHPAPI void php_print_info(int flag)
char **env,*tmp1,*tmp2;
char *php_uname;
int expose_php = INI_INT("expose_php");
-#if PHP_WIN32
+#ifdef PHP_WIN32
char php_windows_uname[256];
DWORD dwBuild=0;
DWORD dwVersion = GetVersion();
@@ -120,7 +120,7 @@ PHPAPI void php_print_info(int flag)
if (flag & PHP_INFO_GENERAL) {
-#if PHP_WIN32
+#ifdef PHP_WIN32
// Get build numbers for Windows NT or Win95
if (dwVersion < 0x80000000){
dwBuild = (DWORD)(HIWORD(dwVersion));
View
2 ext/standard/lcg.c
@@ -29,7 +29,7 @@ int lcg_globals_id;
static php_lcg_globals lcg_globals;
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include <process.h>
#endif
View
4 ext/standard/link.c
@@ -29,14 +29,14 @@
#include <sys/stat.h>
#include <string.h>
#if HAVE_PWD_H
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/pwd.h"
#else
#include <pwd.h>
#endif
#endif
#if HAVE_GRP_H
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/grp.h"
#else
#include <grp.h>
View
10 ext/standard/mail.c
@@ -22,14 +22,14 @@
#include <ctype.h>
#include <stdio.h>
#include "php.h"
-#if !PHP_WIN32
+#if !defined(PHP_WIN32)
#include "build-defs.h"
#endif
#include "php_mail.h"
#include "php_ini.h"
#if HAVE_SENDMAIL
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/sendmail.h"
#endif
@@ -102,7 +102,7 @@ PHP_FUNCTION(mail)
int php_mail(char *to, char *subject, char *message, char *headers)
{
-#if PHP_WIN32
+#ifdef PHP_WIN32
int tsm_err;
#else
FILE *sendmail;
@@ -110,7 +110,7 @@ int php_mail(char *to, char *subject, char *message, char *headers)
char *sendmail_path = INI_STR("sendmail_path");
#endif
-#if PHP_WIN32
+#ifdef 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 @@ int php_mail(char *to, char *subject, char *message, char *headers)
PHP_MINFO_FUNCTION(mail)
{
-#if PHP_WIN32
+#ifdef PHP_WIN32
PUTS("Internal Sendmail support for Windows 4");
#else
php_printf("Path to sendmail: <tt>%s</tt>", INI_STR("sendmail_path"));
View
2 ext/standard/microtime.c
@@ -31,7 +31,7 @@
#include <stdio.h>
#ifdef HAVE_GETTIMEOFDAY
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/time.h"
#else
#include <sys/time.h>
View
4 ext/standard/pack.c
@@ -25,7 +25,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#if PHP_WIN32
+#ifdef 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 PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/pwd.h"
#else
#include <pwd.h>
View
4 ext/standard/pageinfo.c
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#if HAVE_PWD_H
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/pwd.h"
#else
#include <pwd.h>
@@ -34,7 +34,7 @@
#include <unistd.h>
#endif
#include <sys/stat.h>
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include <process.h>
#endif
View
4 ext/standard/parsedate.y
@@ -21,7 +21,7 @@
#include "php.h"
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include <malloc.h>
#endif
@@ -36,7 +36,7 @@
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
# include "win32/time.h"
#endif
View
8 ext/standard/string.c
@@ -471,14 +471,14 @@ PHP_FUNCTION(basename)
ret = estrdup((*str)->value.str.val);
c = ret + (*str)->value.str.len -1;
while (*c == '/'
-#if PHP_WIN32
+#ifdef PHP_WIN32
|| *c == '\\'
#endif
)
c--;
*(c + 1) = '\0';
if ((c = strrchr(ret, '/'))
-#if PHP_WIN32
+#ifdef PHP_WIN32
|| (c = strrchr(ret, '\\'))
#endif
) {
@@ -495,14 +495,14 @@ PHPAPI void php_dirname(char *str, int len) {
c = str + len - 1;
while (*c == '/'
-#if PHP_WIN32
+#ifdef PHP_WIN32
|| *c == '\\'
#endif
)
c--; /* strip trailing slashes */
*(c + 1) = '\0';
if ((c = strrchr(str, '/'))
-#if PHP_WIN32
+#ifdef PHP_WIN32
|| (c = strrchr(str, '\\'))
#endif
)
View
6 ext/standard/syslog.c
@@ -26,7 +26,7 @@
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/syslog.h"
#else
#include <syslog.h>
@@ -77,7 +77,7 @@ PHP_MINIT_FUNCTION(syslog)
/* AIX doesn't have LOG_AUTHPRIV */
REGISTER_LONG_CONSTANT("LOG_AUTHPRIV", LOG_AUTHPRIV, CONST_CS | CONST_PERSISTENT);
#endif
-#if !PHP_WIN32
+#if !defined(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 @@ static void start_syslog(void)
/* AIX doesn't have LOG_AUTHPRIV */
SET_VAR_LONG("LOG_AUTHPRIV", LOG_AUTHPRIV);
#endif
-#if !PHP_WIN32
+#if !defined(PHP_WIN32)
SET_VAR_LONG("LOG_LOCAL0", LOG_LOCAL0);
SET_VAR_LONG("LOG_LOCAL1", LOG_LOCAL1);
SET_VAR_LONG("LOG_LOCAL2", LOG_LOCAL2);
View
4 ext/standard/uniqid.c
@@ -29,7 +29,7 @@
#include <errno.h>
#include <stdio.h>
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/time.h"
#else
#include <sys/time.h>
@@ -64,7 +64,7 @@ PHP_FUNCTION(uniqid)
php_error(E_WARNING, "The prefix to uniqid should not be more than 114 characters.");
return;
}
-#if HAVE_USLEEP && !(PHP_WIN32)
+#if HAVE_USLEEP && !defined(PHP_WIN32)
if (!MORE_ENTROPY) {
usleep(1);
}
View
10 ext/zlib/zlib.c
@@ -27,7 +27,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include <windows.h>
#include <winsock.h>
#define O_RDONLY _O_RDONLY
@@ -42,7 +42,7 @@
#include "php_zlib.h"
#include "fopen-wrappers.h"
#if HAVE_PWD_H
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/pwd.h"
#else
#include <pwd.h>
@@ -50,7 +50,7 @@
#endif
#include "snprintf.h"
#if HAVE_ZLIB
-#if defined(HAVE_UNISTD_H) && PHP_WIN32
+#if defined(HAVE_UNISTD_H) && defined(PHP_WIN32)
#undef HAVE_UNISTD_H
#endif
@@ -197,7 +197,7 @@ static gzFile *php_gzopen_with_path(char *filename, char *mode, char *path, char
}
/* Absolute path open - prepend document_root in safe mode */
-#if PHP_WIN32
+#ifdef PHP_WIN32
if ((*filename == '\\')||(*filename == '/')||(filename[1] == ':')) {
#else
if (*filename == '/') {
@@ -240,7 +240,7 @@ static gzFile *php_gzopen_with_path(char *filename, char *mode, char *path, char
ptr = pathbuf;
while (ptr && *ptr) {
-#if PHP_WIN32
+#ifdef PHP_WIN32
end = strchr(ptr, ';');
#else
end = strchr(ptr, ':');
View
2 main/SAPI.c
@@ -29,7 +29,7 @@
#include "rfc1867.h"
-#if PHP_WIN32
+#ifdef PHP_WIN32
#define STRCASECMP stricmp
#else
#define STRCASECMP strcasecmp
View
2 main/SAPI.h
@@ -27,7 +27,7 @@
#define SAPI_POST_BLOCK_SIZE 4000
-#if PHP_WIN32
+#ifdef PHP_WIN32
# ifdef SAPI_EXPORTS
# define SAPI_API __declspec(dllexport)
# else
View
6 main/configuration-parser.y
@@ -161,7 +161,7 @@ int php_init_config(void)
if (!env_location) {
env_location="";
}
-#if PHP_WIN32
+#ifdef PHP_WIN32
{
if (php_ini_path) {
default_location = php_ini_path;
@@ -186,7 +186,7 @@ int php_init_config(void)
php_ini_search_path = (char *) malloc(sizeof(".")+strlen(env_location)+strlen(default_location)+2+1);
if (!php_ini_path) {
-#if PHP_WIN32
+#ifdef PHP_WIN32
sprintf(php_ini_search_path,".;%s;%s",env_location,default_location);
#else
sprintf(php_ini_search_path,".:%s:%s",env_location,default_location);
@@ -206,7 +206,7 @@ int php_init_config(void)
PG(open_basedir) = open_basedir;
if (!cfgin) {
-# if PHP_WIN32
+# ifdef PHP_WIN32
return FAILURE;
# else
return SUCCESS; /* having no configuration file is ok */
View
18 main/fopen_wrappers.c
@@ -29,7 +29,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include <windows.h>
#include <winsock.h>
#define O_RDONLY _O_RDONLY
@@ -45,7 +45,7 @@
#include "zend_compile.h"
#if HAVE_PWD_H
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/pwd.h"
#else
#include <pwd.h>
@@ -61,7 +61,7 @@
#define S_ISREG(mode) (((mode)&S_IFMT) == S_IFREG)
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include <winsock.h>
#else
#include <netinet/in.h>
@@ -69,7 +69,7 @@
#include <arpa/inet.h>
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
#undef AF_UNIX
#endif
@@ -105,7 +105,7 @@ PHPAPI int php_check_specific_open_basedir(char *basedir, char *path PLS_DC)
/* Strip filename */
while ((
-#if PHP_WIN32
+#ifdef PHP_WIN32
(local_open_basedir[local_open_basedir_pos] != '\\') ||
#endif
(local_open_basedir[local_open_basedir_pos] != '/')
@@ -122,7 +122,7 @@ PHPAPI int php_check_specific_open_basedir(char *basedir, char *path PLS_DC)
/* Resolve the real path into resolved_name */
if ((php_realpath(path, resolved_name) != NULL) && (php_realpath(local_open_basedir, resolved_basedir) != NULL)) {
/* Check the path */
-#if PHP_WIN32
+#ifdef PHP_WIN32
if (strncasecmp(resolved_basedir, resolved_name, strlen(resolved_basedir)) == 0) {
#else
if (strncmp(resolved_basedir, resolved_name, strlen(resolved_basedir)) == 0) {
@@ -153,7 +153,7 @@ PHPAPI int php_check_open_basedir(char *path)
ptr = pathbuf;
while (ptr && *ptr) {
-#if PHP_WIN32
+#ifdef PHP_WIN32
end = strchr(ptr, ';');
#else
end = strchr(ptr, ':');
@@ -338,7 +338,7 @@ PHPAPI FILE *php_fopen_with_path(char *filename, char *mode, char *path, char **
return fp;
}
/* Absolute path open - prepend document_root in safe mode */
-#if PHP_WIN32
+#ifdef PHP_WIN32
if ((*filename == '\\') || (*filename == '/') || (filename[1] == ':')) {
#else
if (*filename == '/') {
@@ -379,7 +379,7 @@ PHPAPI FILE *php_fopen_with_path(char *filename, char *mode, char *path, char **
ptr = pathbuf;
while (ptr && *ptr) {
-#if PHP_WIN32
+#ifdef PHP_WIN32
end = strchr(ptr, ';');
#else
end = strchr(ptr, ':');
View
4 main/fopen_wrappers.h
@@ -26,14 +26,14 @@
#define USE_PATH 1
#define IGNORE_URL 2
/* There's no USE_URL. */
-#if PHP_WIN32
+#ifdef PHP_WIN32
# define IGNORE_URL_WIN 2
#else
# define IGNORE_URL_WIN 0
#endif
#define ENFORCE_SAFE_MODE 4
-#if PHP_WIN32
+#ifdef PHP_WIN32
# define SOCK_ERR INVALID_SOCKET
# define SOCK_CONN_ERR SOCKET_ERROR
# define SOCK_RECV_ERR SOCKET_ERROR
View
22 main/main.c
@@ -24,7 +24,7 @@
#include <stdio.h>
#include "php.h"
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/time.h"
#include "win32/signal.h"
#include <process.h>
@@ -51,7 +51,7 @@
#include "ext/standard/php_standard.h"
#include "snprintf.h"
#include "php_variables.h"
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include <io.h>
#include <fcntl.h>
#include "win32/syslog.h"
@@ -453,7 +453,7 @@ static void php_timeout(int dummy)
static void php_set_timeout(long seconds)
{
-#if PHP_WIN32
+#ifdef PHP_WIN32
#else
# ifdef HAVE_SETITIMER
struct itimerval t_r; /* timeout requested */
@@ -471,7 +471,7 @@ static void php_set_timeout(long seconds)
static void php_unset_timeout(void)
{
-#if PHP_WIN32
+#ifdef PHP_WIN32
#else
# ifdef HAVE_SETITIMER
struct itimerval no_timeout;
@@ -591,7 +591,7 @@ static void php_message_handler_for_zend(long message, void *data)
snprintf(memory_leak_buf, 512, "Last leak repeated %ld time%s\n", leak_count, (leak_count>1?"s":""));
}
-# if PHP_WIN32
+# if defined(PHP_WIN32)
OutputDebugString(memory_leak_buf);
# else
fprintf(stderr, memory_leak_buf);
@@ -772,11 +772,11 @@ int php_module_startup(sapi_module_struct *sf)
php_core_globals *core_globals;
sapi_globals_struct *sapi_globals = ts_resource(sapi_globals_id);
#endif
-#if (PHP_WIN32) && !(USE_SAPI)
+#ifdef PHP_WIN32
WORD wVersionRequested = MAKEWORD(2, 0);
WSADATA wsaData;
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
{
DWORD dwVersion = GetVersion();
@@ -832,7 +832,7 @@ int php_module_startup(sapi_module_struct *sf)
setlocale(LC_CTYPE, "");
#endif
-#if (PHP_WIN32) && !(USE_SAPI)
+#ifdef PHP_WIN32
/* start up winsock services */
if (WSAStartup(wVersionRequested, &wsaData) != 0) {
php_printf("\nwinsock.dll unusable. %d\n", WSAGetLastError());
@@ -897,7 +897,7 @@ void php_module_shutdown()
/* close down the ini config */
php_config_ini_shutdown();
-#if (PHP_WIN32)
+#ifdef PHP_WIN32
/*close winsock */
WSACleanup();
#endif
@@ -1102,7 +1102,7 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
return;
}
-#if PHP_WIN32
+#ifdef PHP_WIN32
UpdateIniFromRegistry(primary_file->filename);
#endif
@@ -1129,7 +1129,7 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
}
}
-#if PHP_WIN32
+#ifdef PHP_WIN32
/* just so that this symbol gets exported... */
PHPAPI void dummy_indent()
{
View
2 main/mergesort.c
@@ -60,7 +60,7 @@ static char sccsid[] = "@(#)merge.c 8.2 (Berkeley) 2/14/94";
#include "php.h"
-#if (PHP_WIN32)
+#ifdef PHP_WIN32
#include <winsock.h> /* Includes definition for u_char */
#endif
View
10 main/php.h
@@ -33,8 +33,6 @@
#include "php_version.h"
#include "zend.h"
-#define PHP_WIN32 ZEND_WIN32
-
/* automake defines PACKAGE and VERSION for Zend too */
#ifdef PACKAGE
# undef PACKAGE
@@ -59,7 +57,7 @@ extern unsigned char second_arg_allow_ref[];
*/
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "config.w32.h"
#include "win95nt.h"
# ifdef PHP_EXPORTS
@@ -80,7 +78,7 @@ extern unsigned char second_arg_allow_ref[];
#define DEBUG ZEND_DEBUG
-#if DEBUG || !(defined(__GNUC__)||PHP_WIN32)
+#if DEBUG || !(defined(__GNUC__)||defined(PHP_WIN32))
#ifdef inline
#undef inline
#endif
@@ -170,7 +168,7 @@ extern char *strerror(int);
#endif
#if HAVE_PWD_H
-# if PHP_WIN32
+# ifdef PHP_WIN32
#include "win32/pwd.h"
#include "win32/param.h"
# else
@@ -242,7 +240,7 @@ extern int ap_vsnprintf(char *, size_t, const char *, va_list);
/* global variables */
extern pval *data;
-#if !(PHP_WIN32)
+#if !defined(PHP_WIN32)
extern char **environ;
#define php_sleep sleep
#endif
View
14 main/php_realpath.c
@@ -40,7 +40,7 @@ char *php_realpath(char *path, char resolved_path []) {
char path_copy[MAXPATHLEN]; /* A work-copy of the path */
char *workpos; /* working position in *path */
-#if !(PHP_WIN32)
+#if !defined(PHP_WIN32)
char buf[MAXPATHLEN]; /* Buffer for readlink */
int linklength; /* The result from readlink */
#endif
@@ -48,7 +48,7 @@ char *php_realpath(char *path, char resolved_path []) {
struct stat filestat; /* result from stat */
-#if PHP_WIN32
+#ifdef PHP_WIN32
char *temppos; /* position while counting '.' */
int dotcount; /* number of '.' */
int t; /* counter */
@@ -58,7 +58,7 @@ char *php_realpath(char *path, char resolved_path []) {
strcpy(path_copy, path);
workpos = path_copy;
-#if PHP_WIN32
+#ifdef PHP_WIN32
/* Find out where we start - Windows version */
if ((*workpos == '\\') || (*workpos == '/')) {
/* We start at the root of the current drive */
@@ -109,13 +109,13 @@ char *php_realpath(char *path, char resolved_path []) {
/* Go to the end, then stop */
while(*workpos != 0) {
/* Strip (back)slashes */
-#if PHP_WIN32
+#ifdef PHP_WIN32
while(*workpos == '\\') workpos++;
#else
while(*workpos == '/') workpos++;
#endif
-#if PHP_WIN32
+#ifdef PHP_WIN32
/* reset dotcount */
dotcount = 0;
@@ -169,7 +169,7 @@ char *php_realpath(char *path, char resolved_path []) {
*writepos++ = *workpos++;
}
*writepos = 0;
-#else /* PHP_WIN32 */
+#else /* defined(PHP_WIN32) */
/* Look for .. */
if ((workpos[0] == '.') && (workpos[1] != 0)) {
if ((workpos[1] == '.') && ((workpos[2] == '/') || (workpos[2] == 0))) {
@@ -247,7 +247,7 @@ char *php_realpath(char *path, char resolved_path []) {
*writepos++ = *workpos++;
}
*writepos = 0;
-#endif /* PHP_WIN32 */
+#endif /* defined(PHP_WIN32) */
}
/* Check if the resolved path is a directory */
View
4 sapi/cgi/cgi_main.c
@@ -27,7 +27,7 @@
#include <stdio.h>
#include "php.h"
-#if PHP_WIN32
+#ifdef PHP_WIN32
#include "win32/time.h"
#include "win32/signal.h"
#include <process.h>
@@ -249,7 +249,7 @@ static void init_request_info(SLS_D)
if (!script_filename) {
script_filename = SG(request_info).argv0;
}
-#if PHP_WIN32
+#ifdef PHP_WIN32
/* FIXME WHEN APACHE NT IS FIXED */
/* a hack for apache nt because it does not appear to set argv[1] and sets
script filename to php.exe thus makes us parse php.exe instead of file.php

0 comments on commit 80bdd19

Please sign in to comment.
Something went wrong with that request. Please try again.