--- php/src/IcePHP/Communicator.cpp.orig	2013-06-02 11:48:21.990197196 +0000
+++ php/src/IcePHP/Communicator.cpp	2013-06-02 11:48:29.692195174 +0000
@@ -1341,7 +1341,7 @@
     //
     zend_class_entry ce;
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Communicator"), _interfaceMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "Communicator", _interfaceMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_Communicator", _interfaceMethods);
 #endif
--- php/src/IcePHP/Connection.cpp.orig	2013-06-02 11:48:58.022196354 +0000
+++ php/src/IcePHP/Connection.cpp	2013-06-02 11:50:59.494195380 +0000
@@ -360,7 +360,7 @@
     //
     zend_class_entry ce;
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Connection"), _interfaceMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "Connection", _interfaceMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_Connection", _interfaceMethods);
 #endif
@@ -380,7 +380,7 @@
     // Register the ConnectionInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("ConnectionInfo"), _connectionInfoClassMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "ConnectionInfo", _connectionInfoClassMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_ConnectionInfo", _connectionInfoClassMethods);
 #endif
@@ -396,7 +396,7 @@
     // Register the IPConnectionInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("IPConnectionInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "IPConnectionInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_IPConnectionInfo", NULL);
 #endif
@@ -415,7 +415,7 @@
     // Register the TCPConnectionInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("TCPConnectionInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPConnectionInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_TCPConnectionInfo", NULL);
 #endif
@@ -426,7 +426,7 @@
     // Register the UDPConnectionInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("UDPConnectionInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPConnectionInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_UDPConnectionInfo", NULL);
 #endif
--- php/src/IcePHP/Endpoint.cpp.orig	2013-06-02 11:51:19.569193334 +0000
+++ php/src/IcePHP/Endpoint.cpp	2013-06-02 11:52:06.348197336 +0000
@@ -274,7 +274,7 @@
     //
     zend_class_entry ce;
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Endpoint"), _interfaceMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "Endpoint", _interfaceMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_Endpoint", _interfaceMethods);
 #endif
@@ -293,7 +293,7 @@
     // Register the EndpointInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("EndpointInfo"), _endpointInfoMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "EndpointInfo", _endpointInfoMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_EndpointInfo", _endpointInfoMethods);
 #endif
@@ -309,7 +309,7 @@
     // Register the IPEndpointInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("IPEndpointInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "IPEndpointInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_IPEndpointInfo", NULL);
 #endif
@@ -324,7 +324,7 @@
     // Register the TCPEndpointInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("TCPEndpointInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "TCPEndpointInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_TCPEndpointInfo", NULL);
 #endif
@@ -335,7 +335,7 @@
     // Register the UDPEndpointInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("UDPEndpointInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "UDPEndpointInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_UDPEndpointInfo", NULL);
 #endif
@@ -350,7 +350,7 @@
     // Register the OpaqueEndpointInfo class.
     //
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("OpaqueEndpointInfo"), NULL);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "OpaqueEndpointInfo", NULL);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_OpaqueEndpointInfo", NULL);
 #endif
--- php/src/IcePHP/Init.cpp.orig	2013-03-11 15:19:47.000000000 +0000
+++ php/src/IcePHP/Init.cpp	2013-06-02 11:44:16.052196522 +0000
@@ -22,10 +22,10 @@
 
 ZEND_DECLARE_MODULE_GLOBALS(ice)
 
-ZEND_BEGIN_ARG_INFO(Ice_initialize_arginfo, 1)
+ZEND_BEGIN_ARG_INFO_EX(Ice_initialize_arginfo, 1, ZEND_RETURN_VALUE, static_cast<zend_uint>(-1))
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(Ice_createProperties_arginfo, 1)
+ZEND_BEGIN_ARG_INFO_EX(Ice_createProperties_arginfo, 1, ZEND_RETURN_VALUE, static_cast<zend_uint>(-1))
 ZEND_END_ARG_INFO()
 
 #define ICEPHP_COMMUNICATOR_FUNCTIONS \
--- php/src/IcePHP/Logger.cpp.orig	2013-06-02 11:52:25.727195546 +0000
+++ php/src/IcePHP/Logger.cpp	2013-06-02 11:52:39.876195038 +0000
@@ -269,7 +269,7 @@
     //
     zend_class_entry ce;
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Logger"), _interfaceMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "Logger", _interfaceMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_Logger", _interfaceMethods);
 #endif
--- php/src/IcePHP/Properties.cpp.orig	2013-06-02 11:52:55.531198249 +0000
+++ php/src/IcePHP/Properties.cpp	2013-06-02 11:53:07.786227648 +0000
@@ -641,7 +641,7 @@
     //
     zend_class_entry ce;
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("Properties"), _interfaceMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "Properties", _interfaceMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_Properties", _interfaceMethods);
 #endif
--- php/src/IcePHP/Proxy.cpp.orig	2013-06-02 11:54:02.594196824 +0000
+++ php/src/IcePHP/Proxy.cpp	2013-06-02 11:53:46.793198453 +0000
@@ -1702,7 +1702,7 @@
     //
     zend_class_entry ce;
 #ifdef ICEPHP_USE_NAMESPACES
-    INIT_NS_CLASS_ENTRY(ce, STRCAST("Ice"), STRCAST("ObjectPrx"), _proxyMethods);
+    INIT_NS_CLASS_ENTRY(ce, "Ice", "ObjectPrx", _proxyMethods);
 #else
     INIT_CLASS_ENTRY(ce, "Ice_ObjectPrx", _proxyMethods);
 #endif