com php-src: Move some declarations to sockets.c: ext/sockets/p hp_sockets.h ext/sockets/sockets.c
| From: | Gustavo André dos Santos Lopes | Date: | Sat, 02 Feb 2013 13:06:23 +0000 |
| Subject: | com php-src: Move some declarations to sockets.c: ext/sockets/p hp_sockets.h ext/sockets/sockets.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71111@lists.php.net to get a copy of this message | ||
Commit: 97d656fc82104d9879b59dba9b80773346ec1f61
Author: Gustavo Lopes <glopes@nebm.ist.utl.pt> Fri, 1 Feb 2013 14:35:14 +0100
Parents: a100c25ea4b5864adc5203b6b979e8912062540a
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=97d656fc82104d9879b59dba9b80773346ec1f61
Log:
Move some declarations to sockets.c
Changed paths:
M ext/sockets/php_sockets.h
M ext/sockets/sockets.c
Diff:
diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
index df205e5..2b6700d 100644
--- a/ext/sockets/php_sockets.h
+++ b/ext/sockets/php_sockets.h
@@ -37,41 +37,6 @@ extern zend_module_entry sockets_module_entry;
#endif
#endif
-PHP_MINIT_FUNCTION(sockets);
-PHP_MINFO_FUNCTION(sockets);
-PHP_RSHUTDOWN_FUNCTION(sockets);
-
-PHP_FUNCTION(socket_select);
-PHP_FUNCTION(socket_create_listen);
-#ifdef HAVE_SOCKETPAIR
-PHP_FUNCTION(socket_create_pair);
-#endif
-PHP_FUNCTION(socket_accept);
-PHP_FUNCTION(socket_set_nonblock);
-PHP_FUNCTION(socket_set_block);
-PHP_FUNCTION(socket_listen);
-PHP_FUNCTION(socket_close);
-PHP_FUNCTION(socket_write);
-PHP_FUNCTION(socket_read);
-PHP_FUNCTION(socket_getsockname);
-PHP_FUNCTION(socket_getpeername);
-PHP_FUNCTION(socket_create);
-PHP_FUNCTION(socket_connect);
-PHP_FUNCTION(socket_strerror);
-PHP_FUNCTION(socket_bind);
-PHP_FUNCTION(socket_recv);
-PHP_FUNCTION(socket_send);
-PHP_FUNCTION(socket_recvfrom);
-PHP_FUNCTION(socket_sendto);
-PHP_FUNCTION(socket_get_option);
-PHP_FUNCTION(socket_set_option);
-#ifdef HAVE_SHUTDOWN
-PHP_FUNCTION(socket_shutdown);
-#endif
-PHP_FUNCTION(socket_last_error);
-PHP_FUNCTION(socket_clear_error);
-PHP_FUNCTION(socket_import_stream);
-
#ifndef PHP_WIN32
typedef int PHP_SOCKET;
# define PHP_SOCKETS_API PHPAPI
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 43bae9f..1cb36cd 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -279,6 +279,41 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_import_stream, 0, 0, 1)
ZEND_END_ARG_INFO()
/* }}} */
+PHP_MINIT_FUNCTION(sockets);
+PHP_MINFO_FUNCTION(sockets);
+PHP_RSHUTDOWN_FUNCTION(sockets);
+
+PHP_FUNCTION(socket_select);
+PHP_FUNCTION(socket_create_listen);
+#ifdef HAVE_SOCKETPAIR
+PHP_FUNCTION(socket_create_pair);
+#endif
+PHP_FUNCTION(socket_accept);
+PHP_FUNCTION(socket_set_nonblock);
+PHP_FUNCTION(socket_set_block);
+PHP_FUNCTION(socket_listen);
+PHP_FUNCTION(socket_close);
+PHP_FUNCTION(socket_write);
+PHP_FUNCTION(socket_read);
+PHP_FUNCTION(socket_getsockname);
+PHP_FUNCTION(socket_getpeername);
+PHP_FUNCTION(socket_create);
+PHP_FUNCTION(socket_connect);
+PHP_FUNCTION(socket_strerror);
+PHP_FUNCTION(socket_bind);
+PHP_FUNCTION(socket_recv);
+PHP_FUNCTION(socket_send);
+PHP_FUNCTION(socket_recvfrom);
+PHP_FUNCTION(socket_sendto);
+PHP_FUNCTION(socket_get_option);
+PHP_FUNCTION(socket_set_option);
+#ifdef HAVE_SHUTDOWN
+PHP_FUNCTION(socket_shutdown);
+#endif
+PHP_FUNCTION(socket_last_error);
+PHP_FUNCTION(socket_clear_error);
+PHP_FUNCTION(socket_import_stream);
+
/* {{{ sockets_functions[]
*/
const zend_function_entry sockets_functions[] = {