summaryrefslogtreecommitdiff
path: root/Build/source/texk/ps2pkm
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-07-17 16:08:25 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-07-17 16:08:25 +0000
commitf9f170e6483ce11f02a97e26b1ccf0a3e8cb9bfc (patch)
treeaef406659c131b665910c2bb48e0ccb132de5610 /Build/source/texk/ps2pkm
parent3d92be8e488983918d91c10fc014881310317265 (diff)
various small fixes for 64Bit systems
texk/dvipsk: add casts to avoid compiler warnings texk/gsftopk: add casts to avoid compiler warnings texk/ps2pkm: import changes from libs/t1lib texk/ttfdump: add casts to avoid compiler warnings texk/dviljk: add casts for printing and proper format specs for scanf to avoid compiler warnings and potential bugs git-svn-id: svn://tug.org/texlive/trunk@14299 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/ps2pkm')
-rw-r--r--Build/source/texk/ps2pkm/ChangeLog7
-rw-r--r--Build/source/texk/ps2pkm/regions.c7
-rw-r--r--Build/source/texk/ps2pkm/util.c6
3 files changed, 9 insertions, 11 deletions
diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog
index 7b0f4ef46db..225eeb0b2c6 100644
--- a/Build/source/texk/ps2pkm/ChangeLog
+++ b/Build/source/texk/ps2pkm/ChangeLog
@@ -1,7 +1,12 @@
+2009-07-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * regions.c (NewEdge): align to sizeof(long), as in t1lib.
+ * util.c (vm_alloc): align to 64-bit boundary, as in t1lib.
+
2009-06-23 Peter Breitenlohner <peb@mppmu.mpg.de>
* fontfcn.c, regions.c, regions.h, scanfont.c, t1funcs.c:
- drop #ifdef HAVE_PROTOTYPES, unconditionalty use prototypes.
+ drop #ifdef HAVE_PROTOTYPES, unconditionally use prototypes.
2009-06-22 Peter Breitenlohner <peb@mppmu.mpg.de>
diff --git a/Build/source/texk/ps2pkm/regions.c b/Build/source/texk/ps2pkm/regions.c
index 6d778b9e8d4..a5979d9681c 100644
--- a/Build/source/texk/ps2pkm/regions.c
+++ b/Build/source/texk/ps2pkm/regions.c
@@ -308,11 +308,8 @@ 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:
*/
-#if defined (__alpha)
- iy = ymin - (((long) xvalues) & (sizeof(LONG) - 1)) / sizeof(pel);
-#else
- iy = ymin - (((int) xvalues) & (sizeof(LONG) - 1)) / sizeof(pel);
-#endif
+ iy = ymin - (((unsigned long) xvalues) & (sizeof(LONG) - 1)) / sizeof(pel);
+
r = (struct edgelist *)Allocate(sizeof(struct edgelist), &template,
(ymax - iy) * sizeof(pel));
diff --git a/Build/source/texk/ps2pkm/util.c b/Build/source/texk/ps2pkm/util.c
index 21fb13b43a9..81afafb9516 100644
--- a/Build/source/texk/ps2pkm/util.c
+++ b/Build/source/texk/ps2pkm/util.c
@@ -66,12 +66,8 @@ char *vm_alloc(bytes)
{
char *answer;
- /* Round to next LONG multiple (32-bit) */
-#if defined(sun) || defined(__hpux) || defined(__alpha)
+ /* Align returned bytes to 64-bit boundary */
bytes = (bytes + 7) & ~7;
-#else
- bytes = (bytes + 3) & ~3;
-#endif
/* take space from what is left otherwise allocate another CHUNK */
if (bytes > vm_free)