diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-01-19 16:53:51 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-01-19 16:53:51 +0100 |
| commit | b32e85fa42678b061f30fa6fc52e0713d980a6df (patch) | |
| tree | cdc14ca5c33aca4e4a20f0d5086330cc2d072799 | |
| parent | 118d5ed3212800810ad6c09c1e51649a02d4caf3 (diff) | |
| download | gcc-b32e85fa42678b061f30fa6fc52e0713d980a6df.zip gcc-b32e85fa42678b061f30fa6fc52e0713d980a6df.tar.gz gcc-b32e85fa42678b061f30fa6fc52e0713d980a6df.tar.bz2 | |
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
| -rw-r--r-- | libgomp/ChangeLog | 5 | ||||
| -rw-r--r-- | libgomp/plugin/cuda/cuda.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 3708c3e..d1c1ae1 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 eb92b18..25d5d19 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; |