From: mid <mid>
Date: Tue, 5 Sep 2000 04:43:37 +0000 (+0000)
Subject:  - Tue Sep  5 04:41:45 GMT 2000
X-Git-Tag: rel_0_99_2~113
X-Git-Url: http://andersk.mit.edu/gitweb/libfaim.git/commitdiff_plain/999b6d5f9b44b76b9597aecbe29e8d1a16ca137d

 - 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 7c926c2..74d39a7 100644
--- 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 9eac332..4f73deb 100644
--- 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 511a8a2..d38e727 100644
--- 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);