X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fxmu.h;h=d6cebe4533182da8f9973f9fe6283a33ff68594b;hb=562bb40b5c738a70d70f925ab3a2189975a365e1;hp=715d2eef0343d334294c4559650cb04762afd25c;hpb=ea1ea793fe6e244ef5555ed983423a204101af13;p=chise%2Fxemacs-chise.git.1 diff --git a/src/xmu.h b/src/xmu.h index 715d2ee..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 @@ -21,12 +24,12 @@ #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)) @@ -34,5 +37,6 @@ void XmuCopyISOLatin1Lowered (char *, CONST char *); #define AssignMin(x, y) {if ((y) < (x)) x = (y);} typedef enum {XtorientHorizontal, XtorientVertical} XtOrientation; -#endif +#endif /* HAVE_XMU */ +#endif /* INCLUDED_xmu_h_ */