GraphicsMagick: When __MINGW32__ is defined then define _MSC_VER...

changeset af5795bfab2a in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=af5795bfab2a
summary: When __MINGW32__ is defined then define _MSC_VER with a useful value, it it is not already defined.

diffstat:

 ChangeLog                              |   8 ++++++++
 VisualMagick/installer/inc/version.isx |   4 ++--
 coders/msl.c                           |   4 +++-
 coders/svg.c                           |   4 +++-
 coders/url.c                           |  10 +++++++---
 configure                              |   2 ++
 configure.ac                           |   2 ++
 magick/version.h                       |   4 ++--
 www/Changelog.html                     |   7 +++++++
 9 files changed, 36 insertions(+), 9 deletions(-)

diffs (140 lines):

diff -r 3100d312ae87 -r af5795bfab2a ChangeLog
--- a/ChangeLog	Sun Apr 17 09:36:27 2022 -0500
+++ b/ChangeLog	Sun Apr 17 15:49:54 2022 -0500
@@ -1,3 +1,11 @@
+2022-04-17  Bob Friesenhahn  <[email protected]>
+
+        * coders/{msl.c, svg.c, url.c}: When __MINGW32__ is defined, then
+        only define _MSC_VER if it is not already defined.  Also define
+        _MSC_VER with a somewhat useful value.  This change is prompted by
+        a posting by "LM" to the graphicsmagick-core list on April 17,
+        2022.
+
 2022-04-16  Bob Friesenhahn  <[email protected]>
 
         * coders/png.c (ReadOnePNGImage): Make sure that ping_num_trans is
diff -r 3100d312ae87 -r af5795bfab2a VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Sun Apr 17 09:36:27 2022 -0500
+++ b/VisualMagick/installer/inc/version.isx	Sun Apr 17 15:49:54 2022 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020220416"
-#define public MagickPackageReleaseDate "snapshot-20220416"
+#define public MagickPackageVersionAddendum ".020220417"
+#define public MagickPackageReleaseDate "snapshot-20220417"
diff -r 3100d312ae87 -r af5795bfab2a coders/msl.c
--- a/coders/msl.c	Sun Apr 17 09:36:27 2022 -0500
+++ b/coders/msl.c	Sun Apr 17 15:49:54 2022 -0500
@@ -62,7 +62,9 @@
 #include "magick/utility.h"
 #if defined(MSWINDOWS)
 #  if defined(__MINGW32__)
-#    define _MSC_VER
+#    if !defined(_MSC_VER)
+#      define _MSC_VER 1200
+#    endif
 #  else
 #    include <win32config.h>
 #  endif
diff -r 3100d312ae87 -r af5795bfab2a coders/svg.c
--- a/coders/svg.c	Sun Apr 17 09:36:27 2022 -0500
+++ b/coders/svg.c	Sun Apr 17 15:49:54 2022 -0500
@@ -49,7 +49,9 @@
 #if defined(HasXML)
 #  if defined(MSWINDOWS)
 #    if defined(__MINGW32__)
-#      define _MSC_VER
+#      if !defined(_MSC_VER)
+#        define _MSC_VER 1200
+#      endif
 #    else
 #      include <win32config.h>
 #    endif
diff -r 3100d312ae87 -r af5795bfab2a coders/url.c
--- a/coders/url.c	Sun Apr 17 09:36:27 2022 -0500
+++ b/coders/url.c	Sun Apr 17 15:49:54 2022 -0500
@@ -1,5 +1,5 @@
 /*
-% Copyright (C) 2003-2016 GraphicsMagick Group
+% Copyright (C) 2003-2022 GraphicsMagick Group
 % Copyright (C) 2002 ImageMagick Studio
 %
 % This program is covered by multiple licenses, which are described in
@@ -45,14 +45,18 @@
 #include "magick/utility.h"
 #if defined(MSWINDOWS)
 #  if defined(__MINGW32__)
-#    define _MSC_VER
+#    if !defined(_MSC_VER)
+#      define _MSC_VER 1200
+#    endif
 #  else
 #    include <win32config.h>
 #  endif
 #endif
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
-#include <libxml/nanoftp.h>
+#if defined(HAVE_XMLNANOFTPNEWCTXT) && HAVE_XMLNANOFTPNEWCTXT
+#  include <libxml/nanoftp.h>
+#endif /* defined(HAVE_XMLNANOFTPNEWCTXT) && HAVE_XMLNANOFTPNEWCTXT */
 #include <libxml/nanohttp.h>
 
 /*
diff -r 3100d312ae87 -r af5795bfab2a configure
--- a/configure	Sun Apr 17 09:36:27 2022 -0500
+++ b/configure	Sun Apr 17 15:49:54 2022 -0500
@@ -26325,6 +26325,8 @@
 #
 # Check for TTF
 #
+# FIXME: freetype-config appears to be defunct!
+#
 have_ttf='no'
 LIB_TTF=''
 if test "$with_ttf" != 'no'
diff -r 3100d312ae87 -r af5795bfab2a configure.ac
--- a/configure.ac	Sun Apr 17 09:36:27 2022 -0500
+++ b/configure.ac	Sun Apr 17 15:49:54 2022 -0500
@@ -2302,6 +2302,8 @@
 #
 # Check for TTF
 #
+# FIXME: freetype-config appears to be defunct!
+#
 have_ttf='no'
 LIB_TTF=''
 if test "$with_ttf" != 'no'
diff -r 3100d312ae87 -r af5795bfab2a magick/version.h
--- a/magick/version.h	Sun Apr 17 09:36:27 2022 -0500
+++ b/magick/version.h	Sun Apr 17 15:49:54 2022 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272400
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,0
-#define MagickChangeDate   "20220416"
-#define MagickReleaseDate  "snapshot-20220416"
+#define MagickChangeDate   "20220417"
+#define MagickReleaseDate  "snapshot-20220417"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 3100d312ae87 -r af5795bfab2a www/Changelog.html
--- a/www/Changelog.html	Sun Apr 17 09:36:27 2022 -0500
+++ b/www/Changelog.html	Sun Apr 17 15:49:54 2022 -0500
@@ -35,6 +35,13 @@
 <div class="document">
 
 
+<p>2022-04-17  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
+<blockquote>
+* coders/{msl.c, svg.c, url.c}: When __MINGW32__ is defined, then
+only define _MSC_VER if it is not already defined.  Also define
+_MSC_VER with a somewhat useful value.  This change is prompted by
+a posting by &quot;LM&quot; to the graphicsmagick-core list on April 17,
+2022.</blockquote>
 <p>2022-04-16  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
 * coders/png.c (ReadOnePNGImage): Make sure that ping_num_trans is