commit ab8dbdcce50cb4a210177d8a700a3fb765006766
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Thu Mar 30 12:23:15 2017 -0500
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Thu Mar 30 12:23:15 2017 -0500
tree 5c0c5bc9301db24f0b9f566401262203ef5fc5ec
parent 8c50acb9d2522d4a2a80a929081e9f83af0bec90
parent 7bbd665b34b0ad5074fc0dd44cf20838baeeafa3

Merge branch 'conststrip' of git://github.com/vszakats/libpng into libpng16

pngpriv.h

diff --git a/pngpriv.h b/pngpriv.h
index 6d2e424..0b13740 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -466,7 +466,16 @@
    static_cast<type>(static_cast<const void*>(value))
 #else
 #  define png_voidcast(type, value) (value)
-#  define png_constcast(type, value) ((type)(value))
+#  ifdef _WIN64
+#     ifdef __GNUC__
+         typedef unsigned long long png_ptruint;
+#     else
+         typedef unsigned __int64 png_ptruint;
+#     endif
+#  else
+      typedef unsigned long png_ptruint;
+#  endif
+#  define png_constcast(type, value) ((type)(png_ptruint)(const void*)(value))
 #  define png_aligncast(type, value) ((void*)(value))
 #  define png_aligncastconst(type, value) ((const void*)(value))
 #endif /* __cplusplus */