ref: e5a90c0e3ca7bc2a6403f7bc86ae63b375284699
parent: 4373c0b828f05aa6a765b13e8a9b111ed0b9a513
parent: 826f4c0daffe7c7d7599f407c2c6897823b64b6e
author: ftrvxmtrx <devnull@localhost>
date: Sat May 3 23:16:37 EDT 2014
merge
--- a/sys/src/cmd/gs/src/ttfsfnt.h
+++ b/sys/src/cmd/gs/src/ttfsfnt.h
@@ -47,6 +47,8 @@
typedef int32_t F26Dot6; /* 26.6 32-bit signed fixed-point number */
#endif
+#pragma pack on
+
typedef struct {uint32 bc;
uint32 ad;
@@ -348,5 +350,7 @@
} FontTableInfo;
#define RAW_TRUE_TYPE_SIZE 512
+
+#pragma pack off
#endif
--- a/sys/src/cmd/gs/src/ttinterp.c
+++ b/sys/src/cmd/gs/src/ttinterp.c
@@ -166,7 +166,7 @@
#endif
-#define INS_ARG EXEC_OPS PStorage args /* see ttexec.h */
+#define INS_ARG EXEC_OPS PLong args /* see ttexec.h */
#define SKIP_Code() SkipCode( EXEC_ARG )
--- a/sys/src/cmd/gs/src/ttobjs.h
+++ b/sys/src/cmd/gs/src/ttobjs.h
@@ -589,7 +589,7 @@
PLong cvt;
Int storeSize; /* The storage area is now part of the */
- PStorage storage; /* instance */
+ PLong storage; /* instance */
};
@@ -638,11 +638,11 @@
/* useful for the debugger */
Int storeSize; /* size of current storage */
- PStorage storage; /* storage area */
+ PLong storage; /* storage area */
Int stackSize; /* size of exec. stack */
Int top; /* top of exec. stack */
- PStorage stack; /* current exec. stack */
+ PLong stack; /* current exec. stack */
Int args,
new_top; /* new top after exec. */
--- a/sys/src/cmd/gs/src/tttables.h
+++ b/sys/src/cmd/gs/src/tttables.h
@@ -191,7 +191,7 @@
struct _TLoca
{UShort Size;
- PStorage Table;
+ PLong Table;
};
typedef struct _TLoca TLoca;
--- a/sys/src/cmd/gs/src/tttypes.h
+++ b/sys/src/cmd/gs/src/tttypes.h
@@ -117,21 +117,6 @@
#define NULL (void*)0
#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
- typedef int* PStorage;
-#else
-#error "Size of pointer type is not equal to either long or int"
-#endif
-
-
/* Rounding mode constants */
#define TT_Round_Off 5