[Ayttm-commits] CVS: ayttm/modules/yahoo2/libyahoo2 libyahoo2.c,1.17,1.18

[Edward L. Haletky <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/yahoo2/libyahoo2
In directory subversions:/tmp/cvs-serv15485/modules/yahoo2/libyahoo2

Modified Files:
        libyahoo2.c 
Log Message:


More MINGW32 fixes and update to get importlicq.c to compile.


Index: libyahoo2.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/yahoo2/libyahoo2/libyahoo2.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libyahoo2.c 24 Mar 2003 10:56:36 -0000      1.17
+++ libyahoo2.c 24 Mar 2003 14:25:43 -0000      1.18
@@ -49,6 +49,10 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdarg.h>
+#ifdef __MINGW32__
+#include <winsock2.h>
+#define EINPROGRESS WSAEINPROGRESS
+#endif
 
 #if STDC_HEADERS
 # include <string.h>
@@ -1798,12 +1802,20 @@
                return;
 
        if(error) {
+#ifdef __MINGW32__
+               int err;
+#endif
                yd->fd = YAHOO_CALLBACK(ext_yahoo_connect)(id, pager_host,
                                fallback_ports[i++]);
+#ifdef __MINGW32__
+               err = WSAGetLastError();
+#else
+               err = errno;
+#endif
                if(yd->fd > 0)
                        yahoo_connected(id, yd->fd, 0);
-               else if(errno != EINPROGRESS)
-                       yahoo_connected(id, yd->fd, errno);
+               else if(err != EINPROGRESS)
+                       yahoo_connected(id, yd->fd, err);
                return;
        }
 
@@ -1824,6 +1836,9 @@
 void yahoo_login(int id, int initial)
 {
        struct yahoo_data *yd = find_conn_by_id(id);
+#ifdef __MINGW32__
+       int err;
+#endif
 
        if(!yd)
                return;
@@ -1832,10 +1847,15 @@
 
        yd->fd = YAHOO_CALLBACK(ext_yahoo_connect)(id, pager_host, 
atoi(pager_port));
 
+#ifdef __MINGW32__
+       err = WSAGetLastError();
+#else
+       err = errno;
+#endif
        if(yd->fd > 0)
                yahoo_connected(id, yd->fd, 0);
        else if(errno != EINPROGRESS)
-               yahoo_connected(id, yd->fd, errno);
+               yahoo_connected(id, yd->fd, err);
 }