Tue May 28 19:02:18 2013 UTC ()
Don't redefine __LITTLE_ENDIAN__ or __BIG_ENDIAN__.


(joerg)
diff -r1.11 -r1.12 pkgsrc/emulators/swarm/distinfo
diff -r1.6 -r1.7 pkgsrc/emulators/swarm/patches/patch-aa
cvs diff -r1.11 -r1.12 pkgsrc/emulators/swarm/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/swarm/distinfo 2012/05/23 05:19:40 1.11
+++ pkgsrc/emulators/swarm/distinfo 2013/05/28 19:02:18 1.12
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.11 2012/05/23 05:19:40 dholland Exp $ 1$NetBSD: distinfo,v 1.12 2013/05/28 19:02:18 joerg Exp $
2 2
3SHA1 (swarm-0.61.tar.gz) = 36ed52671f8be2cf8e799efd94a48b2919979d2c 3SHA1 (swarm-0.61.tar.gz) = 36ed52671f8be2cf8e799efd94a48b2919979d2c
4RMD160 (swarm-0.61.tar.gz) = d8e15da178236a46761a65cd52809276df5f3511 4RMD160 (swarm-0.61.tar.gz) = d8e15da178236a46761a65cd52809276df5f3511
5Size (swarm-0.61.tar.gz) = 395061 bytes 5Size (swarm-0.61.tar.gz) = 395061 bytes
6SHA1 (patch-aa) = 58aaf4fc9a39f14a8083ef8cc534b0199a757360 6SHA1 (patch-aa) = 0257a5f628c0d4f02084fe2fcc3d457979ba5251
7SHA1 (patch-ab) = 5a71a670297e4d8db2dd3c7c96d9528f878d13cb 7SHA1 (patch-ab) = 5a71a670297e4d8db2dd3c7c96d9528f878d13cb
8SHA1 (patch-ac) = 20b0603e24178a6086531bd2f7eb0eb5fc0e99c3 8SHA1 (patch-ac) = 20b0603e24178a6086531bd2f7eb0eb5fc0e99c3
9SHA1 (patch-ad) = 6d328a265f9e2f7774e759d01a920a81e1bceeb8 9SHA1 (patch-ad) = 6d328a265f9e2f7774e759d01a920a81e1bceeb8
10SHA1 (patch-ae) = 08b8819ad53bb0a91c3ab7a56479b2f36faab754 10SHA1 (patch-ae) = 08b8819ad53bb0a91c3ab7a56479b2f36faab754
11SHA1 (patch-af) = 8228c591fd22ee8984d1f434940ad2cbbba41a22 11SHA1 (patch-af) = 8228c591fd22ee8984d1f434940ad2cbbba41a22
12SHA1 (patch-ag) = 4d3ca9cd45edc081b85019ec88135504b3e7b0a1 12SHA1 (patch-ag) = 4d3ca9cd45edc081b85019ec88135504b3e7b0a1
13SHA1 (patch-ah) = 94d58bdd8d48e73f49ef06ac90eb0a9b0e1af6db 13SHA1 (patch-ah) = 94d58bdd8d48e73f49ef06ac90eb0a9b0e1af6db
14SHA1 (patch-ai) = 51b43a6b560566447d588623b19d3da6ab7b4ade 14SHA1 (patch-ai) = 51b43a6b560566447d588623b19d3da6ab7b4ade
15SHA1 (patch-aj) = 227b459e8201320679d3484daa163a5a5c579b17 15SHA1 (patch-aj) = 227b459e8201320679d3484daa163a5a5c579b17
16SHA1 (patch-ak) = 1eb646812069c798a38b9fcf9d01e08a3ea3b416 16SHA1 (patch-ak) = 1eb646812069c798a38b9fcf9d01e08a3ea3b416
cvs diff -r1.6 -r1.7 pkgsrc/emulators/swarm/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/emulators/swarm/patches/patch-aa 2012/03/07 15:08:40 1.6
+++ pkgsrc/emulators/swarm/patches/patch-aa 2013/05/28 19:02:18 1.7
@@ -1,50 +1,54 @@ @@ -1,50 +1,54 @@
1$NetBSD: patch-aa,v 1.6 2012/03/07 15:08:40 hans Exp $ 1$NetBSD: patch-aa,v 1.7 2013/05/28 19:02:18 joerg Exp $
2 2
3fix tests for endianness and use our own header files to get 3fix tests for endianness and use our own header files to get
4int64_t and uint64_t 4int64_t and uint64_t
5 5
6--- src/swarm_types.h.orig Tue Apr 10 09:46:10 2001 6--- src/swarm_types.h.orig 2001-09-23 16:12:23.000000000 +0000
7+++ src/swarm_types.h 7+++ src/swarm_types.h
8@@ -26,11 +26,21 @@ 8@@ -26,11 +26,25 @@
9 #ifndef __SWARM_TYPES_H__ 9 #ifndef __SWARM_TYPES_H__
10 #define __SWARM_TYPES_H__ 10 #define __SWARM_TYPES_H__
11  11
12-#ifdef sun4 12-#ifdef sun4
13+#ifdef __sun 13+#ifdef __sun
14+#include <sys/byteorder.h> 14+#include <sys/byteorder.h>
 15+#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
