summaryrefslogtreecommitdiff
path: root/Build/source/libs/zziplib/TLPATCHES/patch-03-w64-ptr
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-02-13 18:43:14 +0000
committerKarl Berry <karl@freefriends.org>2017-02-13 18:43:14 +0000
commit5ef2fb04a27cd5ef7c85fbefec889b2503259290 (patch)
tree5d213e7091d68bc4226e68d6ad83ffc774dfe370 /Build/source/libs/zziplib/TLPATCHES/patch-03-w64-ptr
parentcdedcff919defc8bac478adf4411c495e08ccd25 (diff)
rename foo/foo-PATCHES to foo/TLPATCHES for better completion
git-svn-id: svn://tug.org/texlive/trunk@43212 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/zziplib/TLPATCHES/patch-03-w64-ptr')
-rw-r--r--Build/source/libs/zziplib/TLPATCHES/patch-03-w64-ptr27
1 files changed, 27 insertions, 0 deletions
diff --git a/Build/source/libs/zziplib/TLPATCHES/patch-03-w64-ptr b/Build/source/libs/zziplib/TLPATCHES/patch-03-w64-ptr
new file mode 100644
index 00000000000..f11ec7e4819
--- /dev/null
+++ b/Build/source/libs/zziplib/TLPATCHES/patch-03-w64-ptr
@@ -0,0 +1,27 @@
+diff -ur zziplib-0.13.62.orig/zzip/zip.c zziplib-0.13.62/zzip/zip.c
+--- zziplib-0.13.62.orig/zzip/zip.c 2010-12-29 17:22:29.000000000 +0100
++++ zziplib-0.13.62/zzip/zip.c 2014-07-14 17:05:48.000000000 +0200
+@@ -374,15 +374,19 @@
+ * making pointer alignments to values that can be handled as structures
+ * is tricky. We assume here that an align(4) is sufficient even for
+ * 64 bit machines. Note that binary operations are not usually allowed
+- * to pointer types but we do need only the lower bits in this implementation,
+- * so we can just cast the value to a long value.
++ * to pointer types but we can cast the value to a suitably sized integer.
+ */
+ _zzip_inline static char *
+ __zzip_aligned4(char *p)
+ {
+ #define aligned4 __zzip_aligned4
+- p += ((long) p) & 1; /* warnings about truncation of a "pointer" */
+- p += ((long) p) & 2; /* to a "long int" may be safely ignored :) */
++#ifdef _WIN64
++ p += ((__int64) p) & 1;
++ p += ((__int64) p) & 2;
++#else
++ p += ((long) p) & 1;
++ p += ((long) p) & 2;
++#endif
+ return p;
+ }
+