diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-03-05 21:39:18 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-03-05 21:39:18 +0000 |
| commit | 554e13efc63ad8fd37f7ee7fa2b066aa4d2ecec1 (patch) | |
| tree | 3f2dd19a937ddc1e1c59c36a204468a4c54c70de | |
| parent | 0c7c2f8b4dd5e8d6cbf7c72142302e7e63c430ee (diff) | |
| download | bcm5719-llvm-554e13efc63ad8fd37f7ee7fa2b066aa4d2ecec1.tar.gz bcm5719-llvm-554e13efc63ad8fd37f7ee7fa2b066aa4d2ecec1.zip | |
Only make __ptr64 and __w64 keywords when Microsoft extensions are enabled.
llvm-svn: 97834
| -rw-r--r-- | clang/include/clang/Basic/TokenKinds.def | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/include/clang/Basic/TokenKinds.def b/clang/include/clang/Basic/TokenKinds.def index 522ac13b4e3..52e83f4045e 100644 --- a/clang/include/clang/Basic/TokenKinds.def +++ b/clang/include/clang/Basic/TokenKinds.def @@ -336,8 +336,6 @@ KEYWORD(__declspec , KEYALL) 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) 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) |
