diff options
| author | Jacob Masen-Smith <smith.jacob@gmail.com> | 2017-11-23 20:40:43 -0800 |
|---|---|---|
| committer | Jacob Masen-Smith <smith.jacob@gmail.com> | 2017-11-23 20:40:43 -0800 |
| commit | 950f5db3dd2fda8159f2ba280d66d44103810aef (patch) | |
| tree | 34311e0bb17fb02b28beded70421db10fa533206 /src/include | |
| parent | 33e0be73f7d7b398b246933f67c643a467b7f8f2 (diff) | |
Changed MinGW __forceinline strategy to something with less side effects
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ndpi_win32.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/include/ndpi_win32.h b/src/include/ndpi_win32.h index d4109dcb2..db309faff 100644 --- a/src/include/ndpi_win32.h +++ b/src/include/ndpi_win32.h @@ -27,11 +27,8 @@ // fix a MinGW build issue "error: multiple storage classes in declaration specifiers" due to MinGW // defining extern for __forceinline types #if (defined(__MINGW32__) || defined(__MINGW64__)) && defined(__GNUC__) -// MinGW winnt.h uses FORCEINLINE which is originally defined as __forceinline, but requires extern -#undef FORCEINLINE -#define FORCEINLINE extern __inline__ __attribute__((__always_inline__,__gnu_inline__)) -#undef __forceinline -#define __forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__)) +#define MINGW_GCC +#define __mingw_forceinline __inline__ __attribute__((__always_inline__,__gnu_inline__)) #endif #include <winsock2.h> |