15+#ifdef _BIG_ENDIAN 16+#ifdef _BIG_ENDIAN
16 #define __BIG_ENDIAN__ 17 #define __BIG_ENDIAN__
17-#else /* ix86 / alpha / arm32 */ 18-#else /* ix86 / alpha / arm32 */
18+#else 19+#else
19+#define __LITTLE_ENDIAN__ 20+#define __LITTLE_ENDIAN__
20+#endif 21+#endif
 22+#endif
21+#else 23+#else
22+#include <sys/endian.h> 24+#include <sys/endian.h>
 25+#if !defined(__BIG_ENDIAN__) && !defined(__LITTLE_ENDIAN__)
23+#if BYTE_ORDER == BIG_ENDIAN 26+#if BYTE_ORDER == BIG_ENDIAN
24+#define __BIG_ENDIAN__ 27+#define __BIG_ENDIAN__
25+#else 28+#else
26 #define __LITTLE_ENDIAN__ 29 #define __LITTLE_ENDIAN__
27 #endif 30 #endif
28+#endif 31+#endif
 32+#endif
29  33
30 #ifdef WIN32 34 #ifdef WIN32
31 #include <windows.h> 35 #include <windows.h>
32@@ -60,6 +70,10 @@ typedef int int32_ 36@@ -60,6 +74,10 @@ typedef int int32_
33 typedef unsigned short uint16_t; 37 typedef unsigned short uint16_t;
34 typedef unsigned int uint32_t; 38 typedef unsigned int uint32_t;
35  39
36+#ifdef __NetBSD__ 40+#ifdef __NetBSD__
37+#include <sys/types.h> 41+#include <sys/types.h>
38+#include <sys/inttypes.h> 42+#include <sys/inttypes.h>
39+#else 43+#else
40 #ifndef WIN32 44 #ifndef WIN32
41 #ifndef __int8_t_defined  45 #ifndef __int8_t_defined
42 typedef long long int int64_t; 46 typedef long long int int64_t;
43@@ -69,6 +83,7 @@ typedef unsigned long long int uint64 47@@ -69,6 +87,7 @@ typedef unsigned long long int uint64
44 typedef INT64 int64_t; 48 typedef INT64 int64_t;
45 typedef UINT64 uint64_t; 49 typedef UINT64 uint64_t;
46 #endif // !WIN32 50 #endif // !WIN32
47+#endif // __NetBSD__ 51+#endif // __NetBSD__
48 #endif 52 #endif
49  53
50 typedef int bool_t; 54 typedef int bool_t;