]> granicus.if.org Git - php/commitdiff
Fix ext/sockets build with phpize
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Sat, 23 Feb 2013 23:47:44 +0000 (00:47 +0100)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Sat, 23 Feb 2013 23:49:25 +0000 (00:49 +0100)
Fixes bug #64285

ext/sockets/multicast.c
ext/sockets/php_sockets.h
ext/sockets/sockets.c

index 94f845d662ca87cd64347a3da7e24c82513c090e..7466c6266e7f1fea6fade0324290e8838c8e025e 100644 (file)
@@ -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 @@ err:
        return FAILURE;
 }
 #endif
-
-#endif /* HAVE_SOCKETS */
index dd2b9933f6e8b9b6fe6531dd842921d4d11f7025..17abf95a19c8cb3b47e60d88b42577f8d2ae63c2 100644 (file)
 
 /* $Id$ */
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #if HAVE_SOCKETS
 
 #include <php.h>
index 7f5d49e76c3f6c66d18d795996bfc6b720751401..5ecc0145969440af6389035ebf90a424dff3a915 100644 (file)
@@ -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