summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-04-24 13:37:33 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-05-02 16:18:42 -0700
commitc25bd29805f4d854c3a0b4176813f3c1bff569d3 (patch)
tree8712a2748b842176d177dedb2e6594b71fc2ff10
parent4cf63c8ac48c63b4c55669d4648506ed2bb8976f (diff)
types: add C99-style constructors to <asm-generic/int-*.h>
Add C99-style constructor macros for fixed types to <asm-generic/int-*.h>. Since Linux uses names like "u64" instead of "uint64_t", the constructor macros are called U64_C() instead of UINT64_C() and so forth. These macros allow specific sizes to be specified as U64_C(0x123456789abcdef), without gcc issuing warnings as it will if one writes (u64)0x123456789abcdef. When used from assembly, these macros pass their argument unchanged. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--include/asm-generic/int-l64.h20
-rw-r--r--include/asm-generic/int-ll64.h20
2 files changed, 40 insertions, 0 deletions
diff --git a/include/asm-generic/int-l64.h b/include/asm-generic/int-l64.h
index 629b5a43f0b0..2af9b75d77db 100644
--- a/include/asm-generic/int-l64.h
+++ b/include/asm-generic/int-l64.h
@@ -44,6 +44,26 @@ typedef unsigned int u32;
typedef signed long s64;
typedef unsigned long u64;
+#define S8_C(x) x
+#define U8_C(x) x ## U
+#define S16_C(x) x
+#define U16_C(x) x ## U
+#define S32_C(x) x
+#define U32_C(x) x ## U
+#define S64_C(x) x ## L
+#define U64_C(x) x ## UL
+
+#else /* __ASSEMBLY__ */
+
+#define S8_C(x) x
+#define U8_C(x) x
+#define S16_C(x) x
+#define U16_C(x) x
+#define S32_C(x) x
+#define U32_C(x) x
+#define S64_C(x) x
+#define U64_C(x) x
+
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h
index 1e5ffec05759..260948905e4e 100644
--- a/include/asm-generic/int-ll64.h
+++ b/include/asm-generic/int-ll64.h
@@ -49,6 +49,26 @@ typedef unsigned int u32;
typedef signed long long s64;
typedef unsigned long long u64;
+#define S8_C(x) x
+#define U8_C(x) x ## U
+#define S16_C(x) x
+#define U16_C(x) x ## U
+#define S32_C(x) x
+#define U32_C(x) x ## U
+#define S64_C(x) x ## LL
+#define U64_C(x) x ## ULL
+
+#else /* __ASSEMBLY__ */
+
+#define S8_C(x) x
+#define U8_C(x) x
+#define S16_C(x) x
+#define U16_C(x) x
+#define S32_C(x) x
+#define U32_C(x) x
+#define S64_C(x) x
+#define U64_C(x) x
+
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */