(struct _XCharStruct): Each member now takes short value.

2 files changed, 12 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 51af064232b..0a110990244 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-28  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macgui.h (struct _XCharStruct): Each member now takes short value.
+
 2005-09-27  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * xfaces.c (lookup_derived_face): Add parameter type.
diff --git a/src/macgui.h b/src/macgui.h
index 607890317e1..fc777de03ba 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -95,11 +95,14 @@ typedef GWorldPtr Pixmap;
 /* Emulate XCharStruct.  */
 typedef struct _XCharStruct
 {
-  int rbearing;
-  int lbearing;
-  int width;
-  int ascent;
-  int descent;
+  short lbearing;               /* origin to left edge of raster */
+  short rbearing;               /* origin to right edge of raster */
+  short width;                  /* advance to next char's origin */
+  short ascent;                 /* baseline to top edge of raster */
+  short descent;                /* baseline to bottom edge of raster */
+#if 0
+  unsigned short attributes;    /* per char flags (not predefined) */
+#endif
 } XCharStruct;
 
 #define STORE_XCHARSTRUCT(xcs, w, bds)                  \