From 40e16683f3fdf23dba20d9d0fc2eb00d562cc8df Mon Sep 17 00:00:00 2001 From: Timur Iskhodzhanov Date: Fri, 12 Apr 2013 09:37:20 +0000 Subject: [PATCH] Finally drop the 'static' from INLINE and ALWAYS_INLINE The ALWAYS_INLINE doesn't have static on POSIX anyways since r178341; the INLINE is only used in .h files, so shouldn't have been 'static' in the first place git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@179371 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/sanitizer_common/sanitizer_internal_defs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sanitizer_common/sanitizer_internal_defs.h b/lib/sanitizer_common/sanitizer_internal_defs.h index 073047490..6ee21f02f 100644 --- a/lib/sanitizer_common/sanitizer_internal_defs.h +++ b/lib/sanitizer_common/sanitizer_internal_defs.h @@ -109,13 +109,13 @@ using namespace __sanitizer; // NOLINT // This header should NOT include any other headers to avoid portability issues. // Common defs. -#define INLINE static inline +#define INLINE inline #define INTERFACE_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE #define WEAK SANITIZER_WEAK_ATTRIBUTE // Platform-specific defs. #if defined(_MSC_VER) -# define ALWAYS_INLINE static __forceinline +# define ALWAYS_INLINE __forceinline // FIXME(timurrrr): do we need this on Windows? # define ALIAS(x) # define ALIGNED(x) __declspec(align(x)) -- 2.11.4.GIT