- Tue Sep 5 04:41:45 GMT 2000

   - Few more minor things
   - Added the changes needed for faimtest.
   - Removed aimdebugd from default build

diff --git a/CHANGES b/CHANGES
index 7c926c21d17165b9444dec98ea89a7028315b55c..74d39a7b8be7cad2cded7b5cb52b465eb64c9b3d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
 
 No release numbers
 ------------------
+ - Tue Sep  5 04:41:45 GMT 2000
+   - Few more minor things
+   - Added the changes needed for faimtest.
+   - Removed aimdebugd from default build
+
  - Tue Sep  5 03:47:26 GMT 2000
    - More ANSIfication for win32
    - Forgot aim_misc last time.

diff --git a/utils/Makefile b/utils/Makefile
index 9eac332175f4be771e2eee2a549585d2d3979264..4f73debfa19caaecdf3082f284b0cbae1cf3dc16 100644 (file)
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -1,6 +1,6 @@
 include Makefile.dynamicrules
 
-UTIL_DIRS = faimtest aimdebugd #aimdump aimpasswd
+UTIL_DIRS = faimtest #aimdebugd aimdump aimpasswd
 
 utils_all: 
        @dirs='$(UTIL_DIRS)'; \

diff --git a/utils/faimtest/faimtest.c b/utils/faimtest/faimtest.c
index 511a8a281d743fb9fb5074580e0e63e39aea41b2..d38e7275fe8fcbf6312eb6e9a9f6c64d33b725b2 100644 (file)
--- a/utils/faimtest/faimtest.c
+++ b/utils/faimtest/faimtest.c
@@ -117,6 +117,23 @@ int faimtest_reportinterval(struct aim_session_t *sess, struct command_rx_struct
   return 1;
 }
 
+#ifdef _WIN32
+/*
+ * This is really all thats needed to link against libfaim on win32.
+ *
+ * Note that this particular version of faimtest has never been tested
+ * on win32, but I'm fairly sure it should.
+ */
+int initwsa(void)
+{
+  WORD wVersionRequested;
+  WSADATA wsaData;
+
+  wVersionRequested = MAKEWORD(2,2);
+  return WSAStartup(wVersionRequested, &wsaData);
+}
+#endif /* _WIN32 */
+
 static char *screenname,*password,*server=NULL;
 
 int main(void)
@@ -136,6 +153,13 @@ int main(void)
 
   server = getenv("AUTHSERVER");
 
+#ifdef _WIN32
+  if (initwsa() != 0) {
+    printf("faimtest: could not initialize windows sockets\n");
+    return -1;
+  }
+#endif /* _WIN32 */
+
   aim_session_init(&aimsess);
 
   authconn = aim_newconn(&aimsess, AIM_CONN_TYPE_AUTH, server?server:FAIM_LOGIN_SERVER);