Patch from vladb to remove a C++ protected word ("namespace") from win32 libpurple code. Fixes #5471

Tue, 15 Apr 2008 16:16:52 +0000

author
Daniel Atallah <datallah@pidgin.im>
date
Tue, 15 Apr 2008 16:16:52 +0000
changeset 22812
cf92ffc5949c
parent 22811
2e0dca7ea23e
child 22813
def7382231ff

Patch from vladb to remove a C++ protected word ("namespace") from win32 libpurple code. Fixes #5471

libpurple/win32/libc_interface.h file | annotate | diff | comparison | revisions
libpurple/win32/libc_internal.h file | annotate | diff | comparison | revisions
--- a/libpurple/win32/libc_interface.h	Mon Apr 14 20:35:47 2008 +0000
+++ b/libpurple/win32/libc_interface.h	Tue Apr 15 16:16:52 2008 +0000
@@ -44,8 +44,8 @@
 #endif
 
 /* sys/socket.h */
-#define socket( namespace, style, protocol ) \
-wpurple_socket( namespace, style, protocol )
+#define socket( domain, style, protocol ) \
+wpurple_socket( domain, style, protocol )
 
 #define connect( socket, addr, length ) \
 wpurple_connect( socket, addr, length )
--- a/libpurple/win32/libc_internal.h	Mon Apr 14 20:35:47 2008 +0000
+++ b/libpurple/win32/libc_internal.h	Tue Apr 15 16:16:52 2008 +0000
@@ -30,7 +30,7 @@
 #endif /* __cplusplus */
 
 /* sys/socket.h */
-int wpurple_socket(int namespace, int style, int protocol);
+int wpurple_socket(int domain, int style, int protocol);
 int wpurple_connect(int socket, struct sockaddr *addr, u_long length);
 int wpurple_getsockopt(int socket, int level, int optname, void *optval, socklen_t *optlenptr);
 int wpurple_setsockopt(int socket, int level, int optname, const void *optval, socklen_t optlen);

mercurial