summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2017-08-08 18:15:02 +0000
committerHans Wennborg <hans@hanshq.net>2017-08-08 18:15:02 +0000
commit05a0489dadd09cf9bc6694b63872877a869918ae (patch)
tree5996d033eaa326c194a168e7ec01a95183fff81b
parent8df2b6dec1451e65ab500939da3e9bf394236a42 (diff)
Merging r310359:
------------------------------------------------------------------------ r310359 | n.bozhenov | 2017-08-08 07:13:50 -0700 (Tue, 08 Aug 2017) | 4 lines [libclang] Fix PR34055 (incompatible update of clang-c/Index.h) Fixes a regression introduced by r308218. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_50@310390 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/clang-c/Index.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/clang-c/Index.h b/include/clang-c/Index.h
index b35f436e91..3b5ea9fa53 100644
--- a/include/clang-c/Index.h
+++ b/include/clang-c/Index.h
@@ -3206,6 +3206,8 @@ enum CXCallingConv {
CXCallingConv_X86RegCall = 8,
CXCallingConv_IntelOclBicc = 9,
CXCallingConv_Win64 = 10,
+ /* Alias for compatibility with older versions of API. */
+ CXCallingConv_X86_64Win64 = CXCallingConv_Win64,
CXCallingConv_X86_64SysV = 11,
CXCallingConv_X86VectorCall = 12,
CXCallingConv_Swift = 13,