Check for _MSC_VER definedness in libtiff code.

This avoids warnings about _MSC_VER being undefined when it's compared with
1500 when building with gcc.

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

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);
                                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
                                /*
                                 * 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);
                                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
                                /*
                                 * 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 (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
                                        /*
                                         * 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 (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
                                        /*
                                         * XXX: MSVC 6.0 does not support
                                         * conversion of 64-bit integers into

diff --git a/src/tiff/libtiff/tif_win32.c b/src/tiff/libtiff/tif_win32.c
index 42e340c2dfb1ec4ef4ed3e54d59a8f5ac93b9d44..8531797091950b180ebca111eb43eddbd4b24ed5 100644 (file)
--- a/src/tiff/libtiff/tif_win32.c
+++ b/src/tiff/libtiff/tif_win32.c
@@ -369,7 +369,7 @@ _TIFFmemcmp(const void* p1, const void* p2, tmsize_t c)
 
 #ifndef _WIN32_WCE
 
 
 #ifndef _WIN32_WCE
 

-#if (_MSC_VER < 1500)
+#if defined(_MSC_VER) && (_MSC_VER < 1500)

 #  define vsnprintf _vsnprintf
 #endif
 
 #  define vsnprintf _vsnprintf
 #endif