php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-07 16:13:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

- PHP_WIN32 macro should be used with #ifdef/#ifndef

Browse Source 
- Always use PHP_WIN32 instead of WIN32/WINNT values
This commit is contained in:
Andi Gutmans
2000-05-23 13:49:55 +00:00
parent cd8c4268ec
commit 32dffec0f8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ext/ftp/ftp.c
View File

@@ -43,7 +43,7 @@
#include <fcntl.h>
#include <string.h>
#include <time.h>
#if PHP_WIN32
#ifdef PHP_WIN32
#include <winsock.h>
#else
#include <sys/socket.h>
@@ -59,7 +59,7 @@
#include "ftp.h"
/* define closesocket macro for portability */
#if !PHP_WIN32
#ifndef PHP_WIN32
#undef closesocket
#define closesocket close
#endif
@@ -843,7 +843,7 @@ my_send(int s, void *buf, size_t len)
n = select(s + 1, NULL, &write_set, NULL, &tv);
if (n < 1) {
if (n == 0)
#if !PHP_WIN32
#ifndef PHP_WIN32
errno = ETIMEDOUT;
#endif
return -1;
@@ -876,7 +876,7 @@ my_recv(int s, void *buf, size_t len)
n = select(s + 1, &read_set, NULL, NULL, &tv);
if (n < 1) {
if (n == 0)
#if !PHP_WIN32
#ifndef PHP_WIN32
errno = ETIMEDOUT;
#endif
return -1;
@@ -888,7 +888,7 @@ my_recv(int s, void *buf, size_t len)
int
my_connect(int s, const struct sockaddr *addr, int addrlen)
#if !PHP_WIN32
#ifndef PHP_WIN32
{
fd_set conn_set;
int flags;
@@ -953,7 +953,7 @@ my_accept(int s, struct sockaddr *addr, int *addrlen)
n = select(s + 1, &accept_set, NULL, NULL, &tv);
if (n < 1) {
if (n == 0)
#if !PHP_WIN32
#ifndef PHP_WIN32
errno = ETIMEDOUT;
#endif
return -1;

4
ext/ftp/php_ftp.c
View File

@@ -552,7 +552,7 @@ PHP_FUNCTION(ftp_get)
RETURN_FALSE;
}
#if defined(WIN32) || defined(WINNT)
#ifdef PHP_WIN32
if ((outfp = V_FOPEN(arg2->value.str.val, "wb")) == NULL) {
#else
if ((outfp = V_FOPEN(arg2->value.str.val, "w")) == NULL) {
@@ -640,7 +640,7 @@ PHP_FUNCTION(ftp_put)
convert_to_string(arg3);
XTYPE(xtype, arg4);
#if defined(WIN32) || defined(WINNT)
#ifdef PHP_WIN32
if ((infp = V_FOPEN(arg3->value.str.val, "rb")) == NULL) {
#else
if ((infp = V_FOPEN(arg3->value.str.val, "r")) == NULL) {