- Sun Mar 11 06:02:19 UTC 2001

  - Banish socklen_t.

diff --git a/CHANGES b/CHANGES
index 480e74d697dc13aaf95608a4435a7fc81164606a..24953d78f8d6b843967317c0020f01d1c4347e6a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 
 No release numbers
 ------------------
+ - Sun Mar 11 06:02:19 UTC 2001
+  - Banish socklen_t.
+
  - Sun Mar 11 05:51:45 UTC 2001 (jbm)
   - Split off aim_internal.h 
   - Add aim_tx_cleanqueue()

diff --git a/include/aim.h b/include/aim.h
index 57cc9ca8bb22f50abce318485509dc0b40135674..263b2a655fe63d711a28a79474e622ca4d81b219 100644 (file)
--- a/include/aim.h
+++ b/include/aim.h
@@ -70,8 +70,7 @@
 /* Portability stuff (DMP) */
 
 #ifdef _WIN32
-#define sleep Sleep
-#define socklen_t int /* this must be a POSIXy thing */
+#define sleep(x) Sleep((x)*1000)
 #define snprintf _snprintf /* I'm not sure whats wrong with Microsoft here */
 #define close(x) closesocket(x) /* no comment */
 #endif

diff --git a/src/ft.c b/src/ft.c
index 5ad960fa7af249df727bca9e20b7be20b58343d2..db50304677584c8dbb6f775c8cccea8b4723b4a7 100644 (file)
--- a/src/ft.c
+++ b/src/ft.c
@@ -39,7 +39,7 @@ faim_export int aim_handlerendconnect(struct aim_session_t *sess, struct aim_con
   int acceptfd = 0;
   rxcallback_t userfunc;
   struct sockaddr cliaddr;
-  socklen_t clilen = sizeof(cliaddr);
+  int clilen = sizeof(cliaddr);
   int ret = 0;
   struct aim_conn_t *newconn;