rename SOCKET to PHP_SOCKET to avoid conflicts with Mono

diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
index 512b8e358d2fb79e4e5664b6b57785e51699a019..e7b7365ffa1ddbf695dd45d0c08cd448bbeccf2f 100644 (file)
--- a/ext/sockets/php_sockets.h
+++ b/ext/sockets/php_sockets.h
@@ -88,11 +88,13 @@ typedef struct php_iovec {
 } php_iovec_t;
 
 #ifndef PHP_WIN32
-typedef int SOCKET;
+typedef int PHP_SOCKET;
+#else
+typedef SOCKET PHP_SOCKET;
 #endif
 
 typedef struct {
-       SOCKET  bsd_socket;
+       PHP_SOCKET bsd_socket;
        int             type;
        int             error;
 } php_socket;

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 87a920b9cc2a13764e604edafe05a83d2e01653c..242956baa050d1d4207ad4589bc577b7f74888af 100644 (file)
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -527,7 +527,7 @@ PHP_RSHUTDOWN_FUNCTION(sockets)
 }
 /* }}} */
 
-static int php_sock_array_to_fd_set(zval *sock_array, fd_set *fds, SOCKET *max_fd TSRMLS_DC)
+static int php_sock_array_to_fd_set(zval *sock_array, fd_set *fds, PHP_SOCKET *max_fd TSRMLS_DC)
 {
        zval            **element;
        php_socket      *php_sock;
@@ -593,7 +593,7 @@ PHP_FUNCTION(socket_select)
        struct timeval  tv;
        struct timeval *tv_p = NULL;
        fd_set                  rfds, wfds, efds;
-       SOCKET                  max_fd = 0;
+       PHP_SOCKET                      max_fd = 0;
        int                     retval, sets = 0;
        long                    usec = 0;
 
@@ -2179,7 +2179,7 @@ PHP_FUNCTION(socket_create_pair)
 {
        zval            *retval[2], *fds_array_zval;
        php_socket      *php_sock[2];
-       SOCKET          fds_array[2];
+       PHP_SOCKET              fds_array[2];
        long                    domain, type, protocol;
        
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lllz", &domain, &type, &protocol, &fds_array_zval) == FAILURE)