[cfe-commits] r115785 - in /cfe/trunk: include/clang/Basic/TokenKinds.def test/Parser/MicrosoftExtensions.c

[Francois Pichet]

Author: fpichet
Date: Wed Oct  6 08:02:48 2010
New Revision: 115785

URL: http://llvm.org/viewvc/llvm-project?rev=115785&view=rev
Log:
_inline is an alias for inline in MSVC.

Modified:
    cfe/trunk/include/clang/Basic/TokenKinds.def
    cfe/trunk/test/Parser/MicrosoftExtensions.c

Modified: cfe/trunk/include/clang/Basic/TokenKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/TokenKinds.def?rev=115785&r1=115784&r2=115785&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/TokenKinds.def (original)
+++ cfe/trunk/include/clang/Basic/TokenKinds.def Wed Oct  6 08:02:48 2010
@@ -377,6 +377,7 @@
 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)

Modified: cfe/trunk/test/Parser/MicrosoftExtensions.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/MicrosoftExtensions.c?rev=115785&r1=115784&r2=115785&view=diff
==============================================================================
--- cfe/trunk/test/Parser/MicrosoftExtensions.c (original)
+++ cfe/trunk/test/Parser/MicrosoftExtensions.c Wed Oct  6 08:02:48 2010
@@ -21,6 +21,7 @@
     setc al
   };
 }
+_inline int foo99() { return 99; }
 
 void *_alloca(int);