/* 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"
#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
#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_ */