use libtiff/libjpeg VC-specific include files for all Win32 compilers, including...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/jpeg/jconfig.h b/src/jpeg/jconfig.h
index fb327959356366a79494f3f7d25302fcbfcedb25..7b26b7feae952a5e401692a25801f578a075aea6 100644 (file)
--- 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
 
 #include "jconfig.vc"
 #else
 

diff --git a/src/tiff/libtiff/tiffiop.h b/src/tiff/libtiff/tiffiop.h
index b791c1f357da6875f6bf59a13006a8130c45232f..e2b47f0036a0f74c640ece2c11bcbd5f6491204e 100644 (file)
--- a/src/tiff/libtiff/tiffiop.h
+++ b/src/tiff/libtiff/tiffiop.h
@@ -30,7 +30,7 @@
  * ``Library-private'' definitions.
  */
 
  * ``Library-private'' definitions.
  */
 

-#ifdef _MSC_VER
+#if defined(_WIN32)

 # include "tif_config.h.vc"
 #else
 # include "tif_config.h"
 # include "tif_config.h.vc"
 #else
 # include "tif_config.h"