clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Win32 build improvements

Browse Source
This commit is contained in:
Zeev Suraski 2003-02-17 13:29:59 +00:00
parent fb607799cc
commit 4934744b93
21 changed files with 23 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/rpc/com/com.c
View File

@ -19,6 +19,8 @@
#define _WIN32_DCOM
#define COBJMACROS
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
#include "../rpc.h"
#include "../handler.h"

2
ext/rpc/com/conversion.c
View File

@ -31,6 +31,8 @@
#ifdef PHP_WIN32
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
#include "php.h"
#include "../rpc.h"

2
ext/rpc/com/dispatch.c
View File

@ -23,6 +23,8 @@
* them as objects implementing IDispatch.
* */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
#include "../rpc.h"
#include "php.h"

2
ext/rpc/com/variant.c
View File

@ -27,6 +27,8 @@
#ifdef PHP_WIN32
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"

2
ext/snmp/winsnmp.c
View File

@ -10,8 +10,6 @@ Created from the snmputil sample in the Microsoft SDK for NT
#include "php_snmp.h"
#include <sys/types.h>
#include <windows.h>
#include <stdio.h>
#include <string.h>
#include <malloc.h>

2
ext/standard/file.c
View File

@ -43,8 +43,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#ifdef PHP_WIN32
#include <windows.h>
#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#include "win32/winutil.h"

1
ext/standard/flock_compat.c
View File

@ -29,7 +29,6 @@
#endif
#ifdef PHP_WIN32
#include <windows.h>
#include <io.h>
#endif

1
ext/standard/ftp_fopen_wrapper.c
View File

@ -31,7 +31,6 @@
#include <fcntl.h>
#ifdef PHP_WIN32
#include <windows.h>
#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"

2
ext/standard/http_fopen_wrapper.c
View File

@ -35,8 +35,6 @@
#include <fcntl.h>
#ifdef PHP_WIN32
#include <windows.h>
#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#elif defined(NETWARE)

2
ext/standard/pack.c
View File

@ -26,8 +26,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#ifdef PHP_WIN32
#include <windows.h>
#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#elif defined(NETWARE)

7
ext/standard/rand.c
View File

@ -24,13 +24,6 @@
#include <stdlib.h>
#ifdef PHP_WIN32
# ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
# include <windows.h>
#endif
#if defined(NETWARE) && !defined(NEW_LIBC) /* For getpid() used below */
#include "netware/pwd.h"
#endif

3
ext/w32api/w32api.c
View File

@ -209,9 +209,6 @@
#include <stdio.h>
#include <stdlib.h>
#define WINDOWS_LEAN_AND_MEAN
#include <windows.h>
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"

2
ext/zlib/zlib.c
View File

@ -35,8 +35,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#ifdef PHP_WIN32
#include <windows.h>
#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#else

2
main/fopen_wrappers.c
View File

@ -32,8 +32,6 @@
#include <fcntl.h>
#ifdef PHP_WIN32
#include <windows.h>
#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#elif defined(NETWARE)

3
main/main.c
View File

@ -22,6 +22,9 @@
/* {{{ includes
*/
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
#include <stdio.h>
#include "php.h"
#ifdef PHP_WIN32

2
main/network.c
View File

@ -25,8 +25,6 @@
#include <stddef.h>
#ifdef PHP_WIN32
#include <windows.h>
#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#elif defined(NETWARE)

4
main/php.h
View File

@ -22,10 +22,6 @@
#ifndef PHP_H
#define PHP_H
#ifdef PHP_WIN32
#include <winsock2.h>
#endif
#ifdef HAVE_DMALLOC
#include <dmalloc.h>
#endif

2
main/php_open_temporary_file.c
View File

@ -26,8 +26,6 @@
#include <fcntl.h>
#ifdef PHP_WIN32
#include <windows.h>
#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#include "win32/winutil.h"

1
sapi/apache/php_apache_http.h
View File

@ -1,7 +1,6 @@
#define NO_REGEX_EXTRA_H
#ifdef WIN32
#include <winsock2.h>
#include <stddef.h>
#endif

2
sapi/cgi/cgi_main.c
View File

@ -1572,7 +1572,7 @@ consult the installation file that came with this distribution, or visit \n\
sapi_shutdown();
#ifdef ZTS
tsrm_shutdown();
/*tsrm_shutdown();*/
#endif
#if PHP_WIN32 && ZEND_DEBUG && 0

23
sapi/isapi/php4isapi.c
View File

@ -17,9 +17,18 @@
+----------------------------------------------------------------------+
*/
#include "php.h"
#include <httpext.h>
#include <httpfilt.h>
#include <httpext.h>
#include "php_main.h"
#include "SAPI.h"
#include "php_globals.h"
#include "ext/standard/info.h"
#include "php_variables.h"
#include "php_ini.h"
#ifdef PHP_WIN32
# include <winsock2.h>
# include <windows.h>
# include <process.h>
#else
# define __try
@ -27,16 +36,6 @@
# define __declspec(foo)
#endif
#include <httpext.h>
#include <httpfilt.h>
#include <httpext.h>
#include "php.h"
#include "php_main.h"
#include "SAPI.h"
#include "php_globals.h"
#include "ext/standard/info.h"
#include "php_variables.h"
#include "php_ini.h"
#ifdef WITH_ZEUS
# include "httpext.h"