summaryrefslogtreecommitdiff
path: root/libavutil/internal.h
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2015-06-05 15:07:06 +0200
committerLuca Barbato <lu_zero@gentoo.org>2015-06-08 13:27:49 +0200
commita6f19d6a9f8d1e08653d9d77581e8c823f4955c2 (patch)
treee7a996445a339f3d7a7109a9da0a4b3c3bcf2434 /libavutil/internal.h
parentbc76c46943272515805d7ac48ca39f14826d1fed (diff)
configure: Support MSVC 2015
The C runtime C99 compatibility had been improved a lot and it now rejects some of the compatibility defines provided for the older versions. Many thanks to Ray for the time spent testing. Bug-Id: 864 CC: libav-stable@libav.org
Diffstat (limited to 'libavutil/internal.h')
-rw-r--r--libavutil/internal.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 800680a7f2..4264c4e6d5 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -130,11 +130,6 @@
#include "libm.h"
-#if defined(_MSC_VER)
-#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_strtod")
-#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_snprintf")
-#endif
-
/**
* Return NULL if CONFIG_SMALL is true, otherwise the argument
* without modification. Used to disable the definition of strings
@@ -208,6 +203,12 @@ void avpriv_request_sample(void *avc,
const char *msg, ...) av_printf_format(2, 3);
#if HAVE_LIBC_MSVCRT
+#include <crtversion.h>
+#if defined(_VC_CRT_MAJOR_VERSION) && _VC_CRT_MAJOR_VERSION < 14
+#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_strtod")
+#pragma comment(linker, "/include:"EXTERN_PREFIX"avpriv_snprintf")
+#endif
+
#define avpriv_open ff_open
#endif