pidgin: 68de6e97: Patch from vladb to remove a C++ protect...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 68de6e97028824965d3e90f18544a45acc3c5891
Ancestor: adef47c71d9ea87e0876e37870d390b39ea7ea04
Author: datallah at pidgin.im
Date: 2008-04-15T16:16:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/68de6e97028824965d3e90f18544a45acc3c5891

Modified files:
        libpurple/win32/libc_interface.h
        libpurple/win32/libc_internal.h

ChangeLog: 

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

-------------- next part --------------
============================================================
--- libpurple/win32/libc_interface.h	2b2f99e1a619627967e2df96b6c5fb4c8a1d6292
+++ libpurple/win32/libc_interface.h	546d867d62a19e59d0a87231548417b512f0932f
@@ -44,8 +44,8 @@ extern "C" {
 #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 )
============================================================
--- libpurple/win32/libc_internal.h	2f56f759231007aa1ca8a3088b8b4b7aef0ac65d
+++ libpurple/win32/libc_internal.h	eba9e2a70bc31128806afde74b592fd2a3c03afd
@@ -30,7 +30,7 @@ extern "C" {
 #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);