ICE-5235 IcePHP does not compile on Windows

8 files changed, 46 insertions, 16 deletions

diff --git a/php/src/IcePHP/Communicator.cpp b/php/src/IcePHP/Communicator.cpp
index 0b4abcb36b0..1ab321c6126 100644
--- a/php/src/IcePHP/Communicator.cpp
+++ b/php/src/IcePHP/Communicator.cpp
@@ -917,7 +917,7 @@ ZEND_FUNCTION(Ice_initialize)
         }
     }
 
-    initData.compactIdResolver = new IdResolver;
+    initData.compactIdResolver = new IdResolver(TSRMLS_C);
 
     CommunicatorInfoIPtr info = initializeCommunicator(return_value, seq, hasArgs, initData TSRMLS_CC);
     if(!info)
diff --git a/php/src/IcePHP/Connection.cpp b/php/src/IcePHP/Connection.cpp
index 544f682f4c6..9ad24ec1b25 100644
--- a/php/src/IcePHP/Connection.cpp
+++ b/php/src/IcePHP/Connection.cpp
@@ -272,7 +272,9 @@ handleConnectionCompare(zval* zobj1, zval* zobj2 TSRMLS_DC)
 //
 // Necessary to suppress warnings from zend_function_entry in php-5.2.
 //
-#pragma GCC diagnostic ignored "-Wwrite-strings"
+#if defined(__GNUC__)
+#  pragma GCC diagnostic ignored "-Wwrite-strings"
+#endif
 
 //
 // Predefined methods for Connection.
@@ -311,7 +313,9 @@ static zend_function_entry _connectionInfoClassMethods[] =
 //
 // enable warning again
 //
-#pragma GCC diagnostic error "-Wwrite-strings"
+#if defined(__GNUC__)
+#  pragma GCC diagnostic error "-Wwrite-strings"
+#endif
 
 #ifdef _WIN32
 extern "C"
diff --git a/php/src/IcePHP/Endpoint.cpp b/php/src/IcePHP/Endpoint.cpp
index 86cf00bf59d..d718610c94d 100644
--- a/php/src/IcePHP/Endpoint.cpp
+++ b/php/src/IcePHP/Endpoint.cpp
@@ -226,7 +226,9 @@ static zend_function_entry _interfaceMethods[] =
 //
 // Necessary to suppress warnings from zend_function_entry in php-5.2.
 //
-#pragma GCC diagnostic ignored "-Wwrite-strings"
+#if defined(__GNUC__)
+#  pragma GCC diagnostic ignored "-Wwrite-strings"
+#endif
 
 //
 // Predefined methods for Endpoint.
@@ -255,7 +257,9 @@ static zend_function_entry _endpointInfoMethods[] =
 //
 // enable warning again
 //
-#pragma GCC diagnostic error "-Wwrite-strings"
+#if defined(__GNUC__)
+#  pragma GCC diagnostic error "-Wwrite-strings"
+#endif
 
 bool
 IcePHP::endpointInit(TSRMLS_D)
diff --git a/php/src/IcePHP/Init.cpp b/php/src/IcePHP/Init.cpp
index 833497a71b8..71f8eb8be42 100644
--- a/php/src/IcePHP/Init.cpp
+++ b/php/src/IcePHP/Init.cpp
@@ -103,7 +103,9 @@ ZEND_END_ARG_INFO()
 //
 // Necessary to suppress warnings from zend_function_entry in php-5.2.
 //
-#pragma GCC diagnostic ignored "-Wwrite-strings"
+#if defined(__GNUC__)
+#  pragma GCC diagnostic ignored "-Wwrite-strings"
+#endif
 
 //
 // Entries for all global functions.
@@ -123,7 +125,9 @@ zend_function_entry ice_functions[] =
 //
 // enable warning again
 //
-#pragma GCC diagnostic error "-Wwrite-strings"
+#if defined(__GNUC__)
+#  pragma GCC diagnostic error "-Wwrite-strings"
+#endif
 
 //
 // The ice_module_entry declaration below generates lots of warnings:
@@ -132,7 +136,9 @@ zend_function_entry ice_functions[] =
 //
 // We disable them with a pragma.
 //
