stas Mon Jun 5 08:30:54 2006 UTC
Added files: (Branch: PHP_5_1)
/php-src/main timelib_config.h
Modified files:
/php-src/main config.w32.h internal_functions_win32.c
Log:
improve .dsp build
http://cvs.php.net/viewcvs.cgi/php-src/main/config.w32.h?r1=1.85.4.1&r2=1.85.4.2&diff_format=u
Index: php-src/main/config.w32.h
diff -u php-src/main/config.w32.h:1.85.4.1 php-src/main/config.w32.h:1.85.4.2
--- php-src/main/config.w32.h:1.85.4.1 Thu Sep 15 19:11:15 2005
+++ php-src/main/config.w32.h Mon Jun 5 08:30:54 2006
@@ -2,7 +2,7 @@
Build Configuration for Win32.
This has only been tested with MS VisualC++ 6 (and later).
- $Id: config.w32.h,v 1.85.4.1 2005/09/15 19:11:15 derick Exp $
+ $Id: config.w32.h,v 1.85.4.2 2006/06/05 08:30:54 stas Exp $
*/
/* Default PHP / PEAR directories */
@@ -72,9 +72,13 @@
#define HAVE_DOM 1
#define HAVE_SIMPLEXML 1
#define HAVE_XML 1
+#define HAVE_XMLREADER 1
+#define HAVE_XMLWRITER 1
+#define HAVE_LIBXML_PARSER_H 1
/* Enable / Disable ZLIB extension (default: enabled) */
#define HAVE_ZLIB 1
+#define HAVE_ZLIB_H 1
/* Enable / Disable SQLite extension (default: enabled) */
#define HAVE_SQLITE 1
@@ -190,7 +194,6 @@
#define HAVE_SQLDATASOURCES
#define POSIX_MALLOC_THRESHOLD 10
-
/*
* defining HAVE_SOCKLEN_T prevents PHP from building with the latest platform
SDK...
* #define HAVE_SOCKLEN_T
@@ -203,3 +206,44 @@
#define PHP_CAN_SUPPORT_PROC_OPEN 1
#define HAVE_MBLEN
+
+#undef HAVE_ATOF_ACCEPTS_NAN
+#undef HAVE_ATOF_ACCEPTS_INF
+#define HAVE_HUGE_VAL_NAN 1
+
+/* vs.net 2005 has a 64-bit time_t. This will likely break
+ * 3rdParty libs that were built with older compilers; switch
+ * back to 32-bit */
+#define _USE_32BIT_TIME_T 1
+#define HAVE_STDLIB_H 1
+/* have the arpa\nameser.h header file */
+#define HAVE_ARPA_NAMESER_H 1
+
+/* undefined */
+#define PHP_FASTCGI 1
+
+/* Have COM_DOTNET support */
+#define HAVE_COM_DOTNET 1
+
+/* Have date/time support */
+#define HAVE_DATE 1
+
+/* GD support */
+#define HAVE_LIBGD 1
+/* undefined */
+#define HAVE_HASH_EXT 1
+
+/* Define if iconv extension is enabled */
+#define HAVE_ICONV 1
+
+/* Define if libiconv is available */
+#define HAVE_LIBICONV 1
+
+/* Which iconv implementation to use */
+#define PHP_ICONV_IMPL "\"libiconv\""
+
+/* Whether iconv supports errno or not */
+#define ICONV_SUPPORTS_ERRNO 1
+
+/* SPL support */
+#define HAVE_SPL 1
http://cvs.php.net/viewcvs.cgi/php-src/main/internal_functions_win32.c?r1=1.87.2.1&r2=1.87.2.2&diff_format=u
Index: php-src/main/internal_functions_win32.c
diff -u php-src/main/internal_functions_win32.c:1.87.2.1
php-src/main/internal_functions_win32.c:1.87.2.2
--- php-src/main/internal_functions_win32.c:1.87.2.1 Sun Jan 1 12:50:17 2006
+++ php-src/main/internal_functions_win32.c Mon Jun 5 08:30:54 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: internal_functions_win32.c,v 1.87.2.1 2006/01/01 12:50:17 sniper Exp $
*/
+/* $Id: internal_functions_win32.c,v 1.87.2.2 2006/06/05 08:30:54 stas Exp $ */
/* {{{ includes
*/
@@ -48,6 +48,7 @@
#include "ext/standard/php_lcg.h"
#include "ext/standard/php_array.h"
#include "ext/standard/php_assert.h"
+#include "ext/reflection/php_reflection.h"
#if HAVE_BCMATH
#include "ext/bcmath/php_bcmath.h"
#endif
@@ -57,9 +58,15 @@
#if HAVE_CTYPE
#include "ext/ctype/php_ctype.h"
#endif
+#if HAVE_DATE
+#include "ext/date/php_date.h"
+#endif
#if HAVE_FTP
#include "ext/ftp/php_ftp.h"
#endif
+#if HAVE_ICONV
+#include "ext/iconv/php_iconv.h"
+#endif
#include "ext/standard/reg.h"
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
#include "ext/pcre/php_pcre.h"
@@ -98,6 +105,15 @@
#include "ext/sqlite/php_sqlite.h"
#endif
#include "ext/com_dotnet/php_com_dotnet.h"
+#ifdef HAVE_SPL
+#include "ext/spl/php_spl.h"
+#endif
+#ifdef HAVE_XML && HAVE_XMLREADER
+#include "ext/xmlreader/php_xmlreader.h"
+#endif
+#ifdef HAVE_XML && HAVE_XMLWRITER
+#include "ext/xmlwriter/php_xmlwriter.h"
+#endif
/* }}} */
/* {{{ php_builtin_extensions[]
@@ -114,9 +130,18 @@
#if HAVE_CTYPE
,phpext_ctype_ptr
#endif
+#if HAVE_DATE
+ ,phpext_date_ptr
+#endif
#if HAVE_FTP
,phpext_ftp_ptr
#endif
+#if HAVE_HASH
+ ,phpext_hash_ptr
+#endif
+#if HAVE_ICONV
+ ,phpext_iconv_ptr
+#endif
#if HAVE_MBSTRING
,phpext_mbstring_ptr
#endif
@@ -126,6 +151,7 @@
#if HAVE_PCRE || HAVE_BUNDLED_PCRE
,phpext_pcre_ptr
#endif
+ ,phpext_reflection_ptr
#if HAVE_PHP_SESSION
,phpext_session_ptr
#endif
@@ -153,6 +179,15 @@
#if HAVE_SQLITE
,phpext_sqlite_ptr
#endif
+#if HAVE_SPL
+ ,phpext_spl_ptr
+#endif
+#if HAVE_XML && HAVE_XMLREADER
+ ,phpext_xmlreader_ptr
+#endif
+#if HAVE_XML && HAVE_XMLWRITER
+ ,phpext_xmlwriter_ptr
+#endif
};
/* }}} */
http://cvs.php.net/viewcvs.cgi/php-src/main/timelib_config.h?view=markup&rev=1.1
Index: php-src/main/timelib_config.h
+++ php-src/main/timelib_config.h
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
