[PHP-CVS] cvs: php4 /ext/sockets php_sockets.h sockets.c

[Sterling Hughes]

sterling                Tue Jun 17 00:44:31 2003 EDT

  Modified files:              
    /php4/ext/sockets   php_sockets.h sockets.c 
  Log:
  rename SOCKET to PHP_SOCKET to avoid conflicts with Mono
  
  
Index: php4/ext/sockets/php_sockets.h
diff -u php4/ext/sockets/php_sockets.h:1.31 php4/ext/sockets/php_sockets.h:1.32
--- php4/ext/sockets/php_sockets.h:1.31 Tue Jun 10 16:03:36 2003
+++ php4/ext/sockets/php_sockets.h      Tue Jun 17 00:44:30 2003
@@ -22,7 +22,7 @@
 #ifndef PHP_SOCKETS_H
 #define PHP_SOCKETS_H
 
-/* $Id: php_sockets.h,v 1.31 2003/06/10 20:03:36 imajes Exp $ */
+/* $Id: php_sockets.h,v 1.32 2003/06/17 04:44:30 sterling Exp $ */
 
 #if HAVE_SOCKETS
 
@@ -88,11 +88,13 @@
 } 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;
Index: php4/ext/sockets/sockets.c
diff -u php4/ext/sockets/sockets.c:1.142 php4/ext/sockets/sockets.c:1.143
--- php4/ext/sockets/sockets.c:1.142    Tue Jun 10 16:03:36 2003
+++ php4/ext/sockets/sockets.c  Tue Jun 17 00:44:30 2003
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sockets.c,v 1.142 2003/06/10 20:03:36 imajes Exp $ */
+/* $Id: sockets.c,v 1.143 2003/06/17 04:44:30 sterling Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -527,7 +527,7 @@
 }
 /* }}} */
 
-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 @@
        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 @@
 {
        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)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php