summaryrefslogtreecommitdiff
path: root/libgomp
diff options
context:
space:
mode:
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2017-01-19 15:53:51 +0000
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>2017-01-19 15:53:51 +0000
commitcbc2c125ee057ed4d822f15f083a522d939c277a (patch)
treecdc14ca5c33aca4e4a20f0d5086330cc2d072799 /libgomp
parent13feeaecbc42c4f75771ca96dad30359a26bd8b9 (diff)
* plugin/cuda/cuda.h (CUdeviceptr): Typedef to unsigned long long even
for _WIN64. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244638 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgomp')
-rw-r--r--libgomp/ChangeLog5
-rw-r--r--libgomp/plugin/cuda/cuda.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 3708c3e7593a..d1c1ae1bb917 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 eb92b18f7452..25d5d1913b0f 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;