summaryrefslogtreecommitdiff
path: root/ext/sockets/php_sockets.h
diff options
context:
space:
mode:
authorSterling Hughes <sterling@php.net>2003-06-17 04:44:30 +0000
committerSterling Hughes <sterling@php.net>2003-06-17 04:44:30 +0000
commit3de4afa4546843910ff71c16bea911c5108f5e9e (patch)
tree96968c0e8df7873fa05383f61ef02cb104aba879 /ext/sockets/php_sockets.h
parent821b0fa1344cbb9750f8a564b82e3b8f4ca365b4 (diff)
downloadphp-git-3de4afa4546843910ff71c16bea911c5108f5e9e.tar.gz
rename SOCKET to PHP_SOCKET to avoid conflicts with Mono
Diffstat (limited to 'ext/sockets/php_sockets.h')
-rw-r--r--ext/sockets/php_sockets.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
index 512b8e358d..e7b7365ffa 100644
--- 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;