# HG changeset patch # User Daniel Atallah # Date 1208276212 0 # Node ID 5e6ab03225cc201709e59e4f3ed348a52b0ac7d6 # Parent 3378d2701c2be5b379d9e9992d7427b0a94950e5 Patch from vladb to remove a C++ protected word ("namespace") from win32 libpurple code. Fixes #5471 diff -r 3378d2701c2b -r 5e6ab03225cc libpurple/win32/libc_interface.h --- 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 ) diff -r 3378d2701c2b -r 5e6ab03225cc libpurple/win32/libc_internal.h --- 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);