winsock.h compilation under MSVC

Rolf Kalbermatter rolf.kalbermatter at
Wed Apr 23 17:03:45 CDT 2003

This seems to be necessary in winsock.h to be able to compile some of the
regression tests under Visual C, when using the Wine headers instead
of the MS ones, with the msvcmaker built project files.

I know this doesn't get nicer!

  * include/winsock.h
    Allow MSVC to compile some tests with the wine headers.

Rolf Kalbermatter

Index: include/winsock.h
RCS file: /home/wine/wine/include/winsock.h,v
retrieving revision 1.57
diff -u -r1.57 winsock.h
--- include/winsock.h	17 Apr 2003 02:47:17 -0000	1.57
+++ include/winsock.h	23 Apr 2003 22:00:28 -0000
@@ -95,7 +95,7 @@
 #ifndef _WINSOCKAPI_
 #define _WINSOCKAPI_
-#if defined(__MINGW_H) && !defined(MSVCRT_BSD_TYPES_DEFINED)
+#if (defined(__MINGW_H) || defined(_MSC_VER)) && !defined(MSVCRT_BSD_TYPES_DEFINED)
 /* MinGW doesn't define the u_xxx types */
 typedef unsigned char u_char;
 typedef unsigned short u_short;

More information about the wine-patches mailing list