X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fxmu.h;h=d6cebe4533182da8f9973f9fe6283a33ff68594b;hb=767a4d3c6cc84c530d28f5fa02f51c23ccd29f4e;hp=f2d42d175c53bb39eb01f036463456ac583d6c43;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git.1

diff --git a/src/xmu.h b/src/xmu.h
index f2d42d1..d6cebe4 100644
--- a/src/xmu.h
+++ b/src/xmu.h
@@ -2,6 +2,9 @@
 
 /* Synched up with: Not in FSF. */
 
+#ifndef INCLUDED_xmu_h_
+#define INCLUDED_xmu_h_
+
 #ifdef HAVE_XMU
 
 # include <X11/Xmu/CharSet.h>
@@ -9,6 +12,7 @@
 # include <X11/Xmu/CurUtil.h>
 # include <X11/Xmu/Drawing.h>
 # include <X11/Xmu/Error.h>
+# include <X11/Xmu/Misc.h>
 
 /* Do the EDITRES protocol if running X11R5 (or later) version */
 #if (XtSpecificationRelease >= 5) 
@@ -20,12 +24,19 @@
 
 #else
 
-int XmuCursorNameToIndex (CONST char *name);
-int XmuReadBitmapDataFromFile (CONST char *filename, unsigned int *width,
+int XmuCursorNameToIndex (const char *name);
+int XmuReadBitmapDataFromFile (const char *filename, unsigned int *width,
                                unsigned int *height, unsigned char **datap,
                                int *x_hot, int *y_hot);
 int XmuPrintDefaultErrorMessage (Display *dpy, XErrorEvent *event, FILE *fp);
-void XmuCopyISOLatin1Lowered (char *, CONST char *);
+void XmuCopyISOLatin1Lowered (char *, const char *);
+
+#define Max(x, y)       (((x) > (y)) ? (x) : (y))
+#define Min(x, y)       (((x) < (y)) ? (x) : (y))
+#define AssignMax(x, y) {if ((y) > (x)) x = (y);}
+#define AssignMin(x, y) {if ((y) < (x)) x = (y);}
+typedef enum {XtorientHorizontal, XtorientVertical} XtOrientation;
 
-#endif
+#endif /* HAVE_XMU */
 
+#endif /* INCLUDED_xmu_h_ */