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

diff --git a/src/ChangeLog b/src/ChangeLog
index 51af064232bedf0de53dfc02155b644c27dfb003..0a110990244aead9356e2e79e05b7621b5ce4e86 100644 (file)
--- 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 607890317e1c58afe23d7ea438a60232fe8459c9..fc777de03ba627416de8af94e1022ec772b6025e 100644 (file)
--- 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)                 \