Mercurial > hg > xemacs-beta
diff src/input-method-xlib.c @ 4522:fc7067b7f407
Backout last patch; forgot to specify file.
author | Stephen J. Turnbull <stephen@xemacs.org> |
---|---|
date | Wed, 29 Oct 2008 03:37:16 +0900 |
parents | 383ab474a241 |
children | 726060ee587c |
line wrap: on
line diff
--- a/src/input-method-xlib.c Tue Oct 28 10:38:26 2008 +0900 +++ b/src/input-method-xlib.c Wed Oct 29 03:37:16 2008 +0900 @@ -286,19 +286,19 @@ xic_vars_t xic_vars; XIC xic; -#define res(name, class_, representation, field, default_value) \ - Xt_RESOURCE (name, class_, representation, xic_vars.field, \ - XtOffsetOf(xic_vars_t, field), XtRString, default_value) +#define res(name, class_, representation, field, default_value) \ + { name, class_, representation, sizeof(xic_vars.field), \ + XtOffsetOf(xic_vars_t, field), XtRString, default_value } static XtResource resources[] = { /* name class represent'n field default value */ - res(XtNximStyles, XtCXimStyles, XtRXimStyles, styles, DefaultXIMStyles), - res(XtNfontSet, XtCFontSet, XtRFontSet, fontset, XtDefaultFontSet), - res(XtNximForeground, XtCForeground, XtRPixel, fg, XtDefaultForeground), - res(XtNximBackground, XtCBackground, XtRPixel, bg, XtDefaultBackground) + res(XtNximStyles, XtCXimStyles, XtRXimStyles, styles, (XtPointer) DefaultXIMStyles), + res(XtNfontSet, XtCFontSet, XtRFontSet, fontset, (XtPointer) XtDefaultFontSet), + res(XtNximForeground, XtCForeground, XtRPixel, fg, (XtPointer) XtDefaultForeground), + res(XtNximBackground, XtCBackground, XtRPixel, bg, (XtPointer) XtDefaultBackground) }; -#undef res + xim = DEVICE_X_XIM (d); @@ -977,7 +977,7 @@ } void -describe_XRectangle (const char *name, XRectangle *r) +describe_XRectangle (char *name, XRectangle *r) { if (r == NULL) stderr_out ("%s: NULL\n", name);