Mercurial > hg > xemacs-beta
diff src/event-Xt.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/event-Xt.c Tue Oct 28 10:38:26 2008 +0900 +++ b/src/event-Xt.c Wed Oct 29 03:37:16 2008 +0900 @@ -109,9 +109,7 @@ extern SELECT_TYPE input_wait_mask, non_fake_input_wait_mask; extern SELECT_TYPE process_only_mask, tty_only_mask; -/* #### 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[] = +static const String x_fallback_resources[] = { /* This file is automatically generated from the app-defaults file in ../etc/Emacs.ad. These resources are consulted only if no @@ -3128,8 +3126,8 @@ static XtActionsRec widgetActionsList[] = { - { (String) "widget-focus-in", emacs_Xt_event_widget_focus_in }, - { (String) "widget-focus-out", emacs_Xt_event_widget_focus_out }, + {"widget-focus-in", emacs_Xt_event_widget_focus_in }, + {"widget-focus-out", emacs_Xt_event_widget_focus_out }, }; static void