From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 19 Jan 2017 15:53:51 +0000 (+0100)
Subject: cuda.h (CUdeviceptr): Typedef to unsigned long long even for _WIN64.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b32e85fa42678b061f30fa6fc52e0713d980a6df;p=gcc.git

cuda.h (CUdeviceptr): Typedef to unsigned long long even for _WIN64.

	* plugin/cuda/cuda.h (CUdeviceptr): Typedef to unsigned long long even
	for _WIN64.

From-SVN: r244638
---

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 3708c3e7593..d1c1ae1bb91 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* plugin/cuda/cuda.h (CUdeviceptr): Typedef to unsigned long long even
+	for _WIN64.
+
 2017-01-17  Jakub Jelinek  <jakub@redhat.com>
 
 	* plugin/hsa.h: Add GCC runtime library exception.
diff --git a/libgomp/plugin/cuda/cuda.h b/libgomp/plugin/cuda/cuda.h
index eb92b18f745..25d5d1913b0 100644
--- a/libgomp/plugin/cuda/cuda.h
+++ b/libgomp/plugin/cuda/cuda.h
@@ -35,7 +35,7 @@ libcuda.so.1 are not available.  */
 
 typedef void *CUcontext;
 typedef int CUdevice;
-#ifdef __LP64__
+#if defined(__LP64__) || defined(_WIN64)
 typedef unsigned long long CUdeviceptr;
 #else
 typedef unsigned CUdeviceptr;