Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-30 02:58:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SDK] Fix __forceinline definition for C++

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sdk/include/crt/_mingw.h
View file

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

8
sdk/include/psdk/intsafe.h
View file

@ -30,14 +30,6 @@
#include <specstrings.h> #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 */ /* Handle ntintsafe here too */
#ifdef _NTINTSAFE_H_INCLUDED_ #ifdef _NTINTSAFE_H_INCLUDED_
#ifndef _NTDEF_ /* Guard agains redefinition from ntstatus.h */ #ifndef _NTDEF_ /* Guard agains redefinition from ntstatus.h */

6
sdk/include/xdk/ntbasedef.h
View file

@ -213,13 +213,7 @@
/* Inlines */ /* Inlines */
#ifndef FORCEINLINE #ifndef FORCEINLINE
#if defined(_MSC_VER)
#define FORCEINLINE __forceinline #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
#endif /* FORCEINLINE */ #endif /* FORCEINLINE */
#ifndef DECLSPEC_NOINLINE #ifndef DECLSPEC_NOINLINE