From d918576b28860230b528bd3dd6a2a83554391f49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Wed, 1 Feb 2023 19:42:39 +0000 Subject: [PATCH] Clear warning about redefinition of macro (#48422) `FORCE_INLINE` is also defined in `src/support/dtypes.h`, and both `dtypes.h` and `MurmurHash3.c` are included by `src/support/hashing.c`, causing a clash: ``` In file included from /home/mose/repo/julia/src/support/hashing.c:51: /home/mose/repo/julia/src/support/MurmurHash3.c:15: warning: "FORCE_INLINE" redefined 15 | #define FORCE_INLINE inline __attribute__((always_inline)) | In file included from /home/mose/repo/julia/src/support/hashing.c:7: /home/mose/repo/julia/src/support/dtypes.h:120: note: this is the location of the previous definition 120 | #define FORCE_INLINE static inline __attribute__((always_inline)) | ``` --- src/support/MurmurHash3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/support/MurmurHash3.c b/src/support/MurmurHash3.c index fce7351f90ffe..a26f58ef40cfa 100644 --- a/src/support/MurmurHash3.c +++ b/src/support/MurmurHash3.c @@ -8,12 +8,11 @@ // non-native version will be less than optimal. #include "MurmurHash3.h" +#include "dtypes.h" //----------------------------------------------------------------------------- // Platform-specific functions and macros -#define FORCE_INLINE inline __attribute__((always_inline)) - static inline uint32_t rotl32 ( uint32_t x, int8_t r ) { return (x << r) | (x >> (32 - r));