Changeset 4597

Timestamp:

Jan 10, 2008, 6:52:46 PM (14 years ago)

Author:

charles

Message:

mingw portability fixes

Location:

trunk/libtransmission

Files:

• crypto.c (modified) (1 diff)
• peer-mgr-private.h (modified) (1 diff)
• peer-mgr.c (modified) (2 diffs)
• peer-mgr.h (modified) (1 diff)
• peer-msgs.c (modified) (1 diff)
• shared.c (modified) (1 diff)
• tracker.c (modified) (1 diff)
• trevent.c (modified) (1 diff)
• utils.c (modified) (1 diff)

trunk/libtransmission/crypto.c

@@ -16 +16 @@
 #include <string.h> /* memcpy */
 #include <stdarg.h>
-#include <netinet/in.h> /* struct in_addr */
 
 #include <openssl/bn.h>

trunk/libtransmission/peer-mgr-private.h

@@ -15 +15 @@
 
 #include <inttypes.h> /* uint16_t */
+
+#ifdef WIN32
+#include <winsock2.h> /* struct in_addr */
+#else
 #include <netinet/in.h> /* struct in_addr */
+#endif
+
 #include "publish.h" /* tr_publisher_tag */
 

trunk/libtransmission/peer-mgr.c

@@ -18 +18 @@
 
 #include <libgen.h> /* basename */
-#include <arpa/inet.h> /* inet_ntoa */
 
 #include <event.h>
@@ -743 +742 @@
         walk += reqCount[s];
     }
-    assert( ( walk - ret ) == blockCount );
+    assert( ( walk - ret ) == ( int )blockCount );
     *setmeCount = blockCount;
 

trunk/libtransmission/peer-mgr.h

@@ -15 +15 @@
 
 #include <inttypes.h> /* uint16_t */
+
+#ifdef WIN32
+#include <winsock2.h> /* struct in_addr */
+#else
 #include <netinet/in.h> /* struct in_addr */
+#endif
 
 struct in_addr;

trunk/libtransmission/peer-msgs.c

@@ -17 +17 @@
 #include <string.h>
 #include <libgen.h> /* basename */
-
-#include <netinet/in.h> /* struct in_addr */
 
 #include <event.h>

trunk/libtransmission/shared.c

@@ -23 +23 @@
  *****************************************************************************/
 
+#include <errno.h>
 #include <string.h>
 #include <stdio.h>

trunk/libtransmission/tracker.c

@@ -17 +17 @@
 #include <libgen.h> /* basename */
 
-#include <sys/queue.h> /* evhttp.h needs this */
 #include <event.h>
 #include <evhttp.h>

trunk/libtransmission/trevent.c

@@ -18 +18 @@
 
 #include <signal.h>
-#include <sys/queue.h> /* for evhttp */
-#include <sys/types.h> /* for evhttp */
 
 #include <event.h>

trunk/libtransmission/utils.c

@@ -95 +95 @@
     gettimeofday( &tv, NULL );
 
+#ifdef WIN32
+    now_tm = *localtime( &now );
+#else
     localtime_r( &now, &now_tm );
+#endif
+
     strftime( tmp, sizeof(tmp), "%H:%M:%S", &now_tm );
     milliseconds = (int)(tv.tv_usec / 1000);