Skip to content

Commit 6cd9d31

Browse files
committed
win32: use __inline__ instead of __forceinline__ on MinGW
1 parent 00f4a61 commit 6cd9d31

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/include/nacl_compiler_annotations.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "native_client/src/include/build_config.h"
1111

1212
/* MSVC supports "inline" only in C++ */
13-
#if NACL_WINDOWS
13+
#if NACL_WINDOWS && defined(_MSC_VER)
1414
# define INLINE __forceinline
1515
#else
1616
# define INLINE __inline__

src/trusted/validator_ragel/bitmap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "native_client/src/include/nacl_macros.h"
1616
#include "native_client/src/include/portability.h"
1717

18-
#if NACL_WINDOWS
18+
#if NACL_WINDOWS && defined(_MSC_VER)
1919
# define FORCEINLINE __forceinline
2020
#else
2121
# define FORCEINLINE __inline __attribute__ ((always_inline))

src/trusted/validator_ragel/decoding.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "native_client/src/include/build_config.h"
2020
#include "native_client/src/trusted/validator_ragel/decoder.h"
2121

22-
#if NACL_WINDOWS
22+
#if NACL_WINDOWS && !defined(__GNUC__)
2323
# define FORCEINLINE __forceinline
2424
#else
2525
# define FORCEINLINE __inline __attribute__ ((always_inline))

0 commit comments

Comments
 (0)