From 9cc9d6113cc2b25e1651771c967990939ce09581 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Sun, 4 May 2014 23:31:59 +0200 Subject: gs: fix truetype interpreter for amd64 --- sys/src/cmd/gs/src/ttfsfnt.h | 4 ++++ sys/src/cmd/gs/src/tttypes.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/src/cmd/gs/src/ttfsfnt.h b/sys/src/cmd/gs/src/ttfsfnt.h index d998b93cb..bef9b4937 100644 --- a/sys/src/cmd/gs/src/ttfsfnt.h +++ b/sys/src/cmd/gs/src/ttfsfnt.h @@ -47,6 +47,8 @@ typedef int16_t F2Dot14; /* 2.14 16-bit signed fixed-point number */ typedef int32_t F26Dot6; /* 26.6 32-bit signed fixed-point number */ #endif +#pragma pack on + typedef struct { uint32 bc; uint32 ad; @@ -349,4 +351,6 @@ typedef struct FontTableInfo { #define RAW_TRUE_TYPE_SIZE 512 +#pragma pack off + #endif diff --git a/sys/src/cmd/gs/src/tttypes.h b/sys/src/cmd/gs/src/tttypes.h index 4db69f009..62de545ee 100644 --- a/sys/src/cmd/gs/src/tttypes.h +++ b/sys/src/cmd/gs/src/tttypes.h @@ -118,11 +118,7 @@ #endif #ifdef Plan9 -#ifdef Tamd64 - typedef unsigned long long* PStorage; -#else typedef unsigned int* PStorage; -#endif #elif ARCH_SIZEOF_PTR == SIZEOF_LONG typedef long* PStorage; #elif ARCH_SIZEOF_PTR == SIZEOF_INT -- cgit v1.2.3