From 9cc52b362c2dea72f22f43e476289cde6ac1609b Mon Sep 17 00:00:00 2001
From: Bang Jun-Young <junyoung@mogua.com>
Date: Fri, 14 Dec 2001 22:45:42 +0000
Subject: [PATCH] Fix NetBSD compilation errors.

---
 dlls/wsock32/socket.c    | 4 ----
 dlls/wsock32/wscontrol.h | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c
index da4fdac6639..3a54d9f4f91 100644
--- a/dlls/wsock32/socket.c
+++ b/dlls/wsock32/socket.c
@@ -55,10 +55,6 @@
 #include "winnt.h"
 #include "wscontrol.h"
 
-#ifdef __NetBSD__
-#undef if_type
-#endif
-
 /* FIXME: The rest of the socket() cdecl<->stdapi stack corruption problem
  * discussed above.
  */
diff --git a/dlls/wsock32/wscontrol.h b/dlls/wsock32/wscontrol.h
index eaeb8a6e983..b44bb36698d 100644
--- a/dlls/wsock32/wscontrol.h
+++ b/dlls/wsock32/wscontrol.h
@@ -103,6 +103,11 @@ typedef struct IPAddrEntry
    ushort         iae_pad;
 } IPAddrEntry;
 
+#ifdef __NetBSD__
+#undef if_type
+#undef if_mtu
+#undef if_lastchange
+#endif
 
 #define	MAX_PHYSADDR_SIZE    8
 #define	MAX_IFDESCR_LEN      256