Changeset 7652

Timestamp:

Jan 10, 2009, 2:22:13 AM (12 years ago)

Author:

charles

Message:

(trunk libT) win32 portability fixes, reported by Alexey

Location:

trunk/libtransmission

Files:

• bencode.c (modified) (1 diff)
• list.h (modified) (1 diff)
• net.c (modified) (1 diff)
• net.h (modified) (1 diff)
• peer-io.c (modified) (2 diffs)
• transmission.h (modified) (1 diff)

trunk/libtransmission/bencode.c

@@ -162 +162 @@
                         ( count % LIST_SIZE ? LIST_SIZE -
                           ( count % LIST_SIZE ) : 0 );
-        void *    new = realloc( val->val.l.vals, len * sizeof( tr_benc ) );
-        if( NULL == new )
+        void * tmp = realloc( val->val.l.vals, len * sizeof( tr_benc ) );
+        if( !tmp )
             return 1;
 
         val->val.l.alloc = len;
-        val->val.l.vals  = new;
+        val->val.l.vals  = tmp;
     }
 

trunk/libtransmission/list.h

@@ -64 +64 @@
 };
 
-#define __tr_list_entry(ptr, type, member) ({            \
-    const struct __tr_list *__mptr = (ptr);              \
-    (void *)( (char *)__mptr - offsetof(type,member) );  \
-})
+/**
+ * Given a __tr_list node that's embedded in a struct, returns a pointer to the struct.
+ * @param ptr     pointer to the embedded __tr_list
+ * @param type    struct type that has contains the __tr_list
+ * @param field   the name of the struct's _tr_list field
+ */
+#define __tr_list_entry(ptr,type,field) ((type*) (((char*)ptr) - offsetof(type,field)))
 
 typedef int  ( *__tr_list_cmp_t ) ( const void * a, const void * b );

trunk/libtransmission/net.c

@@ -33 +33 @@
 #ifdef WIN32
  #include <winsock2.h> /* inet_addr */
+ #include <WS2tcpip.h>
 #else
  #include <arpa/inet.h> /* inet_addr */

trunk/libtransmission/net.h

@@ -33 +33 @@
  #include <inttypes.h>
  #include <winsock2.h>
+ #include <WS2tcpip.h>
  typedef int socklen_t;
 #else

trunk/libtransmission/peer-io.c

@@ -12 +12 @@
 
 #include <assert.h>
+#include <errno.h>
 #include <limits.h> /* INT_MAX */
 #include <string.h>
@@ -88 +89 @@
     while( bytes_transferred )
     {
-        struct tr_datatype * next = __tr_list_entry( io->outbuf_datatypes.next,
-                                                     struct tr_datatype, head );
+        struct tr_datatype * next = __tr_list_entry( io->outbuf_datatypes.next, struct tr_datatype, head );
         const size_t payload = MIN( next->length, bytes_transferred );
         const size_t overhead = getPacketOverhead( payload );

trunk/libtransmission/transmission.h

@@ -50 +50 @@
 #endif
 #include <time.h> /* time_t */
+
+#if defined(_MSC_VER) && !defined( __cplusplus )
+ #define inline __inline
+#endif
 
 #define SHA_DIGEST_LENGTH 20