aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-08-13 19:39:59 -0700
committerPaul Eggert2012-08-13 19:39:59 -0700
commit5884c3244a764191661ee8d908229be0260336dc (patch)
tree3e036e4de256c1feca8d5614180251a2787df7af /src
parent92cb3b044b0654babb07a8491242c1719f48100b (diff)
downloademacs-5884c3244a764191661ee8d908229be0260336dc.tar.gz
emacs-5884c3244a764191661ee8d908229be0260336dc.zip
* gtkutil.c (xg_mark_data): Don't assume C99.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/gtkutil.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 538a8d235de..fd39d7bdc0c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-08-14 Paul Eggert <eggert@cs.ucla.edu>
2
3 * gtkutil.c (xg_mark_data): Don't assume C99.
4
12012-08-13 Jan Djärv <jan.h.d@swipnet.se> 52012-08-13 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * gtkutil.c (xg_frame_tb_info): New struct. 7 * gtkutil.c (xg_frame_tb_info): New struct.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 6b74e27eb7a..623f32a7b56 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -2150,6 +2150,7 @@ void
2150xg_mark_data (void) 2150xg_mark_data (void)
2151{ 2151{
2152 xg_list_node *iter; 2152 xg_list_node *iter;
2153 Lisp_Object rest, frame;
2153 2154
2154 for (iter = xg_menu_cb_list.next; iter; iter = iter->next) 2155 for (iter = xg_menu_cb_list.next; iter; iter = iter->next)
2155 mark_object (((xg_menu_cb_data *) iter)->menu_bar_vector); 2156 mark_object (((xg_menu_cb_data *) iter)->menu_bar_vector);
@@ -2162,7 +2163,6 @@ xg_mark_data (void)
2162 mark_object (cb_data->help); 2163 mark_object (cb_data->help);
2163 } 2164 }
2164 2165
2165 Lisp_Object rest, frame;
2166 FOR_EACH_FRAME (rest, frame) 2166 FOR_EACH_FRAME (rest, frame)
2167 { 2167 {
2168 FRAME_PTR f = XFRAME (frame); 2168 FRAME_PTR f = XFRAME (frame);