Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-08-08 15:26:46 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-08-08 15:27:28 +0300
commitd85af2aa3f70ae3b95d10931323a916bfa1b8ebe (patch)
treefffe5fe71b31da4c03b4718364ee0bec09a07ff8 /extern/cuew
parentc8a8589d4f1d38fa20d8fe5d4e006bb8d7770bbc (diff)
Update CUEW to latest version
Previous update pulled too much of system-wide typedefs.
Diffstat (limited to 'extern/cuew')
-rw-r--r--extern/cuew/README.blender2
-rw-r--r--extern/cuew/include/cuew.h39
2 files changed, 10 insertions, 31 deletions
diff --git a/extern/cuew/README.blender b/extern/cuew/README.blender
index ef36c110e3f..a53a927c25f 100644
--- a/extern/cuew/README.blender
+++ b/extern/cuew/README.blender
@@ -1,5 +1,5 @@
Project: Cuda Wrangler
URL: https://github.com/CudaWrangler/cuew
License: Apache 2.0
-Upstream version: 3dd0b01
+Upstream version: cbf465b
Local modifications: None
diff --git a/extern/cuew/include/cuew.h b/extern/cuew/include/cuew.h
index c90ab39601a..0eace96bc3f 100644
--- a/extern/cuew/include/cuew.h
+++ b/extern/cuew/include/cuew.h
@@ -116,6 +116,15 @@ extern "C" {
#define cuGLGetDevices cuGLGetDevices_v2
/* Types. */
+#ifdef _MSC_VER
+typedef unsigned __int32 cuuint32_t;
+typedef unsigned __int64 cuuint64_t;
+#else
+#include <stdint.h>
+typedef uint32_t cuuint32_t;
+typedef uint64_t cuuint64_t;
+#endif
+
#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined (__aarch64__)
typedef unsigned long long CUdeviceptr;
#else
@@ -131,36 +140,6 @@ typedef unsigned int CUdeviceptr;
# define CUDA_CB
#endif
-typedef signed char int8_t;
-typedef short int int16_t;
-typedef int int32_t;
-typedef long int int64_t;
-typedef unsigned char uint8_t;
-typedef unsigned short int uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long int uint64_t;
-typedef signed char int_least8_t;
-typedef short int int_least16_t;
-typedef int int_least32_t;
-typedef long int int_least64_t;
-typedef unsigned char uint_least8_t;
-typedef unsigned short int uint_least16_t;
-typedef unsigned int uint_least32_t;
-typedef unsigned long int uint_least64_t;
-typedef signed char int_fast8_t;
-typedef long int int_fast16_t;
-typedef long int int_fast32_t;
-typedef long int int_fast64_t;
-typedef unsigned char uint_fast8_t;
-typedef unsigned long int uint_fast16_t;
-typedef unsigned long int uint_fast32_t;
-typedef unsigned long int uint_fast64_t;
-typedef long int intptr_t;
-typedef unsigned long int uintptr_t;
-typedef long int intmax_t;
-typedef unsigned long int uintmax_t;
-typedef uint32_t cuuint32_t;
-typedef uint64_t cuuint64_t;
typedef int CUdevice;
typedef struct CUctx_st* CUcontext;
typedef struct CUmod_st* CUmodule;