(Vcharacter_name_table): New variable.

[chise/xemacs-chise.git] / src / glyphs-x.h

diff --git a/src/glyphs-x.h b/src/glyphs-x.h
index d49ba53..3ef30f3 100644 (file)
--- a/src/glyphs-x.h
+++ b/src/glyphs-x.h
@@ -23,8 +23,8 @@ Boston, MA 02111-1307, USA.  */
 
 /* Synched up with:  Not in FSF. */
 
-#ifndef _XEMACS_GLYPHS_X_H_
-#define _XEMACS_GLYPHS_X_H_
+#ifndef INCLUDED_glyphs_x_h_
+#define INCLUDED_glyphs_x_h_
 
 #include "glyphs.h"
 
@@ -96,7 +96,7 @@ struct x_subwindow_data
       Window parent_window;
       Window clip_window;
     } sub;
-    struct 
+    struct
     {
       Widget clip_window;
       Position x_offset;
@@ -137,9 +137,9 @@ struct x_subwindow_data
 #define XIMAGE_INSTANCE_X_CLIPWINDOW(i) \
   IMAGE_INSTANCE_X_CLIPWINDOW (XIMAGE_INSTANCE (i))
 #define IMAGE_INSTANCE_X_SUBWINDOW_ID(i) \
-  ((Window) IMAGE_INSTANCE_SUBWINDOW_ID (i))
+  (* (Window *) & IMAGE_INSTANCE_SUBWINDOW_ID (i))
 #define IMAGE_INSTANCE_X_WIDGET_ID(i) \
-  ((Widget) IMAGE_INSTANCE_SUBWINDOW_ID (i))
+  (* (Widget *) & IMAGE_INSTANCE_SUBWINDOW_ID (i))
 
 #endif /* HAVE_X_WINDOWS */
-#endif /* _XEMACS_GLYPHS_X_H_ */
+#endif /* INCLUDED_glyphs_x_h_ */