diff options
| author | Richard Braun <rbraun@sceen.net> | 2013-07-05 00:34:35 +0200 |
|---|---|---|
| committer | Richard Braun <rbraun@sceen.net> | 2013-07-05 01:07:25 +0200 |
| commit | 8e1721652070b2f7899616a42e7311d827ae7c72 (patch) | |
| tree | 2277184d5cbe173fee223e79d86fb16b1d8988ad | |
| parent | 925597a7e08bf0c62251ff2873fa62dcd0644979 (diff) | |
rdxtree: change definition of rdxtree_bm_t
When the radix value is 6, always typedef to unsigned long long.
| -rw-r--r-- | rdxtree.c | 5 | ||||
| -rw-r--r-- | test/test_rdxtree.c | 4 |
2 files changed, 0 insertions, 9 deletions
@@ -67,13 +67,8 @@ typedef unsigned long rdxtree_bm_t; #define rdxtree_ffs(x) __builtin_ffsl(x) #elif RDXTREE_RADIX == 6 /* RDXTREE_RADIX < 6 */ -#ifdef __LP64__ -typedef unsigned long rdxtree_bm_t; -#define rdxtree_ffs(x) __builtin_ffsl(x) -#else /* __LP64__ */ typedef unsigned long long rdxtree_bm_t; #define rdxtree_ffs(x) __builtin_ffsll(x) -#endif /* __LP64__ */ #else /* RDXTREE_RADIX < 6 */ #error "radix too high" #endif /* RDXTREE_RADIX < 6 */ diff --git a/test/test_rdxtree.c b/test/test_rdxtree.c index 9d2a1d8..3208c04 100644 --- a/test/test_rdxtree.c +++ b/test/test_rdxtree.c @@ -38,11 +38,7 @@ #if RDXTREE_RADIX < 6 #define BM_FORMAT "%lx" #elif RDXTREE_RADIX == 6 /* RDXTREE_RADIX < 6 */ -#ifdef __LP64__ -#define BM_FORMAT "%lx" -#else /* __LP64__ */ #define BM_FORMAT "%llx" -#endif /* __LP64__ */ #endif /* RDXTREE_RADIX < 6 */ struct obj { |