Skip to content

Commit 99a4300

Browse files
committed
Not sure why this file was comitted?
I was running a CVS update and then I see commit messages with my user id! Reverting the changes.
1 parent 4398fbb commit 99a4300

File tree

1 file changed

+94
-102
lines changed

1 file changed

+94
-102
lines changed

main/config.w32.h

+94-102
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
/*
2-
Build Configuration Template for Win32.
2+
Build Configuration for Win32.
3+
This has only been tested with MS VisualC++ 6 (and later).
4+
35
$Id$
46
*/
57

68
/* Default PHP / PEAR directories */
7-
#define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):""
89
#define CONFIGURATION_FILE_PATH "php.ini"
9-
#define PEAR_INSTALLDIR "C:\\php5\\pear"
10-
#define PHP_BINDIR "C:\\php5"
11-
#define PHP_DATADIR "C:\\php5"
12-
#define PHP_EXTENSION_DIR "C:\\php5"
13-
#define PHP_INCLUDE_PATH ".;C:\\php5\\pear"
14-
#define PHP_LIBDIR "C:\\php5"
15-
#define PHP_LOCALSTATEDIR "C:\\php5"
16-
#define PHP_PREFIX "C:\\php5"
17-
#define PHP_SYSCONFDIR "C:\\php5"
10+
#define PEAR_INSTALLDIR "c:\\php5\\pear"
11+
#define PHP_BINDIR "c:\\php5"
12+
#define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):""
13+
#define PHP_CONFIG_FILE_SCAN_DIR ""
14+
#define PHP_DATADIR "c:\\php5"
15+
#define PHP_EXTENSION_DIR "c:\\php5"
16+
#define PHP_INCLUDE_PATH ".;c:\\php5\\pear"
17+
#define PHP_LIBDIR "c:\\php5"
18+
#define PHP_LOCALSTATEDIR "c:\\php5"
19+
#define PHP_PREFIX "c:\\php5"
20+
#define PHP_SYSCONFDIR "c:\\php5"
21+
22+
/* Enable / Disable BCMATH extension (default: enabled) */
23+
#define HAVE_BCMATH 1
1824

1925
/* Enable / Disable crypt() function (default: enabled) */
2026
#define HAVE_CRYPT 1
@@ -23,12 +29,68 @@
2329
#define PHP_MD5_CRYPT 1
2430
#define PHP_BLOWFISH_CRYPT 0
2531

32+
/* Enable / Disable CALENDAR extension (default: enabled) */
33+
#define HAVE_CALENDAR 1
34+
35+
/* Enable / Disable CTYPE extension (default: enabled) */
36+
#define HAVE_CTYPE 1
37+
38+
/* Enable / Disable FTP extension (default: enabled) */
39+
#define HAVE_FTP 1
40+
41+
/* Enable / Disable MBSTRING extension (default: disabled) */
42+
/* #define HAVE_MBSTRING 0 */
43+
/* #define HAVE_MBREGEX 0 */
44+
/* #define HAVE_MBSTR_CN 0 */
45+
/* #define HAVE_MBSTR_JA 0 */
46+
/* #define HAVE_MBSTR_KR 0 */
47+
/* #define HAVE_MBSTR_RU 0 */
48+
/* #define HAVE_MBSTR_TW 0 */
49+
50+
/* If you have the .Net SDK in your include path, define this
51+
* to compile .Net support into your COM extension. */
52+
#define HAVE_MSCOREE_H 0
53+
54+
/* Enable / Disable ODBC extension (default: enabled) */
55+
#define HAVE_UODBC 1
56+
57+
/* Enable / Disable PCRE extension (default: enabled) */
58+
#define HAVE_BUNDLED_PCRE 1
59+
#define HAVE_PCRE 1
60+
61+
/* Enable / Disable SESSION extension (default: enabled) */
62+
#define HAVE_PHP_SESSION 1
63+
64+
/* Enable / Disable TOKENIZER extension (default: enabled) */
65+
#define HAVE_TOKENIZER 1
66+
67+
/* Enable / Disable WDDX extension (default: enabled) */
68+
#define HAVE_WDDX 1
69+
70+
/* Enable / Disable XML extensions (default: enabled) */
71+
#define HAVE_LIBXML 1
72+
#define HAVE_DOM 1
73+
#define HAVE_SIMPLEXML 1
74+
#define HAVE_XML 1
75+
#define HAVE_XMLREADER 1
76+
#define HAVE_XMLWRITER 1
77+
#define HAVE_LIBXML_PARSER_H 1
78+
79+
/* Enable / Disable ZLIB extension (default: enabled) */
80+
#define HAVE_ZLIB 1
81+
#define HAVE_ZLIB_H 1
82+
83+
/* Enable / Disable SQLite extension (default: enabled) */
84+
#define HAVE_SQLITE 1
85+
2686
/* PHP Runtime Configuration */
87+
#define FORCE_CGI_REDIRECT 1
2788
#define PHP_URL_FOPEN 1
2889
#define PHP_SAFE_MODE 0
2990
#define MAGIC_QUOTES 0
3091
#define USE_CONFIG_FILE 1
3192
#define DEFAULT_SHORT_OPEN_TAG "1"
93+
#define ENABLE_PATHINFO_CHECK 1
3294

