GraphicsMagick: jasper/jas_types.h: Always provide the _PFX_PTR ...

changeset b69b1cb99d4b in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=b69b1cb99d4b
summary: jasper/jas_types.h: Always provide the _PFX_PTR definition

diffstat:

 ChangeLog                                    |   3 +++
 jp2/src/libjasper/include/jasper/jas_types.h |  17 ++++++++++-------
 www/Changelog.html                           |   2 ++
 3 files changed, 15 insertions(+), 7 deletions(-)

diffs (57 lines):

diff -r f16afdc154d1 -r b69b1cb99d4b ChangeLog
--- a/ChangeLog	Sat Aug 05 11:42:46 2023 -0500
+++ b/ChangeLog	Sat Aug 05 16:36:04 2023 -0500
@@ -1,5 +1,8 @@
 2023-08-05  Bob Friesenhahn  <[email protected]>
 
+	* jp2/src/libjasper/include/jasper/jas_types.h: MSVC 17.6.5 needs
+	the _PFX_PTR definition.
+
 	* coders/bmp.c (ReadBMPImage): Fix GCC 13.1.0 warning about
 	quantum_bits being possibly used while uninitialized.  I don't see
 	how that is possible based on current logic, but avoid the
diff -r f16afdc154d1 -r b69b1cb99d4b jp2/src/libjasper/include/jasper/jas_types.h
--- a/jp2/src/libjasper/include/jasper/jas_types.h	Sat Aug 05 11:42:46 2023 -0500
+++ b/jp2/src/libjasper/include/jasper/jas_types.h	Sat Aug 05 16:36:04 2023 -0500
@@ -86,19 +86,22 @@
 #define jas_longlong long long
 #define jas_ulonglong unsigned long long
 
+#if defined(_MSC_VER)
+ #ifndef _PFX_PTR
+  #ifdef _WIN64
+   #define _PFX_PTR  "ll"
+  #else
+   #define _PFX_PTR  "l"
+  #endif
+ #endif
+#endif
+
 #if defined(_MSC_VER) && (_MSC_VER < 1800)
 #define bool  int
 #define false 0
 #define true  1
 
 #include "../webp/src/webp/types.h"
-#ifndef _PFX_PTR
- #ifdef _WIN64
-  #define _PFX_PTR  "ll"
- #else
-  #define _PFX_PTR  "l"
- #endif
-#endif
 
 #ifndef PRIxFAST32
  #define PRIxFAST32 "x"
diff -r f16afdc154d1 -r b69b1cb99d4b www/Changelog.html
--- a/www/Changelog.html	Sat Aug 05 11:42:46 2023 -0500
+++ b/www/Changelog.html	Sat Aug 05 16:36:04 2023 -0500
@@ -40,6 +40,8 @@
 <p>2023-08-05  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>
 <ul class="simple">
+<li><p>jp2/src/libjasper/include/jasper/jas_types.h: MSVC 17.6.5 needs
+the _PFX_PTR definition.</p></li>
 <li><p>coders/bmp.c (ReadBMPImage): Fix GCC 13.1.0 warning about
 quantum_bits being possibly used while uninitialized.  I don't see
 how that is possible based on current logic, but avoid the