From 26b20b78f7589e23c3b89e1c315637cdd0fffc94 Mon Sep 17 00:00:00 2001 From: AlexeyAB Date: Mon, 5 Dec 2016 00:25:26 +0300 Subject: [PATCH] Fix: Can be compiled on MSVS 2013 (12.0.40629.00 update 5), but not on MSVS 2013 (12.0.21005.1) --- src/cuda.h | 4 ++++ src/data.h | 4 ++++ src/utils.h | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/src/cuda.h b/src/cuda.h index 29b1eefc..32aaabb4 100644 --- a/src/cuda.h +++ b/src/cuda.h @@ -1,6 +1,10 @@ #ifndef CUDA_H #define CUDA_H +#if defined(_MSC_VER) && _MSC_VER < 1900 + #define inline __inline +#endif + extern int gpu_index; #ifdef GPU diff --git a/src/data.h b/src/data.h index 3f6ef610..618d89cf 100644 --- a/src/data.h +++ b/src/data.h @@ -2,6 +2,10 @@ #define DATA_H #include +#if defined(_MSC_VER) && _MSC_VER < 1900 + #define inline __inline +#endif + #include "matrix.h" #include "list.h" #include "image.h" diff --git a/src/utils.h b/src/utils.h index bbc67654..f569d77c 100644 --- a/src/utils.h +++ b/src/utils.h @@ -4,6 +4,10 @@ #include #include "list.h" +#if defined(_MSC_VER) && _MSC_VER < 1900 + #define snprintf(buf,len, format,...) _snprintf_s(buf, len,len, format, __VA_ARGS__) +#endif + #define SECRET_NUM -1234 #define TWO_PI 6.2831853071795864769252866