3395
/* Platform-Specific Configuration. Should not be changed. */
3496
#define PHP_SIGCHILD 0
@@ -54,7 +116,6 @@
54116
#define NEED_ISBLANK 1
55117
#define DISCARD_PATH 0
56118
#undef HAVE_SETITIMER
57-
#undef HAVE_SIGSETJMP
58119
#undef HAVE_IODBC
59120
#define HAVE_LIBDL 1
60121
#define HAVE_GETTIMEOFDAY 1
@@ -85,7 +146,7 @@
85146
#define HAVE_LOCALECONV 1
86147
#define HAVE_LOCALE_H 1
87148
#ifndef HAVE_LIBBIND
88-
# define HAVE_SETVBUF 1
149+
#define HAVE_SETVBUF 1
89150
#endif
90151
#define HAVE_SHUTDOWN 1
91152
#define HAVE_SNPRINTF 1
@@ -107,16 +168,11 @@
107168
#undef HAVE_SYS_WAIT_H
108169
#define HAVE_SYSLOG_H 1
109170
#undef HAVE_UNISTD_H
110-
#define HAVE_SYS_TYPES_H 1
111-
#define HAVE_STDARG_H 1
112-
#undef HAVE_ALLOCA_H
113-
#undef HAVE_KILL
114-
#define HAVE_GETPID 1
171+
#define HAVE_LIBDL 1
115172
#define HAVE_LIBM 1
116173
#define HAVE_CUSERID 0
117174
#undef HAVE_RINT
118175
#define HAVE_STRFTIME 1
119-
#define SIZEOF_SHORT 2
120176
/* int and long are stll 32bit in 64bit compiles */
121177
#define SIZEOF_INT 4
122178
#define SIZEOF_LONG 4
@@ -135,6 +191,12 @@
135191
#define HAVE_GLOB
136192
#define PHP_SHLIB_SUFFIX "dll"
137193
#define HAVE_SQLDATASOURCES
194+
#define POSIX_MALLOC_THRESHOLD 10
195+
196+
/*
197+
* defining HAVE_SOCKLEN_T prevents PHP from building with the latest platform SDK...
198+
* #define HAVE_SOCKLEN_T
199+
*/
138200

139201
/* Win32 supports strcoll */
140202
#define HAVE_STRCOLL 1
@@ -151,106 +213,36 @@
151213
/* vs.net 2005 has a 64-bit time_t. This will likely break
152214
* 3rdParty libs that were built with older compilers; switch
153215
* back to 32-bit */
154-
#ifndef _WIN64
155-
# define _USE_32BIT_TIME_T 1
156-
#endif
216+
#define _USE_32BIT_TIME_T 1
157217
#define HAVE_STDLIB_H 1
158-
159-
160-
/* values determined by configure.js */
161-
162-
/* undefined */
163-
#define CONFIGURE_COMMAND "cscript /nologo configure.js "
164-
165218
/* have the arpa\nameser.h header file */
166219
#define HAVE_ARPA_NAMESER_H 1
167220

168-
/* have the wspiapi.h header file */
169-
#define HAVE_WSPIAPI_H 1
170-
171-
/* undefined */
172-
#define HAVE_GETADDRINFO 1
173-
174221
/* undefined */
175-
#define HAVE_GAI_STRERROR 1
176-
177-
/* undefined */
178-
#define HAVE_IPV6 1
179-
180-
/* undefined */
181-
#define HAVE_USLEEP 1
182-
183-
/* undefined */
184-
#define HAVE_STRCOLL 1
185-
186-
/* Have BCMATH library */
187-
#define HAVE_BCMATH 1
188-
189-
/* Have calendar */
190-
#define HAVE_CALENDAR 1
222+
#define PHP_FASTCGI 1
191223

192224
/* Have COM_DOTNET support */
193225
#define HAVE_COM_DOTNET 1
194226

195-
/* Have ctype */
196-
#define HAVE_CTYPE 1
197-
198227
/* Have date/time support */
199228
#define HAVE_DATE 1
200229

201-
/* Bundled regex */
202-
#define REGEX 1
203-
204-
/* Bundled regex */
205-
#define HSREGEX 1
206-
207-
/* Have FTP support */
208-
#define HAVE_FTP 1
209-
230+
/* GD support */
231+
#define HAVE_LIBGD 1
210232
/* undefined */
211233
#define HAVE_HASH_EXT 1
212234

213-
/* ODBC support */
214-
#define HAVE_UODBC 1
215-
216-
/* Using bundled PCRE library */
217-
#define HAVE_BUNDLED_PCRE 1
235+
/* Define if iconv extension is enabled */
236+
#define HAVE_ICONV 1
218237

219-
/* Have PCRE library */
220-
#define HAVE_PCRE 1
238+
/* Define if libiconv is available */
239+
#define HAVE_LIBICONV 1
221240

222-
/* Reflection support enabled */
223-
#define HAVE_REFLECTION 1
241+
/* Which iconv implementation to use */
242+
#define PHP_ICONV_IMPL "\"libiconv\""
224243

225-
/* Session support */
226-
#define HAVE_PHP_SESSION 1
244+
/* Whether iconv supports errno or not */
245+
#define ICONV_SUPPORTS_ERRNO 1
227246

228-
/* undefined */
247+
/* SPL support */
229248
#define HAVE_SPL 1
230-
231-
/* undefined */
232-
#define PHP_CONFIG_FILE_SCAN_DIR ""
233-
234-
/* Tokenizer support */
235-
#define HAVE_TOKENIZER 1
236-
237-
/* ZLIB support */
238-
#define HAVE_ZLIB 1
239-
240-
/* have the zlib.h header file */
241-
#define HAVE_ZLIB_H 1
242-
243-
/* DOM support */
244-
#define HAVE_DOM 1
245-
246-
/* Simple XML support */
247-
#define HAVE_SIMPLEXML 1
248-
249-
/* WDDX support */
250-
#define HAVE_WDDX 1
251-
252-
/* XML support */
253-
#define HAVE_XML 1
254-
255-
/* XMLReader support */
256-
#define HAVE_XMLREADER 1

0 commit comments

Comments
 (0)