diff options
| author | joerg <joerg> | 2013-05-28 19:02:18 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2013-05-28 19:02:18 +0000 |
| commit | 9258a867a3bcfe0cbd231895368d233acec84768 (patch) | |
| tree | 425073aa41e763aaa8225dc2fd190c901ba9aaac /emulators/swarm | |
| parent | 0ec9653d176667fa2cef656d9bc3a4e848866d54 (diff) | |
| download | pkgsrc-9258a867a3bcfe0cbd231895368d233acec84768.tar.gz | |
Don't redefine __LITTLE_ENDIAN__ or __BIG_ENDIAN__.
Diffstat (limited to 'emulators/swarm')
| -rw-r--r-- | emulators/swarm/distinfo | 4 | ||||
| -rw-r--r-- | emulators/swarm/patches/patch-aa | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/emulators/swarm/distinfo b/emulators/swarm/distinfo index 59e6a8fccb5..05a106645db 100644 --- a/emulators/swarm/distinfo +++ b/emulators/swarm/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.11 2012/05/23 05:19:40 dholland Exp $ +$NetBSD: distinfo,v 1.12 2013/05/28 19:02:18 joerg Exp $ SHA1 (swarm-0.61.tar.gz) = 36ed52671f8be2cf8e799efd94a48b2919979d2c RMD160 (swarm-0.61.tar.gz) = d8e15da178236a46761a65cd52809276df5f3511 Size (swarm-0.61.tar.gz) = 395061 bytes -SHA1 (patch-aa) = 58aaf4fc9a39f14a8083ef8cc534b0199a757360 +SHA1 (patch-aa) = 0257a5f628c0d4f02084fe2fcc3d457979ba5251 SHA1 (patch-ab) = 5a71a670297e4d8db2dd3c7c96d9528f878d13cb SHA1 (patch-ac) = 20b0603e24178a6086531bd2f7eb0eb5fc0e99c3 SHA1 (patch-ad) = 6d328a265f9e2f7774e759d01a920a81e1bceeb8 diff --git a/emulators/swarm/patches/patch-aa b/emulators/swarm/patches/patch-aa index 8736a1a41b4..224f5acf62e 100644 --- a/emulators/swarm/patches/patch-aa +++ b/emulators/swarm/patches/patch-aa @@ -1,35 +1,39 @@ -$NetBSD: patch-aa,v 1.6 2012/03/07 15:08:40 hans Exp $ +$NetBSD: patch-aa,v 1.7 2013/05/28 19:02:18 joerg Exp $ fix tests for endianness and use our own header files to get int64_t and uint64_t ---- src/swarm_types.h.orig Tue Apr 10 09:46:10 2001 +--- src/swarm_types.h.orig 2001-09-23 16:12:23.000000000 +0000 +++ src/swarm_types.h -@@ -26,11 +26,21 @@ +@@ -26,11 +26,25 @@ #ifndef __SWARM_TYPES_H__ #define __SWARM_TYPES_H__ -#ifdef sun4 +#ifdef __sun +#include <sys/byteorder.h> ++#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) +#ifdef _BIG_ENDIAN #define __BIG_ENDIAN__ -#else /* ix86 / alpha / arm32 */ +#else +#define __LITTLE_ENDIAN__ +#endif ++#endif +#else +#include <sys/endian.h> ++#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__) +#if BYTE_ORDER == BIG_ENDIAN +#define __BIG_ENDIAN__ +#else #define __LITTLE_ENDIAN__ #endif +#endif ++#endif #ifdef WIN32 #include <windows.h> -@@ -60,6 +70,10 @@ typedef int int32_ +@@ -60,6 +74,10 @@ typedef int int32_ typedef unsigned short uint16_t; typedef unsigned int uint32_t; @@ -40,7 +44,7 @@ int64_t and uint64_t #ifndef WIN32 #ifndef __int8_t_defined typedef long long int int64_t; -@@ -69,6 +83,7 @@ typedef unsigned long long int uint64 +@@ -69,6 +87,7 @@ typedef unsigned long long int uint64 typedef INT64 int64_t; typedef UINT64 uint64_t; #endif // !WIN32 |