diff options
| author | Cedric Nugteren <web@cedricnugteren.nl> | 2016-10-16 11:43:03 +0200 |
|---|---|---|
| committer | Cedric Nugteren <web@cedricnugteren.nl> | 2016-10-16 11:43:03 +0200 |
| commit | 9331442a56f2969e5d4650bf0c31dd84473a4085 (patch) | |
| tree | 997aca9619e211fab040bde658e2f0f1519d2171 /include | |
| parent | 8d5747aa54b88812ef4060328e3befdb13f3f45a (diff) | |
| parent | 53deed298facc005f71e9ec2a96d5c4e90d826af (diff) | |
Merge branch 'development' into netlib_blas_api
Diffstat (limited to 'include')
| -rw-r--r-- | include/clblast.h | 4 | ||||
| -rw-r--r-- | include/clblast_c.h | 4 | ||||
| -rw-r--r-- | include/clblast_half.h | 5 |
3 files changed, 9 insertions, 4 deletions
diff --git a/include/clblast.h b/include/clblast.h index e1d4f25b..0f52b2f9 100644 --- a/include/clblast.h +++ b/include/clblast.h @@ -27,8 +27,8 @@ // Exports library functions under Windows when building a DLL. See also: // https://msdn.microsoft.com/en-us/library/a90k134d.aspx -#ifdef _WIN32 - #ifdef COMPILING_DLL +#if defined(_WIN32) && defined(CLBLAST_DLL) + #if defined(COMPILING_DLL) #define PUBLIC_API __declspec(dllexport) #else #define PUBLIC_API __declspec(dllimport) diff --git a/include/clblast_c.h b/include/clblast_c.h index a13b8e64..33fb4acf 100644 --- a/include/clblast_c.h +++ b/include/clblast_c.h @@ -24,8 +24,8 @@ // Exports library functions under Windows when building a DLL. See also: // https://msdn.microsoft.com/en-us/library/a90k134d.aspx -#ifdef _WIN32 - #ifdef COMPILING_DLL +#if defined(_WIN32) && defined(CLBLAST_DLL) + #if defined(COMPILING_DLL) #define PUBLIC_API __declspec(dllexport) #else #define PUBLIC_API __declspec(dllimport) diff --git a/include/clblast_half.h b/include/clblast_half.h index 269a520e..05d96f9f 100644 --- a/include/clblast_half.h +++ b/include/clblast_half.h @@ -25,6 +25,11 @@ #include <CL/opencl.h> #endif +// MSVC 2013 doesn't fully support C99 +#ifdef _MSC_VER + #define inline __inline +#endif + // ================================================================================================= // Host data-type for half-precision floating-point (16-bit). This is based on the OpenCL type, |