cvs: php4 /ext/cpdf cpdf.c /ext/db db.c /ext/gd gd.c /ext/hyperwave hg_comm.c hg_comm.h hw.c /ext/odbc php_odbc.c /ext/pdf pdf.c /ext/xml xml.c
/sapi/apache php_apache.c

andi Thu Jun 15 16:45:05 2000 EDT Modified files: /php4/ext/cpdf cpdf.c /php4/ext/db db.c /php4/ext/gd gd.c /php4/ext/hyperwave hg_comm.c hg_comm.h hw.c /php4/ext/odbc php_odbc.c /php4/ext/pdf pdf.c /php4/ext/xml xml.c /php4/sapi/apache php_apache.c Log: - More #if WIN32|WINNT -> #ifdef PHP_WIN32 conversions Index: php4/ext/cpdf/cpdf.c diff -u php4/ext/cpdf/cpdf.c:1.16 php4/ext/cpdf/cpdf.c:1.17 --- php4/ext/cpdf/cpdf.c:1.16 Mon Jun 5 12:47:39 2000 +++ php4/ext/cpdf/cpdf.c Thu Jun 15 16:45:03 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cpdf.c,v 1.16 2000/06/05 19:47:39 andi Exp $ */ +/* $Id: cpdf.c,v 1.17 2000/06/15 23:45:03 andi Exp $ */ /* cpdflib.h -- C language API definitions for ClibPDF library * Copyright (C) 1998 FastIO Systems, All Rights Reserved. */ @@ -50,7 +50,7 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#if WIN32|WINNT +#ifdef PHP_WIN32 # include <io.h> # include <fcntl.h> #endif Index: php4/ext/db/db.c diff -u php4/ext/db/db.c:1.40 php4/ext/db/db.c:1.41 --- php4/ext/db/db.c:1.40 Tue Jun 13 07:37:34 2000 +++ php4/ext/db/db.c Thu Jun 15 16:45:03 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: db.c,v 1.40 2000/06/13 14:37:34 jimjag Exp $ */ +/* $Id: db.c,v 1.41 2000/06/15 23:45:03 andi Exp $ */ #define IS_EXT_MODULE #ifdef COMPILE_DL_DB # include "dl/phpdl.h" @@ -42,7 +42,7 @@ #ifdef PHP_31 #include "os/nt/flock.h" #else -#if WIN32|WINNT +#ifdef PHP_WIN32 #include "win32/flock.h" #else #include <sys/file.h> Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.67 php4/ext/gd/gd.c:1.68 --- php4/ext/gd/gd.c:1.67 Tue Jun 13 22:11:16 2000 +++ php4/ext/gd/gd.c Thu Jun 15 16:45:04 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.67 2000/06/14 05:11:16 jah Exp $ */ +/* $Id: gd.c,v 1.68 2000/06/15 23:45:04 andi Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -37,7 +37,7 @@ #if HAVE_UNISTD_H # include <unistd.h> #endif -#if WIN32|WINNT +#ifdef PHP_WIN32 # include <io.h> # include <fcntl.h> #endif Index: php4/ext/hyperwave/hg_comm.c diff -u php4/ext/hyperwave/hg_comm.c:1.30 php4/ext/hyperwave/hg_comm.c:1.31 --- php4/ext/hyperwave/hg_comm.c:1.30 Thu May 18 08:34:26 2000 +++ php4/ext/hyperwave/hg_comm.c Thu Jun 15 16:45:04 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hg_comm.c,v 1.30 2000/05/18 15:34:26 zeev Exp $ */ +/* $Id: hg_comm.c,v 1.31 2000/06/15 23:45:04 andi Exp $ */ /* #define HW_DEBUG */ @@ -30,7 +30,7 @@ #include <stdio.h> #include <string.h> #include <sys/types.h> -#if WIN32|WINNT +#ifdef PHP_WIN32 # include <winsock2.h> # define EWOULDBLOCK WSAEWOULDBLOCK # define ETIMEDOUT WSAETIMEDOUT @@ -873,7 +873,7 @@ /* ** Make sure that address may be reused */ -#if defined(SUN) || (WIN32|WINNT) +#if defined(SUN) || defined(PHP_WIN32) setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&option, sizeof(option)); #else setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option)); @@ -920,7 +920,7 @@ * dec@essw.com * *====================================================================*/ -#if WIN32|WINNT +#ifdef PHP_WIN32 #include <time.h> #else #include <sys/fcntl.h> @@ -930,13 +930,13 @@ #include <errno.h> #include <signal.h> -#if !(WIN32|WINNT) +#ifndef PHP_WIN32 static sigset_t newmask, oldmask, zeromask; #endif static int set_noblock(int fd) { -#if WIN32|WINNT +#ifdef PHP_WIN32 u_long argp=1; return ioctlsocket (fd, FIONBIO , &argp); @@ -958,7 +958,7 @@ int nrem, nw=0; char *bptr; int error=0; -#if defined(SYSV) || (WIN32|WINNT) +#if defined(SYSV) || defined(PHP_WIN32) int width = 20; #else int width = getdtablesize(); @@ -967,7 +967,7 @@ struct timeval select_timeout; select_timeout.tv_sec = timeout; -#if WIN32|WINNT +#ifdef PHP_WIN32 select_timeout.tv_usec = 0; #else /* is this just a typo? */ select_timeout.tv_usec = 0.; @@ -1010,7 +1010,7 @@ bptr += nw; } } -#if !(WIN32|WINNT) +#ifndef PHP_WIN32 if (sigprocmask(SIG_SETMASK, &oldmask, NULL) < 0) return -1; #endif if( ! error ) { @@ -1029,7 +1029,7 @@ char *bptr; int error=0; -#if defined(SYSV) || (WIN32|WINNT) +#if defined(SYSV) || defined(PHP_WIN32) int width = 20; #else int width = getdtablesize(); @@ -1038,7 +1038,7 @@ struct timeval select_timeout; select_timeout.tv_sec = timeout; -#if WIN32|WINNT +#ifdef PHP_WIN32 select_timeout.tv_usec = 0; #else select_timeout.tv_usec = 0.; @@ -1088,7 +1088,7 @@ } } -#if !(WIN32|WINNT) +#ifndef PHP_WIN32 if (sigprocmask(SIG_SETMASK, &oldmask, NULL) < 0) return -1; #endif if( ! error ) @@ -1142,7 +1142,7 @@ return(-3); } -#if defined(SUN) || (WIN32|WINNT) +#if defined(SUN) || defined(PHP_WIN32) setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char *)&option, sizeof(option)); #else setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &option, sizeof(option)); @@ -1153,7 +1153,7 @@ return(-4); } -#if !(WIN32|WINNT) +#ifndef PHP_WIN32 if ( (sock_flags = fcntl(sockfd, F_GETFL, 0)) == -1 ) #endif @@ -1263,7 +1263,7 @@ static int set_nonblocking(int fd) { -#if WIN32|WINNT +#ifdef PHP_WIN32 unsigned int argp=0; /* if ( sock_flags == -1 ) @@ -1283,7 +1283,7 @@ static int set_blocking(int fd) { -#if WIN32|WINNT +#ifdef PHP_WIN32 unsigned int argp=1; if(ioctlsocket (fd, FIONBIO , &argp) == -1) Index: php4/ext/hyperwave/hg_comm.h diff -u php4/ext/hyperwave/hg_comm.h:1.6 php4/ext/hyperwave/hg_comm.h:1.7 --- php4/ext/hyperwave/hg_comm.h:1.6 Thu Mar 23 11:00:19 2000 +++ php4/ext/hyperwave/hg_comm.h Thu Jun 15 16:45:04 2000 @@ -23,7 +23,7 @@ */ -/* $Id: hg_comm.h,v 1.6 2000/03/23 19:00:19 steinm Exp $ */ +/* $Id: hg_comm.h,v 1.7 2000/06/15 23:45:04 andi Exp $ */ #ifndef _HG_COMM_H #define _HG_COMM_H @@ -97,7 +97,7 @@ #define COLLECTION 1 -#if WIN32|WINNT +#ifdef PHP_WIN32 # define SOCK_ERR INVALID_SOCKET # define SOCK_CONN_ERR SOCKET_ERROR # define HWSOCK_FCLOSE(s) closesocket(s) Index: php4/ext/hyperwave/hw.c diff -u php4/ext/hyperwave/hw.c:1.56 php4/ext/hyperwave/hw.c:1.57 --- php4/ext/hyperwave/hw.c:1.56 Mon Jun 12 06:33:48 2000 +++ php4/ext/hyperwave/hw.c Thu Jun 15 16:45:04 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: hw.c,v 1.56 2000/06/12 13:33:48 eschmid Exp $ */ +/* $Id: hw.c,v 1.57 2000/06/15 23:45:04 andi Exp $ */ #ifdef COMPILE_DL_HYPERWAVE #include "dl/phpdl.h" #endif @@ -31,7 +31,7 @@ #include "ext/standard/info.h" #include "SAPI.h" -#if WIN32|WINNT +#ifdef PHP_WIN32 #include <winsock.h> #else #include "build-defs.h" @@ -2060,7 +2060,7 @@ string. It should contain any enviroment variable a cgi script requires. */ -#if (WIN32|WINNT) +#ifdef PHP_WIN32 snprintf(cgi_env_str, BUFFERLEN, "CGI_REQUEST_METHOD=%s\nCGI_PATH_INFO=%s\nCGI_QUERY_STRING=%s", getenv("REQUEST_METHOD"), getenv("PATH_INFO"), @@ -2356,7 +2356,7 @@ char *attributes = NULL; int count; -#if (WIN32|WINNT) +#ifdef PHP_WIN32 snprintf(cgi_env_str, BUFFERLEN, "CGI_REQUEST_METHOD=%s\nCGI_PATH_INFO=%s\nCGI_QUERY_STRING=%s", getenv("REQUEST_METHOD"), getenv("PATH_INFO"), Index: php4/ext/odbc/php_odbc.c diff -u php4/ext/odbc/php_odbc.c:1.54 php4/ext/odbc/php_odbc.c:1.55 --- php4/ext/odbc/php_odbc.c:1.54 Wed Jun 7 11:10:21 2000 +++ php4/ext/odbc/php_odbc.c Thu Jun 15 16:45:04 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.54 2000/06/07 18:10:21 zeev Exp $ */ +/* $Id: php_odbc.c,v 1.55 2000/06/15 23:45:04 andi Exp $ */ #ifdef COMPILE_DL_ODBC #include "dl/phpdl.h" @@ -42,7 +42,7 @@ #include "ext/standard/head.h" #include "php_ini.h" -#if WIN32|WINNT +#ifdef PHP_WIN32 #include <winsock.h> #define ODBC_TYPE "Win32" @@ -444,7 +444,7 @@ sprintf(buf, "%ld", ODBCG(num_links)); php_info_print_table_row(2, "Active Links", buf); php_info_print_table_row(2, "ODBC library", PHP_ODBC_TYPE); -#if !(WIN32|WINNT) +#ifndef PHP_WIN32 php_info_print_table_row(2, "ODBC_INCLUDE", PHP_ODBC_INCLUDE); php_info_print_table_row(2, "ODBC_LFLAGS", PHP_ODBC_LFLAGS); php_info_print_table_row(2, "ODBC_LIBS", PHP_ODBC_LIBS); Index: php4/ext/pdf/pdf.c diff -u php4/ext/pdf/pdf.c:1.44 php4/ext/pdf/pdf.c:1.45 --- php4/ext/pdf/pdf.c:1.44 Wed Jun 7 13:01:11 2000 +++ php4/ext/pdf/pdf.c Thu Jun 15 16:45:04 2000 @@ -27,7 +27,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdf.c,v 1.44 2000/06/07 20:01:11 steinm Exp $ */ +/* $Id: pdf.c,v 1.45 2000/06/15 23:45:04 andi Exp $ */ /* pdflib 2.02 is subject to the ALADDIN FREE PUBLIC LICENSE. Copyright (C) 1997 Thomas Merz. */ @@ -52,7 +52,7 @@ #ifdef HAVE_UNISTD_H # include <unistd.h> #endif -#if WIN32|WINNT +#ifdef PHP_WIN32 # include <io.h> # include <fcntl.h> #endif Index: php4/ext/xml/xml.c diff -u php4/ext/xml/xml.c:1.56 php4/ext/xml/xml.c:1.57 --- php4/ext/xml/xml.c:1.56 Mon Jun 5 12:47:45 2000 +++ php4/ext/xml/xml.c Thu Jun 15 16:45:04 2000 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml.c,v 1.56 2000/06/05 19:47:45 andi Exp $ */ +/* $Id: xml.c,v 1.57 2000/06/15 23:45:04 andi Exp $ */ #define IS_EXT_MODULE #include "php.h" @@ -29,7 +29,7 @@ #if HAVE_LIBEXPAT -# if !(WIN32|WINNT) +#ifndef PHP_WIN32 # include "build-defs.h" # endif # include "ext/standard/head.h" Index: php4/sapi/apache/php_apache.c diff -u php4/sapi/apache/php_apache.c:1.16 php4/sapi/apache/php_apache.c:1.17 --- php4/sapi/apache/php_apache.c:1.16 Mon Jun 5 14:19:21 2000 +++ php4/sapi/apache/php_apache.c Thu Jun 15 16:45:04 2000 @@ -17,7 +17,7 @@ | David Sklar <sklar@student.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_apache.c,v 1.16 2000/06/05 21:19:21 rasmus Exp $ */ +/* $Id: php_apache.c,v 1.17 2000/06/15 23:45:04 andi Exp $ */ #define NO_REGEX_EXTRA_H @@ -179,7 +179,7 @@ serv = ((request_rec *) SG(server_context))->server; -#if WIN32|WINNT +#ifdef PHP_WIN32 PUTS("Apache for Windows 95/NT<br>"); php_info_print_table_start(); #else