Make sure that u_long remains derived by long.


git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@5285 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/crt/_bsd_types.h b/mingw-w64-headers/crt/_bsd_types.h
index 6939b42..e341542 100644
--- a/mingw-w64-headers/crt/_bsd_types.h
+++ b/mingw-w64-headers/crt/_bsd_types.h
@@ -13,7 +13,11 @@
 typedef unsigned char	u_char;
 typedef unsigned short	u_short;
 typedef unsigned int	u_int;
-typedef unsigned __LONG32 u_long;
+#pragma push_macro("u_long")
+#undef u_long
+typedef unsigned long u_long;
+#pragma pop_macor("u_long")
+
 #if defined(__GNUC__) || \
     defined(__GNUG__)
 __extension__
@@ -22,3 +26,7 @@
 
 #endif /* _BSDTYPES_DEFINED */
 
+#if defined (__LP64__) && defined (u_long)
+typedef unsigned __LONG32 u_long;
+#endif
+