(U+6215): Apply new conventions for glyph granularity.

[chise/xemacs-chise.git.1] / src / objects-x.h

diff --git a/src/objects-x.h b/src/objects-x.h
index de5ff4e..9241c50 100644 (file)
--- a/src/objects-x.h
+++ b/src/objects-x.h
@@ -22,8 +22,10 @@ Boston, MA 02111-1307, USA.  */
 
 /* Synched up with:  Not in FSF. */
 
-#ifndef _XEMACS_OBJECTS_X_H_
-#define _XEMACS_OBJECTS_X_H_
+/* This file Mule-ized (more like Mule-verified) by Ben Wing, 7-10-00. */
+
+#ifndef INCLUDED_objects_x_h_
+#define INCLUDED_objects_x_h_
 
 #include "objects.h"
 
@@ -43,10 +45,8 @@ struct x_color_instance_data
 #define COLOR_INSTANCE_X_COLOR(c) (X_COLOR_INSTANCE_DATA (c)->color)
 #define COLOR_INSTANCE_X_DEALLOC(c) (X_COLOR_INSTANCE_DATA (c)->dealloc_on_gc)
 
-int allocate_nearest_color (Display *display, Colormap screen_colormap, Visual *visual,
-                           XColor *color_def);
-int x_parse_nearest_color (struct device *d, XColor *color, Bufbyte *name,
-                          Bytecount len, Error_behavior errb);
+int allocate_nearest_color (Display *display, Colormap screen_colormap,
+                           Visual *visual, XColor *color_def);
 
 /*****************************************************************************
  Font-Instance
@@ -64,4 +64,5 @@ struct x_font_instance_data
 #define FONT_INSTANCE_X_TRUENAME(f) (X_FONT_INSTANCE_DATA (f)->truename)
 
 #endif /* HAVE_X_WINDOWS */
-#endif /* _XEMACS_OBJECTS_X_H_ */
+
+#endif /* INCLUDED_objects_x_h_ */