From 247c83c29466e78214c7a1305274edc2778b92c5 Mon Sep 17 00:00:00 2001 From: bernie Date: Tue, 10 Aug 2004 06:56:29 +0000 Subject: [PATCH] RESTRICT: New C99-like macro; STATIC_ASSERT: Fix warning for multiple invocation in one file. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@124 38d2e660-2303-0410-9eaa-f027e97ec537 --- compiler.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/compiler.h b/compiler.h index a2689e8e..500cb0c2 100755 --- a/compiler.h +++ b/compiler.h @@ -15,6 +15,9 @@ /* * $Log$ + * Revision 1.14 2004/08/10 06:56:29 bernie + * RESTRICT: New C99-like macro; STATIC_ASSERT: Fix warning for multiple invocation in one file. + * * Revision 1.13 2004/08/02 20:20:29 aleph * Merge from project_ks * @@ -137,6 +140,7 @@ #define INLINE static inline __attribute__((__always_inline__)) #define LIKELY(x) __builtin_expect((x), 1) #define UNLIKELY(x) __builtin_expect((x), 0) + #define RESTRICT __restrict__ #if GNUC_PREREQ(3,1) #define DEPRECATED __attribute__((__deprecated__)) #endif @@ -212,6 +216,9 @@ #ifndef UNLIKELY #define UNLIKELY(x) x #endif +#ifndef RESTRICT +#define RESTRICT +#endif /* Support for harvard architectures */ #ifndef PSTR @@ -322,7 +329,7 @@ /*! Issue a compilation error if the \a condition is false */ #define STATIC_ASSERT(condition) \ - extern char CT_ASSERT___[(condition) ? 1 : -1] + extern char PP_CAT(CT_ASSERT___, __LINE__)[(condition) ? 1 : -1] /* * Standard type definitions -- 2.25.1