phanto Fri Jan 10 18:35:52 2003 EDT Modified files: /php4/main config.w32.h internal_functions_win32.c Log: HEAD defaults to build with ZE2 now Index: php4/main/config.w32.h diff -u php4/main/config.w32.h:1.61 php4/main/config.w32.h:1.62 --- php4/main/config.w32.h:1.61 Sun Jan 5 10:58:28 2003 +++ php4/main/config.w32.h Fri Jan 10 18:35:52 2003 @@ -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.61 2003/01/05 15:58:28 sebastian Exp $ + $Id: config.w32.h,v 1.62 2003/01/10 23:35:52 phanto Exp $ */ /* Default PHP / PEAR directories */ @@ -32,8 +32,8 @@ /* Enable / Disable CALENDAR extension (default: enabled) */ #define HAVE_CALENDAR 1 -/* Enable / Disable COM extension (default: enabled) */ -#define HAVE_COM 1 +/* Enable / Disable RPC extension (default: enabled) */ +#define HAVE_RPC 1 /* Enable / Disable CTYPE extension (default: enabled) */ #define HAVE_CTYPE 1 @@ -55,9 +55,6 @@ /* Enable / Disable ODBC extension (default: enabled) */ #define HAVE_UODBC 1 - -/* Enable / Disable OVERLOAD extension (default: enabled) */ -#define HAVE_OVERLOAD 1 /* Enable / Disable PCRE extension (default: enabled) */ #define HAVE_BUNDLED_PCRE 1 Index: php4/main/internal_functions_win32.c diff -u php4/main/internal_functions_win32.c:1.67 php4/main/internal_functions_win32.c:1.68 --- php4/main/internal_functions_win32.c:1.67 Tue Dec 31 10:58:51 2002 +++ php4/main/internal_functions_win32.c Fri Jan 10 18:35:52 2003 @@ -16,7 +16,7 @@ | Zeev Suraski <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ - $Id: internal_functions_win32.c,v 1.67 2002/12/31 15:58:51 sebastian Exp $ + $Id: internal_functions_win32.c,v 1.68 2003/01/10 23:35:52 phanto Exp $ */ /* {{{ includes @@ -54,8 +54,8 @@ #if HAVE_CTYPE #include "ext/ctype/php_ctype.h" #endif -#if HAVE_COM -#include "ext/com/php_COM.h" +#if HAVE_RPC +#include "ext/rpc/php_rpc.h" #endif #if HAVE_FTP #include "ext/ftp/php_ftp.h" @@ -82,11 +82,6 @@ #if HAVE_MBSTRING #include "ext/mbstring/mbstring.h" #endif -#ifndef ZEND_ENGINE_2 -#if HAVE_OVERLOAD -#include "ext/overload/php_overload.h" -#endif -#endif #if HAVE_TOKENIZER #include "ext/tokenizer/php_tokenizer.h" #endif @@ -108,8 +103,8 @@ #if HAVE_CTYPE ,phpext_ctype_ptr #endif -#if HAVE_COM - ,phpext_com_ptr +#if HAVE_RPC + ,phpext_rpc_ptr #endif #if HAVE_FTP ,phpext_ftp_ptr @@ -122,11 +117,6 @@ #endif #if HAVE_UODBC ,phpext_odbc_ptr -#endif -#ifndef ZEND_ENGINE_2 -#if HAVE_OVERLOAD - ,phpext_overload_ptr -#endif #endif #if HAVE_PCRE || HAVE_BUNDLED_PCRE ,phpext_pcre_ptr
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php