[llvm-branch-commits] [cfe-branch] r369738 - Merging r369641:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Aug 23 00:57:37 2019
New Revision: 369738

URL: http://llvm.org/viewvc/llvm-project?rev=369738&view=rev
Log:
Merging r369641:
------------------------------------------------------------------------
r369641 | yaxunl | 2019-08-22 13:18:59 +0200 (Thu, 22 Aug 2019) | 4 lines

[OpenCL] Fix declaration of enqueue_marker

Differential Revision: https://reviews.llvm.org/D66512

------------------------------------------------------------------------

Modified:
    cfe/branches/release_90/   (props changed)
    cfe/branches/release_90/lib/Headers/opencl-c.h

Propchange: cfe/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 23 00:57:37 2019
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:366429,366448,366457,366474,366480,366483,366511,366670,366694,366699,366878,367008,367039,367055,367103,367134,367301,367305,367323,367387,367403,367520,367530,367661,367675,367802,367823,367906,368104,368202,368552,368561,368874,368940,369043,369093,369251
+/cfe/trunk:366429,366448,366457,366474,366480,366483,366511,366670,366694,366699,366878,367008,367039,367055,367103,367134,367301,367305,367323,367387,367403,367520,367530,367661,367675,367802,367823,367906,368104,368202,368552,368561,368874,368940,369043,369093,369251,369641
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_90/lib/Headers/opencl-c.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_90/lib/Headers/opencl-c.h?rev=369738&r1=369737&r2=369738&view=diff
==============================================================================
--- cfe/branches/release_90/lib/Headers/opencl-c.h (original)
+++ cfe/branches/release_90/lib/Headers/opencl-c.h Fri Aug 23 00:57:37 2019
@@ -15350,7 +15350,7 @@ ndrange_t __ovld ndrange_3D(const size_t
 ndrange_t __ovld ndrange_3D(const size_t[3], const size_t[3]);
 ndrange_t __ovld ndrange_3D(const size_t[3], const size_t[3], const size_t[3]);
 
-int __ovld enqueue_marker(queue_t, uint, const __private clk_event_t*, __private clk_event_t*);
+int __ovld enqueue_marker(queue_t, uint, const clk_event_t*, clk_event_t*);
 
 void __ovld retain_event(clk_event_t);