From f74158a38db37d3ffe46c85884806f3cf00b0687 Mon Sep 17 00:00:00 2001 From: Sacha Refshauge Date: Tue, 6 Jun 2017 09:50:20 +1000 Subject: [PATCH] Fix MSVC2015 --- src/libversions.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libversions.c b/src/libversions.c index 722f133bb..d79c26712 100644 --- a/src/libversions.c +++ b/src/libversions.c @@ -50,6 +50,10 @@ * for some gcc compiler versions in a warning. The conflict is harmless * but we suppress it by undefining the variable. */ #undef HAVE_STDLIB_H +// Include basetsd.h first to ensure _BASETSD_H_ gets defined beffore jpeglib tries to define INT32 et al. +#ifdef _MSC_VER +#include +#endif #include "jpeglib.h" #include "jerror.h" #endif