[glib] gnetworking.h.in: move "#undef interface"



commit 7103484017ff000d01ed94567539d37fa09b32b2
Author: Dan Winship <danw gnome org>
Date:   Sun Nov 2 09:36:14 2014 -0500

    gnetworking.h.in: move "#undef interface"
    
    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

 gio/gnetworking.h.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gio/gnetworking.h.in b/gio/gnetworking.h.in
index 0b7a4dd..0bb21c3 100644
--- a/gio/gnetworking.h.in
+++ b/gio/gnetworking.h.in
@@ -27,12 +27,12 @@
 #define _WIN32_WINNT 0x0501
 #endif
 #include <winsock2.h>
-#undef interface
 #include <ws2tcpip.h>
 #include <windns.h>
 #include <mswsock.h>
 @WSPIAPI_INCLUDE@
 #include <iphlpapi.h>
+#undef interface
 
 #else /* !G_OS_WIN32 */
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]