Author: hans
Date: Tue Aug 8 11:15:02 2017
New Revision: 310390
URL: http://llvm.org/viewvc/llvm-project?rev=310390&view=rev
Log:
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.
------------------------------------------------------------------------
Modified:
cfe/branches/release_50/ (props changed)
cfe/branches/release_50/include/clang-c/Index.h
Propchange: cfe/branches/release_50/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 8 11:15:02 2017
@@ -1,4 +1,4 @@
/cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:308455,308824,308897,308996,309058,309112-309113,309226,309327,309382-309383,309488,309503,309523,309722,309752,309975,310057,310158,310191
+/cfe/trunk:308455,308824,308897,308996,309058,309112-309113,309226,309327,309382-309383,309488,309503,309523,309722,309752,309975,310057,310158,310191,310359
/cfe/trunk/test:170344
/cfe/trunk/test/SemaTemplate:126920
Modified: cfe/branches/release_50/include/clang-c/Index.h
URL:
http://llvm.org/viewvc/llvm-project/cfe/branches/release_50/include/clang-c/Index.h?rev=310390&r1=310389&r2=310390&view=diff
==============================================================================
--- cfe/branches/release_50/include/clang-c/Index.h (original)
+++ cfe/branches/release_50/include/clang-c/Index.h Tue Aug 8 11:15:02 2017
@@ -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,
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
