diff options
| author | Francois Pichet <pichet2000@gmail.com> | 2010-10-06 13:02:48 +0000 |
|---|---|---|
| committer | Francois Pichet <pichet2000@gmail.com> | 2010-10-06 13:02:48 +0000 |
| commit | 229ca4a04cd1f94ca5ce907638c699fd024a6347 (patch) | |
| tree | 346e8f06592472114fa6dcb429a753384c3f6537 | |
| parent | b6448943ba1fe01be7cd658437dacae9d2fee8a8 (diff) | |
_inline is an alias for inline in MSVC.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@115785 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/TokenKinds.def | 1 | ||||
| -rw-r--r-- | test/Parser/MicrosoftExtensions.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/clang/Basic/TokenKinds.def b/include/clang/Basic/TokenKinds.def index 8e06534641..f222eeaf70 100644 --- a/include/clang/Basic/TokenKinds.def +++ b/include/clang/Basic/TokenKinds.def @@ -377,6 +377,7 @@ ALIAS("_fastcall" , __fastcall , KEYMS | KEYBORLAND) ALIAS("_stdcall" , __stdcall , KEYMS | KEYBORLAND) ALIAS("_thiscall" , __thiscall , KEYMS) ALIAS("_uuidof" , __uuidof , KEYMS | KEYBORLAND) +ALIAS("_inline" , inline , KEYMS) // Borland Extensions which should be disabled in strict conformance mode. ALIAS("_pascal" , __pascal , KEYBORLAND) diff --git a/test/Parser/MicrosoftExtensions.c b/test/Parser/MicrosoftExtensions.c index 3dfa241fa1..dcb55ad50c 100644 --- a/test/Parser/MicrosoftExtensions.c +++ b/test/Parser/MicrosoftExtensions.c @@ -21,6 +21,7 @@ void __forceinline InterlockedBitTestAndSet (long *Base, long Bit) setc al }; } +_inline int foo99() { return 99; } void *_alloca(int); |