cvs: /php4 main.c

andi Thu Feb 10 09:16:19 2000 EDT Modified files: /php4 main.c Log: - PHP_WIN32 Index: php4/main.c diff -u php4/main.c:1.197 php4/main.c:1.198 --- php4/main.c:1.197 Thu Feb 10 09:14:05 2000 +++ php4/main.c Thu Feb 10 09:15:49 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.197 2000/02/10 17:14:05 andi Exp $ */ +/* $Id: main.c,v 1.198 2000/02/10 17:15:49 andi Exp $ */ #include <stdio.h> @@ -453,7 +453,7 @@ static void php_set_timeout(long seconds) { -#if WIN32|WINNT +#if PHP_WIN32 #else # ifdef HAVE_SETITIMER struct itimerval t_r; /* timeout requested */ @@ -471,7 +471,7 @@ static void php_unset_timeout(void) { -#if WIN32|WINNT +#if PHP_WIN32 #else # ifdef HAVE_SETITIMER struct itimerval no_timeout; @@ -591,7 +591,7 @@ snprintf(memory_leak_buf, 512, "Last leak repeated %ld time%s\n", leak_count, (leak_count>1?"s":"")); } -# if WIN32||WINNT +# if PHP_WIN32 OutputDebugString(memory_leak_buf); # else fprintf(stderr, memory_leak_buf); @@ -778,11 +778,11 @@ php_core_globals *core_globals; sapi_globals_struct *sapi_globals = ts_resource(sapi_globals_id); #endif -#if (WIN32|WINNT) && !(USE_SAPI) +#if (PHP_WIN32) && !(USE_SAPI) WORD wVersionRequested = MAKEWORD(2, 0); WSADATA wsaData; #endif -#if WIN32|WINNT +#if PHP_WIN32 { DWORD dwVersion = GetVersion(); @@ -837,7 +837,7 @@ setlocale(LC_CTYPE, ""); #endif -#if (WIN32|WINNT) && !(USE_SAPI) +#if (PHP_WIN32) && !(USE_SAPI) /* start up winsock services */ if (WSAStartup(wVersionRequested, &wsaData) != 0) { php_printf("\nwinsock.dll unusable. %d\n", WSAGetLastError()); @@ -902,7 +902,7 @@ /* close down the ini config */ php_config_ini_shutdown(); -#if (WIN32|WINNT) +#if (PHP_WIN32) /*close winsock */ WSACleanup(); #endif @@ -1107,7 +1107,7 @@ return; } -#if WIN32||WINNT +#if PHP_WIN32 UpdateIniFromRegistry(primary_file->filename); #endif @@ -1134,7 +1134,7 @@ } } -#if WIN32||WINNT +#if PHP_WIN32 /* just so that this symbol gets exported... */ PHPAPI void dummy_indent() {