Correctly restore the originally used C locale in wxLocale dtor.

[wxWidgets.git] / src / tiff / libtiff / tif_dirread.c

diff --git a/src/tiff/libtiff/tif_dirread.c b/src/tiff/libtiff/tif_dirread.c
index f264fddb9ddd3e8ba4df209b6cfc2a9d340fa60a..56d65e017090ad5e23df7b65d768dfcc5eabf4ff 100644 (file)
--- a/src/tiff/libtiff/tif_dirread.c
+++ b/src/tiff/libtiff/tif_dirread.c
@@ -585,7 +585,7 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryFloat(TIFF* tif, TIFFDirEntry* d
                                err=TIFFReadDirEntryCheckedLong8(tif,direntry,&m);
                                if (err!=TIFFReadDirEntryErrOk)
                                        return(err);
-#if defined(__WIN32__) && (_MSC_VER < 1500)
+#if defined(__WIN32__) && defined(_MSC_VER) && (_MSC_VER < 1500)
                                /*
                                 * XXX: MSVC 6.0 does not support conversion
                                 * of 64-bit integers into floating point
@@ -696,7 +696,7 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryDouble(TIFF* tif, TIFFDirEntry*
                                err=TIFFReadDirEntryCheckedLong8(tif,direntry,&m);
                                if (err!=TIFFReadDirEntryErrOk)
                                        return(err);
-#if defined(__WIN32__) && (_MSC_VER < 1500)
+#if defined(__WIN32__) && defined(_MSC_VER) && (_MSC_VER < 1500)
                                /*
                                 * XXX: MSVC 6.0 does not support conversion
                                 * of 64-bit integers into floating point
@@ -2321,7 +2321,7 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryFloatArray(TIFF* tif, TIFFDirEnt
                                {
                                        if (tif->tif_flags&TIFF_SWAB)
                                                TIFFSwabLong8(ma);
-#if defined(__WIN32__) && (_MSC_VER < 1500)
+#if defined(__WIN32__) && defined(_MSC_VER) && (_MSC_VER < 1500)
                                        /*
                                         * XXX: MSVC 6.0 does not support
                                         * conversion of 64-bit integers into
@@ -2564,7 +2564,7 @@ TIFFReadDirEntryDoubleArray(TIFF* tif, TIFFDirEntry* direntry, double** value)
                                {
                                        if (tif->tif_flags&TIFF_SWAB)
                                                TIFFSwabLong8(ma);
-#if defined(__WIN32__) && (_MSC_VER < 1500)
+#if defined(__WIN32__) && defined(_MSC_VER) && (_MSC_VER < 1500)
                                        /*
                                         * XXX: MSVC 6.0 does not support
                                         * conversion of 64-bit integers into