winsock.h problem

[Dimitrie O. Paun]

Guys,

I've got the following problem:

#include <winsock.h>
#include <windows.h>

fails miserably in Wine (but apparently works in Windows), whereas:

#include <windows.h>
#include <winsock.h>

works, no problem. The errors I get are:

In file included from /home/dimi/dev/wine/wine.src/include/windows.h:62,
                 from /home/dimi/dev/wine/wine.src/include/winsock.h:33,
                 from winnet.c:46:
/home/dimi/dev/wine/wine.src/include/winsock2.h:401: warning: type defaults to `int' in declaration of `SOCKET'
/home/dimi/dev/wine/wine.src/include/winsock2.h:401: warning: `__stdcall__' attribute only applies to function types
/home/dimi/dev/wine/wine.src/include/winsock2.h:401: parse error before "WSAAccept"
/home/dimi/dev/wine/wine.src/include/winsock2.h:402: parse error before "DWORD"
/home/dimi/dev/wine/wine.src/include/winsock2.h:403: parse error before "DWORD"
/home/dimi/dev/wine/wine.src/include/winsock2.h:406: parse error before "const"
/home/dimi/dev/wine/wine.src/include/winsock2.h:412: parse error before "HANDLE"
/home/dimi/dev/wine/wine.src/include/winsock2.h:416: parse error before "HANDLE"
/home/dimi/dev/wine/wine.src/include/winsock2.h:417: parse error before "LPWSAOVERLAPPED"
/home/dimi/dev/wine/wine.src/include/winsock2.h:423: parse error before '*' token
/home/dimi/dev/wine/wine.src/include/winsock2.h:424: parse error before '*' token
/home/dimi/dev/wine/wine.src/include/winsock2.h:428: parse error before "DWORD"
/home/dimi/dev/wine/wine.src/include/winsock2.h:435: parse error before '*' token
/home/dimi/dev/wine/wine.src/include/winsock2.h:436: parse error before '*' token
/home/dimi/dev/wine/wine.src/include/winsock2.h:438: parse error before "LPWSABUF"
/home/dimi/dev/wine/wine.src/include/winsock2.h:439: parse error before "LPWSABUF"
/home/dimi/dev/wine/wine.src/include/winsock2.h:440: parse error before "LPWSABUF"
/home/dimi/dev/wine/wine.src/include/winsock2.h:443: parse error before "LPWSABUF"
/home/dimi/dev/wine/wine.src/include/winsock2.h:444: parse error before "LPWSABUF"
/home/dimi/dev/wine/wine.src/include/winsock2.h:445: parse error before "LPWSABUF"
/home/dimi/dev/wine/wine.src/include/winsock2.h:449: warning: type defaults to `int' in declaration of `SOCKET'
/home/dimi/dev/wine/wine.src/include/winsock2.h:449: warning: `__stdcall__' attribute only applies to function types
/home/dimi/dev/wine/wine.src/include/winsock2.h:449: parse error before "WSASocketA"
/home/dimi/dev/wine/wine.src/include/winsock2.h:450: warning: type defaults to `int' in declaration of `SOCKET'
/home/dimi/dev/wine/wine.src/include/winsock2.h:450: warning: `__stdcall__' attribute only applies to function types
/home/dimi/dev/wine/wine.src/include/winsock2.h:450: parse error before "WSASocketW"
/home/dimi/dev/wine/wine.src/include/winsock2.h:451: parse error before "LPSOCKADDR"
/home/dimi/dev/wine/wine.src/include/winsock2.h:452: parse error before "LPSOCKADDR"
In file included from winnet.c:46:
/home/dimi/dev/wine/wine.src/include/winsock.h:327: `SOCKET' redeclared as different kind of symbol
/home/dimi/dev/wine/wine.src/include/winsock2.h:450: previous declaration of `SOCKET'

Patch: winsock.h problem

[Martin Wilck]

Am Don, 2002-11-21 um 06.05 schrieb Dimitrie O. Paun:
> #include <winsock.h>
> #include <windows.h>
>
> fails miserably in Wine (but apparently works in Windows)
> In file included from /home/dimi/dev/wine/wine.src/include/windows.h:62,
>                  from /home/dimi/dev/wine/wine.src/include/winsock.h:33,
>                  from winnet.c:46:
> /home/dimi/dev/wine/wine.src/include/winsock2.h:401: warning: type defaults to `int' in declaration of `SOCKET'

This is because of the "circular" include sequence
winsock.h -> windows.h -> winsock2.h -> winsock.h
where the last include doesn't "work" because _WINSOCKAPI_ is already
set.

The following patch fixes it.

Martin

Index: include/winsock.h
===================================================================
RCS file: /home/wine/wine/include/winsock.h,v
retrieving revision 1.47
diff -u -r1.47 winsock.h
--- include/winsock.h	30 Oct 2002 20:26:32 -0000	1.47
+++ include/winsock.h	21 Nov 2002 09:38:15 -0000
@@ -26,14 +26,14 @@
 # endif
 #endif

-#ifndef _WINSOCKAPI_
-#define _WINSOCKAPI_
-
 #ifndef __WINE__
 # include "windows.h"
 #else
 # include "windef.h"
 #endif
+
+#ifndef _WINSOCKAPI_
+#define _WINSOCKAPI_

/*
  * Setup phase

Patch: winsock.h problem

[Dimitrie O. Paun]

On November 21, 2002 04:47 am, Martin Wilck wrote:
> This is because of the "circular" include sequence
> winsock.h -> windows.h -> winsock2.h -> winsock.h
> where the last include doesn't "work" because _WINSOCKAPI_ is already
> set.
>
> The following patch fixes it.

Thank you, this works beautifully.