From 5b325abf604954fc7172dfa3e436dca15897ab65 Mon Sep 17 00:00:00 2001 From: Martijn Berger Date: Tue, 28 Jun 2016 16:02:12 +0200 Subject: [msvc2015/OpenEXR] Linker hackery is no longer required in vc2015 Reviewers: juicyfruit Reviewed By: juicyfruit Differential Revision: https://developer.blender.org/D1892 --- source/blender/imbuf/intern/openexr/openexr_api.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/imbuf') diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index 611ada5b077..89e796fb7ee 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -77,7 +77,7 @@ extern "C" { // The following prevents a linking error in debug mode for MSVC using the libs in CVS -#if defined(WITH_OPENEXR) && defined(_WIN32) && defined(DEBUG) && !defined(__MINGW32__) +#if defined(WITH_OPENEXR) && defined(_WIN32) && defined(DEBUG) && !defined(__MINGW32__) && _MSC_VER < 1900 _CRTIMP void __cdecl _invalid_parameter_noinfo(void) { } -- cgit v1.2.3