Skip to content

Commit d918576

Browse files
authored
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)) | ```
1 parent 798b589 commit d918576

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/support/MurmurHash3.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
// non-native version will be less than optimal.
99

1010
#include "MurmurHash3.h"
11+
#include "dtypes.h"
1112

1213
//-----------------------------------------------------------------------------
1314
// Platform-specific functions and macros
1415

15-
#define FORCE_INLINE inline __attribute__((always_inline))
16-
1716
static inline uint32_t rotl32 ( uint32_t x, int8_t r )
1817
{
1918
return (x << r) | (x >> (32 - r));

0 commit comments

Comments
 (0)