Merge branch 'PHP-5.5'

cataphract · cataphract · commit 0112b2bc7f9a · 2013-02-24T00:49:41.000+01:00
* PHP-5.5:
  Fix ext/sockets build with phpize
  Fix ext/intl build with phpize
diff --git a/ext/intl/converter/converter.c b/ext/intl/converter/converter.c
@@ -21,7 +21,7 @@
 #include <unicode/ucnv.h>
 #include <unicode/ustring.h>
 
-#include "ext/intl/intl_error.h"
+#include "../intl_error.h"
 
 typedef struct _php_converter_object {
 	zend_object obj;
diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c
@@ -24,8 +24,6 @@
 
 #include "php.h"
 
-#if HAVE_SOCKETS
-
 #include "php_network.h"
 #ifdef PHP_WIN32
 # include "windows_common.h"
@@ -836,5 +834,3 @@ int php_add4_to_if_index(struct in_addr *addr, php_socket *php_sock, unsigned *i
 	return FAILURE;
 }
 #endif
-
-#endif /* HAVE_SOCKETS */
diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
@@ -24,6 +24,10 @@
 
 /* $Id$ */
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #if HAVE_SOCKETS
 
 #include <php.h>
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
@@ -28,8 +28,6 @@
 
 #include "php.h"
 
-#if HAVE_SOCKETS
-
 #include "php_network.h"
 #include "ext/standard/file.h"
 #include "ext/standard/info.h"
@@ -2278,8 +2276,6 @@ PHP_FUNCTION(socket_import_stream)
 }
 /* }}} */
 
-#endif
-
 /*
  * Local variables:
  * tab-width: 4
