[cfe-commits] r97834 - /cfe/trunk/include/clang/Basic/TokenKinds.def

[Douglas Gregor]

Author: dgregor
Date: Fri Mar  5 15:39:18 2010
New Revision: 97834

URL: http://llvm.org/viewvc/llvm-project?rev=97834&view=rev
Log:
Only make __ptr64 and __w64 keywords when Microsoft extensions are enabled.


Modified:
    cfe/trunk/include/clang/Basic/TokenKinds.def

Modified: cfe/trunk/include/clang/Basic/TokenKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/TokenKinds.def?rev=97834&r1=97833&r2=97834&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/TokenKinds.def (original)
+++ cfe/trunk/include/clang/Basic/TokenKinds.def Fri Mar  5 15:39:18 2010
@@ -336,8 +336,6 @@
 KEYWORD(__cdecl                     , KEYALL)
 KEYWORD(__stdcall                   , KEYALL)
 KEYWORD(__fastcall                  , KEYALL)
-KEYWORD(__ptr64                     , KEYALL)
-KEYWORD(__w64                       , KEYALL)
 KEYWORD(__forceinline               , KEYALL)
 
 // Altivec Extension.
@@ -368,6 +366,8 @@
 ALIAS("__volatile__" , volatile   , KEYALL)
 
 // Microsoft extensions which should be disabled in strict conformance mode
+KEYWORD(__ptr64                   , KEYMS)
+KEYWORD(__w64                     , KEYMS)
 ALIAS("_asm"         , asm        , KEYMS)
 ALIAS("_cdecl"       , __cdecl    , KEYMS)
 ALIAS("_fastcall"    , __fastcall , KEYMS)