Mercurial > hg > xemacs-beta
diff src/input-method-xlib.c @ 4528:726060ee587c g++-warning-removal-2008-10-28
First draft of g++ 4.3 warning removal patch. Builds. *Needs ChangeLogs.*
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Wed, 29 Oct 2008 04:06:33 +0900 |
| parents | fc7067b7f407 |
| children | 3a87551bfeb5 |
line wrap: on
line diff
--- a/src/input-method-xlib.c Wed Oct 29 04:02:05 2008 +0900 +++ b/src/input-method-xlib.c Wed Oct 29 04:06:33 2008 +0900 @@ -286,19 +286,19 @@ xic_vars_t xic_vars; XIC xic; -#define res(name, class_, representation, field, default_value) \ - { name, class_, representation, sizeof(xic_vars.field), \ - XtOffsetOf(xic_vars_t, field), XtRString, default_value } +#define res(name, class_, representation, field, default_value) \ + Xt_RESOURCE (name, class_, representation, 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, (XtPointer) DefaultXIMStyles), - res(XtNfontSet, XtCFontSet, XtRFontSet, fontset, (XtPointer) XtDefaultFontSet), - res(XtNximForeground, XtCForeground, XtRPixel, fg, (XtPointer) XtDefaultForeground), - res(XtNximBackground, XtCBackground, XtRPixel, bg, (XtPointer) XtDefaultBackground) + res(XtNximStyles, XtCXimStyles, XtRXimStyles, styles, DefaultXIMStyles), + res(XtNfontSet, XtCFontSet, XtRFontSet, fontset, XtDefaultFontSet), + res(XtNximForeground, XtCForeground, XtRPixel, fg, XtDefaultForeground), + res(XtNximBackground, XtCBackground, XtRPixel, bg, XtDefaultBackground) }; - +#undef res xim = DEVICE_X_XIM (d); @@ -977,7 +977,7 @@ } void -describe_XRectangle (char *name, XRectangle *r) +describe_XRectangle (const char *name, XRectangle *r) { if (r == NULL) stderr_out ("%s: NULL\n", name);