PATCH: EAI_NODATA / NONAME

Marcus Meissner meissner at suse.de
Tue Nov 22 04:25:55 CST 2005


Hi,

EAI_NODATA is deprecated and FreeBSD actually killed it already
in favor of EAI_NONAME.

So map EAI_NONAME to WS_EAI_NODATA for now until windows catches up.

Ciao, Marcus

Changelog:
	EAI_NONAME -> WS_EAI_NODATA, check for EAI_NONAME and EAI_NODATA.

Index: dlls/winsock/socket.c
===================================================================
RCS file: /home/wine/wine/dlls/winsock/socket.c,v
retrieving revision 1.195
diff -u -r1.195 socket.c
--- dlls/winsock/socket.c	17 Nov 2005 12:58:35 -0000	1.195
+++ dlls/winsock/socket.c	22 Nov 2005 10:25:23 -0000
@@ -332,7 +332,18 @@
     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 }



More information about the wine-patches mailing list