Mercurial > hg > xemacs-beta
diff src/event-Xt.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 | 2fd201d73a92 |
line wrap: on
line diff
--- a/src/event-Xt.c Wed Oct 29 04:02:05 2008 +0900 +++ b/src/event-Xt.c Wed Oct 29 04:06:33 2008 +0900 @@ -109,7 +109,9 @@ extern SELECT_TYPE input_wait_mask, non_fake_input_wait_mask; extern SELECT_TYPE process_only_mask, tty_only_mask; -static const String x_fallback_resources[] = +/* #### This should be String, but G++ 4.3 doesn't apply the const + specifier the same way for String (typedef'd to char*) and char*. */ +static const char * x_fallback_resources[] = { /* This file is automatically generated from the app-defaults file in ../etc/Emacs.ad. These resources are consulted only if no @@ -3126,8 +3128,8 @@ static XtActionsRec widgetActionsList[] = { - {"widget-focus-in", emacs_Xt_event_widget_focus_in }, - {"widget-focus-out", emacs_Xt_event_widget_focus_out }, + { (String) "widget-focus-in", emacs_Xt_event_widget_focus_in }, + { (String) "widget-focus-out", emacs_Xt_event_widget_focus_out }, }; static void