wine/dlls/winsock socket.c

[Alexandre Julliard]

ChangeSet ID:	21394
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard(a)winehq.org	2005/11/22 06:00:43

Modified files:
	dlls/winsock   : socket.c 

Log message:
	Marcus Meissner <meissner(a)suse.de>
	EAI_NONAME -> WS_EAI_NODATA, check for EAI_NONAME and EAI_NODATA.

Patch: http://cvs.winehq.org/patch.py?id=21394

Old revision  New revision  Changes     Path
 1.196         1.197         +11 -0      wine/dlls/winsock/socket.c

Index: wine/dlls/winsock/socket.c
diff -u -p wine/dlls/winsock/socket.c:1.196 wine/dlls/winsock/socket.c:1.197
--- wine/dlls/winsock/socket.c:1.196	22 Nov 2005 12: 0:43 -0000
+++ wine/dlls/winsock/socket.c	22 Nov 2005 12: 0:43 -0000
@@ -332,7 +332,18 @@ static const int ws_eai_map[][2] =
     MAP_OPTION( EAI_FAIL ),
     MAP_OPTION( EAI_FAMILY ),
     MAP_OPTION( EAI_MEMORY ),
+/* Note: EAI_NODATA is deprecated, but still 
+ * used by Windows and Linux... We map the newer
+ * EAI_NONAME to EAI_NODATA for now until Windows
+ * changes too.
+ */
+#ifdef EAI_NODATA
     MAP_OPTION( EAI_NODATA ),
+#endif
+#ifdef EAI_NONAME
+    { WS_EAI_NODATA, EAI_NONAME },
+#endif
+
     MAP_OPTION( EAI_SERVICE ),
     MAP_OPTION( EAI_SOCKTYPE ),
     { 0, 0 }