luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

gnetworking.h.in: move "#undef interface"

Browse Source 
The win32 headers do:

  #define interface struct

which is just evil and breaks other code that assumes it can use
"interface" as a variable name. gnetworking.h was supposed to be doing
"#undef interface" after including the win headers, but it did it too
soon, resulting in it getting redefined by a later include. Fix this.

https://bugzilla.gnome.org/show_bug.cgi?id=738551
This commit is contained in:
Dan Winship 2014-11-02 09:36:14 -05:00
parent 982d0e11d7
commit 7103484017
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gnetworking.h.in
View File

@ -27,12 +27,12 @@
#define _WIN32_WINNT 0x0501 #define _WIN32_WINNT 0x0501
#endif #endif
#include <winsock2.h> #include <winsock2.h>
#undef interface
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <windns.h> #include <windns.h>
#include <mswsock.h> #include <mswsock.h>
@WSPIAPI_INCLUDE@ @WSPIAPI_INCLUDE@
#include <iphlpapi.h> #include <iphlpapi.h>
#undef interface
#else /* !G_OS_WIN32 */ #else /* !G_OS_WIN32 */