Remove ext/rpc references from Windows build.

diff --git a/main/config.w32.h b/main/config.w32.h
index 7be2dbd6343bcbb3ba673fd85247eeb4cf5b4390..2f5677f4f2c470a699b5229039532fa0b7b21539 100644 (file)
--- a/main/config.w32.h
+++ b/main/config.w32.h
@@ -32,12 +32,6 @@
 /* Enable / Disable CALENDAR extension (default: enabled) */
 #define HAVE_CALENDAR 1
 
-/* Enable / Disable RPC extension (default: enabled) */
-#define HAVE_RPC 1
-
-/* Enable / Disable COM extension (default: enabled) */
-#define HAVE_COM 1
-
 /* Enable / Disable CTYPE extension (default: enabled) */
 #define HAVE_CTYPE 1
 

diff --git a/main/internal_functions_win32.c b/main/internal_functions_win32.c
index 6e56e0cd9ad42322770d60eb4685689a838fc74d..e0f96a6dfc34f4ce5bc79aacc8cf9c0803937bda 100644 (file)
--- a/main/internal_functions_win32.c
+++ b/main/internal_functions_win32.c
@@ -58,12 +58,6 @@
 #if HAVE_CTYPE
 #include "ext/ctype/php_ctype.h"
 #endif
-#if HAVE_RPC
-#include "ext/rpc/php_rpc.h"
-#if HAVE_COM
-#include "ext/rpc/com/php_com.h"
-#endif
-#endif
 #if HAVE_FTP
 #include "ext/ftp/php_ftp.h"
 #endif
@@ -110,12 +104,6 @@ zend_module_entry *php_builtin_extensions[] = {
 #if HAVE_CTYPE
        ,phpext_ctype_ptr
 #endif
-#if HAVE_RPC
-       ,phpext_rpc_ptr
-#if HAVE_COM
-       ,phpext_com_ptr
-#endif
-#endif
 #if HAVE_FTP
        ,phpext_ftp_ptr
 #endif

diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp
index 5ac2474997288c283f5b7bcd295347536b267c39..157777922f56cde82489fda042e867800c4e5122 100644 (file)
--- a/win32/php4dllts.dsp
+++ b/win32/php4dllts.dsp
@@ -1331,94 +1331,6 @@ SOURCE=..\ext\bcmath\libbcmath\src\private.h
 # End Source File\r
 # End Group\r
 # End Group\r
-# Begin Group "rpc"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Group "Source Files No. 9"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\rpc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\rpc_proxy.c\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files No. 9"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\handler.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\layer.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\php_rpc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\rpc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\rpc_proxy.h\r
-# End Source File\r
-# End Group\r
-# Begin Group "com"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Group "Source Files No. 10"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\com\com.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\com\com_wrapper.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\com\conversion.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\com\dispatch.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\com\variant.c\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files No. 10"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\com\com.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\com\com_wrapper.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\com\conversion.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\ext\rpc\com\variant.h\r
-# End Source File\r
-# End Group\r
-# End Group\r
-# End Group\r
 # Begin Group "zlib"\r
 \r
 # PROP Default_Filter ""\r