From 24a39c0dd5b46ad2de22da1c21758e651a24bd9b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 21 Sep 2007 14:13:15 +0000 Subject: [PATCH] use libtiff/libjpeg VC-specific include files for all Win32 compilers, including mingw32 (and even when using configure which is wrong but will be fixed later) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/jpeg/jconfig.h | 6 +----- src/tiff/libtiff/tiffiop.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h index fb32795935..7b26b7feae 100644 --- a/src/jpeg/jconfig.h +++ b/src/jpeg/jconfig.h @@ -1,8 +1,4 @@ -/* This test added by JACS as a quick fix. What should we do - * to make it work with configure? - */ - -#if defined(_MSC_VER) || defined(__BORLANDC__) || defined (__DMC__) +#if defined(_WIN32) #include "jconfig.vc" #else diff --git a/src/tiff/libtiff/tiffiop.h b/src/tiff/libtiff/tiffiop.h index b791c1f357..e2b47f0036 100644 --- a/src/tiff/libtiff/tiffiop.h +++ b/src/tiff/libtiff/tiffiop.h @@ -30,7 +30,7 @@ * ``Library-private'' definitions. */ -#ifdef _MSC_VER +#if defined(_WIN32) # include "tif_config.h.vc" #else # include "tif_config.h" -- 2.47.2