-#pragma GCC diagnostic ignored "-Wwrite-strings"
+#if defined(__GNUC__)
+#  pragma GCC diagnostic ignored "-Wwrite-strings"
+#endif
 
 zend_module_entry ice_module_entry =
 {
diff --git a/php/src/IcePHP/Logger.cpp b/php/src/IcePHP/Logger.cpp
index 9b8d632e9bb..c3dad2b1a41 100644
--- a/php/src/IcePHP/Logger.cpp
+++ b/php/src/IcePHP/Logger.cpp
@@ -227,7 +227,9 @@ handleClone(zval* zv TSRMLS_DC)
 //
 // Necessary to suppress warnings from zend_function_entry in php-5.2.
 //
-#pragma GCC diagnostic ignored "-Wwrite-strings"
+#if defined(__GNUC__)
+#  pragma GCC diagnostic ignored "-Wwrite-strings"
+#endif
 
 //
 // Predefined methods for Logger.
@@ -250,7 +252,9 @@ static zend_function_entry _classMethods[] =
 //
 // enable warning again
 //
-#pragma GCC diagnostic error "-Wwrite-strings"
+#if defined(__GNUC__)
+#  pragma GCC diagnostic error "-Wwrite-strings"
+#endif
 
 bool
 IcePHP::loggerInit(TSRMLS_D)
diff --git a/php/src/IcePHP/Properties.cpp b/php/src/IcePHP/Properties.cpp
index b3eeb358b97..639f59ca47d 100644
--- a/php/src/IcePHP/Properties.cpp
+++ b/php/src/IcePHP/Properties.cpp
@@ -590,7 +590,9 @@ ZEND_FUNCTION(Ice_createProperties)
 //
 // Necessary to suppress warnings from zend_function_entry in php-5.2.
 //
-#pragma GCC diagnostic ignored "-Wwrite-strings"
+#if defined(__GNUC__)
+#  pragma GCC diagnostic ignored "-Wwrite-strings"
+#endif
 
 //
 // Predefined methods for Properties.
@@ -622,7 +624,9 @@ static zend_function_entry _classMethods[] =
 //
 // enable warning again
 //
-#pragma GCC diagnostic error "-Wwrite-strings"
+#if defined(__GNUC__)
+#  pragma GCC diagnostic error "-Wwrite-strings"
+#endif
 
 bool
 IcePHP::propertiesInit(TSRMLS_D)
diff --git a/php/src/IcePHP/Proxy.cpp b/php/src/IcePHP/Proxy.cpp
index 8bb67b438de..69595ccd22d 100644
--- a/php/src/IcePHP/Proxy.cpp
+++ b/php/src/IcePHP/Proxy.cpp
@@ -1626,7 +1626,9 @@ handleCompare(zval* zobj1, zval* zobj2 TSRMLS_DC)
 //
 // Necessary to suppress warnings from zend_function_entry in php-5.2.
 //
-#pragma GCC diagnostic ignored "-Wwrite-strings"
+#if defined(__GNUC__)
+#  pragma GCC diagnostic ignored "-Wwrite-strings"
+#endif
 
 //
 // Predefined methods for ObjectPrx.
@@ -1688,7 +1690,9 @@ static zend_function_entry _proxyMethods[] =
 //
 // enable warning again
 //
-#pragma GCC diagnostic error "-Wwrite-strings"
+#if defined(__GNUC__)
+#  pragma GCC diagnostic error "-Wwrite-strings"
+#endif
 
 bool
 IcePHP::proxyInit(TSRMLS_D)
diff --git a/php/src/IcePHP/Types.cpp b/php/src/IcePHP/Types.cpp
index e87eb0438d3..1e6f87a7b12 100644
--- a/php/src/IcePHP/Types.cpp
+++ b/php/src/IcePHP/Types.cpp
@@ -3831,7 +3831,9 @@ ZEND_FUNCTION(IcePHP_stringifyException)
 //
 // Necessary to suppress warnings from zend_function_entry in php-5.2.
 //
-#pragma GCC diagnostic ignored "-Wwrite-strings"
+#if defined(__GNUC__)
+#  pragma GCC diagnostic ignored "-Wwrite-strings"
+#endif
 
 //
 // Predefined methods for IcePHP_TypeInfo.
@@ -3898,7 +3900,9 @@ IcePHP::typesInit(INIT_FUNC_ARGS)
 //
 // enable warning again
 //
-#pragma GCC diagnostic error "-Wwrite-strings"
+#if defined(__GNUC__)
+#  pragma GCC diagnostic error "-Wwrite-strings"
+#endif
 
 bool
 IcePHP::typesRequestInit(TSRMLS_D)