Changeset 233

Timestamp:

Apr 22, 2006, 2:27:09 PM (16 years ago)

Author:

titer

Message:

Portability fix (platforms such as sparc64 need uint32_t pointers to be
32-bits aligned)

Patch by Christian Weisgerber

File:

• trunk/libtransmission/internal.h (modified) (1 diff)

trunk/libtransmission/internal.h

@@ -69 +69 @@
 /* Convenient macros to perform uint32_t endian conversions with
    char pointers */
-#define TR_NTOHL(p,a) (a) = ntohl(*((uint32_t*)(p)))
-#define TR_HTONL(a,p) *((uint32_t*)(p)) = htonl((a))
+#define TR_NTOHL(p,a) (a) = tr_ntohl((p))
+#define TR_HTONL(a,p) tr_htonl((a), (p))
+static inline uint32_t tr_ntohl( uint8_t * p )
+{
+        uint32_t u;
+        memcpy( &u, p, sizeof( uint32_t ) );
+        return ntohl( u );
+}
+static inline void tr_htonl( uint32_t a, uint8_t * p )
+{
+        uint32_t u;
+        u = htonl( a );
+        memcpy ( p, &u, sizeof( uint32_t ) );
+}
 
 /* Sometimes the system defines MAX/MIN, sometimes not. In the latter