summaryrefslogtreecommitdiff
path: root/Build/source/texk/ps2pkm
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-11-06 13:40:17 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-11-06 13:40:17 +0000
commitc08eff2883a952dd0f9325c51ad7968370452b02 (patch)
tree72080b810e039359df54696191cebf66f21d677b /Build/source/texk/ps2pkm
parente8386671e9408e3e71d63a518a5d8851689c3e7c (diff)
MinGW64 build: Fix minor glitches, avoid compiler warnings
git-svn-id: svn://tug.org/texlive/trunk@35527 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/ps2pkm')
-rw-r--r--Build/source/texk/ps2pkm/ChangeLog4
-rw-r--r--Build/source/texk/ps2pkm/regions.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog
index f7fadb079da..421f327b5d2 100644
--- a/Build/source/texk/ps2pkm/ChangeLog
+++ b/Build/source/texk/ps2pkm/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * regions.c [WIN64]: Use __int64 (not long) as intptr_t.
+
2014-10-14 Peter Breitenlohner <peb@mppmu.mpg.de>
* paths.c: Fixed a bug introduced by the previous "Bug fix".
diff --git a/Build/source/texk/ps2pkm/regions.c b/Build/source/texk/ps2pkm/regions.c
index 8a513c19d51..f1b4b8b4700 100644
--- a/Build/source/texk/ps2pkm/regions.c
+++ b/Build/source/texk/ps2pkm/regions.c
@@ -305,7 +305,11 @@ if the xvalues are long aligned by ANDing the address with the
(sizeof(long) - 1)--if non zero, the xvalues are not aligned well. We
set 'iy' to the ymin value that would give us good alignment:
*/
+#ifdef _WIN64
+ iy = ymin - (((unsigned __int64) xvalues) & (sizeof(int32_t) - 1)) / sizeof(pel);
+#else
iy = ymin - (((unsigned long) xvalues) & (sizeof(int32_t) - 1)) / sizeof(pel);
+#endif
r = (struct edgelist *)Allocate(sizeof(struct edgelist), &template,
(ymax - iy) * sizeof(pel));