Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

- Get rid of some more evil MSVC5's and switch standard/ to use PHP_WIN32

PHP-4.0.5
Andi Gutmans 26 years ago
parent
732eeeabd9
commit
29280bb9ec
26 changed files with 62 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ext/standard/array.c
  2. 4
      ext/standard/basic_functions.c
  3. 2
      ext/standard/basic_functions.h
  4. 2
      ext/standard/crypt.c
  5. 2
      ext/standard/dir.c
  6. 4
      ext/standard/dl.c
  7. 4
      ext/standard/dns.c
  8. 2
      ext/standard/dns.h
  9. 6
      ext/standard/exec.c
  10. 12
      ext/standard/file.c
  11. 6
      ext/standard/filestat.c
  12. 6
      ext/standard/flock_compat.c
  13. 4
      ext/standard/flock_compat.h
  14. 12
      ext/standard/fsock.c
  15. 2
      ext/standard/fsock.h
  16. 6
      ext/standard/info.c
  17. 2
      ext/standard/lcg.c
  18. 4
      ext/standard/link.c
  19. 10
      ext/standard/mail.c
  20. 2
      ext/standard/microtime.c
  21. 4
      ext/standard/pack.c
  22. 4
      ext/standard/pageinfo.c
  23. 4
      ext/standard/parsedate.y
  24. 8
      ext/standard/string.c
  25. 6
      ext/standard/syslog.c
  26. 4
      ext/standard/uniqid.c

2
ext/standard/array.c
View File

@ -30,7 +30,7 @@
#else
#include <strings.h>
#endif
#if WIN32|WINNT
#if PHP_WIN32
#include "win32/unistd.h"
#endif
#include "zend_globals.h"

4
ext/standard/basic_functions.c
View File

@ -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 @@ function_entry basic_functions[] = {
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

2
ext/standard/basic_functions.h
View File

@ -107,7 +107,7 @@ PHP_FUNCTION(get_loaded_extensions);
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;

2
ext/standard/crypt.c
View File

@ -41,7 +41,7 @@
#include <strings.h>
#endif
#if MSVC5
#if PHP_WIN32
#include <process.h>
extern char *crypt(char *__key,char *__salt);
#endif

2
ext/standard/dir.c
View File

@ -36,7 +36,7 @@
#include <errno.h>
#if WIN32||WINNT
#if PHP_WIN32
#define NEEDRDH 1
#include "win32/readdir.h"
#endif

4
ext/standard/dl.c
View File

@ -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 @@ void php_dl(pval *file,int type,pval *return_value)
} 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());

4
ext/standard/dns.c
View File

@ -22,7 +22,7 @@
#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 @@ char *php_gethostbyname(char *name)
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 */

2
ext/standard/dns.h
View File

@ -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

6
ext/standard/exec.c
View File

@ -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 WIN32|WINNT
#if 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 WIN32|WINNT
#if 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 WIN32|WINNT
#if PHP_WIN32
if ((in=popen((*cmd)->value.str.val,"rt"))==NULL) {
#else
if ((in=popen((*cmd)->value.str.val,"r"))==NULL) {

12
ext/standard/file.c
View File

@ -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 @@ PHPAPI int php_set_sock_blocking(int socketd, int block)
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 @@ PHP_FUNCTION(copy)
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_FUNCTION(copy)
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) {

6
ext/standard/filestat.c
View File

@ -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>

6
ext/standard/flock_compat.c
View File

@ -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 @@ int flock(int fd, int operation)
return ret;
}
#elif WIN32|WINNT
#elif 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 !(WIN32|WINNT)
#if !(PHP_WIN32)
errno = EINVAL; /* bad call */
#endif
return -1;

4
ext/standard/flock_compat.h
View File

@ -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

12
ext/standard/fsock.c
View File

@ -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 @@ extern int le_fp;
#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 @@ PHPAPI int connect_nonb(int sockfd,
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 @@ PHPAPI int connect_nonb(int sockfd,
ret = -1;
}
return ret;
#else /* !defined(WIN32) && ... */
#else /* !PHP_WIN32 && ... */
return connect(sockfd, addr, addrlen);
#endif
}
@ -483,7 +483,7 @@ int php_sockdestroy(int socket)
return ret;
}
#if !defined(WIN32) && !defined(WINNT)
#if !PHP_WIN32
#undef closesocket
#define closesocket close
#endif

2
ext/standard/fsock.h
View File

@ -34,7 +34,7 @@
#ifndef _FSOCK_H
#define _FSOCK_H
#if WIN32|WINNT
#if PHP_WIN32
# ifndef WINNT
# define WINNT 1
# endif

6
ext/standard/info.c
View File

@ -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 @@ PHPAPI void php_print_info(int flag)
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 @@ PHPAPI void php_print_info(int flag)
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));

2
ext/standard/lcg.c
View File

@ -29,7 +29,7 @@ int lcg_globals_id;
static php_lcg_globals lcg_globals;
#endif
#if WIN32||WINNT
#if PHP_WIN32
#include <process.h>
#endif

4
ext/standard/link.c
View File

@ -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>

10
ext/standard/mail.c
View File

@ -22,14 +22,14 @@
#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 @@ PHP_FUNCTION(mail)
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 @@ int php_mail(char *to, char *subject, char *message, char *headers)
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 @@ int php_mail(char *to, char *subject, char *message, char *headers)
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"));

2
ext/standard/microtime.c
View File

@ -31,7 +31,7 @@
#include <stdio.h>
#ifdef HAVE_GETTIMEOFDAY
#if MSVC5
#if PHP_WIN32
#include "win32/time.h"
#else
#include <sys/time.h>

4
ext/standard/pack.c
View File

@ -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>

4
ext/standard/pageinfo.c
View File

@ -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

4
ext/standard/parsedate.y
View File

@ -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

8
ext/standard/string.c
View File

@ -471,14 +471,14 @@ PHP_FUNCTION(basename)
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 @@ PHPAPI void php_dirname(char *str, int len) {
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
)

6
ext/standard/syslog.c
View File

@ -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 @@ PHP_MINIT_FUNCTION(syslog)
/* 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 @@ static void start_syslog(void)
/* 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);

4
ext/standard/uniqid.c
View File

@ -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_FUNCTION(uniqid)
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);
}

Write Preview
Loading…
Cancel
Save