[SDK] Fix __forceinline definition for C++

This commit is contained in:
Victor Perevertkin 2020-09-24 05:33:35 +03:00
parent 33fe4333f4
commit 87a5311116
No known key found for this signature in database
GPG key ID: C750B7222E9C7830
3 changed files with 8 additions and 18 deletions

View file

@ -190,10 +190,14 @@ allow GCC to optimize away some EH unwind code, at least in DW2 case. */
# endif
# define __ptr32
# define __ptr64
# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L)
# define __forceinline extern inline __attribute__((__always_inline__,__gnu_inline__))
# ifdef __cplusplus
# define __forceinline inline __attribute__((__always_inline__))
# else
# define __forceinline extern __inline__ __attribute__((__always_inline__))
# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L)
# define __forceinline extern inline __attribute__((__always_inline__,__gnu_inline__))
# else
# define __forceinline extern __inline__ __attribute__((__always_inline__))
# endif
# endif
#endif

View file

@ -30,14 +30,6 @@
#include <specstrings.h>
#if defined(__GNUC__) && !defined(__forceinline)
# if ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L)
# define __forceinline extern inline __attribute__((__always_inline__,__gnu_inline__))
# else
# define __forceinline extern __inline__ __attribute__((__always_inline__))
# endif
#endif
/* Handle ntintsafe here too */
#ifdef _NTINTSAFE_H_INCLUDED_
#ifndef _NTDEF_ /* Guard agains redefinition from ntstatus.h */

View file

@ -213,13 +213,7 @@
/* Inlines */
#ifndef FORCEINLINE
#if defined(_MSC_VER)
#define FORCEINLINE __forceinline
#elif ( __MINGW_GNUC_PREREQ(4, 3) && __STDC_VERSION__ >= 199901L)
#define FORCEINLINE extern inline __attribute__((__always_inline__,__gnu_inline__))
#else
#define FORCEINLINE extern __inline__ __attribute__((__always_inline__))
#endif
#define FORCEINLINE __forceinline
#endif /* FORCEINLINE */
#ifndef DECLSPEC_NOINLINE