From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 9 Mar 2011 07:11:42 +0000 (-0800)
Subject: * xterm.c (x_iconify_frame, x_free_frame_resources): Don't declare locals
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~605^2^2~24
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ed7bf3a5ee1e31dafbb2d285b39c8fe07fc06f7c;p=emacs.git

* xterm.c (x_iconify_frame, x_free_frame_resources): Don't declare locals

unless they are used.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 7f9e68e71e5..0a14f36dbe7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,6 +8,8 @@
 	(x_calc_absolute_position): Now static.
 	(XTread_socket): Don't define label "out" unless it's used.
 	Don't declare local "event" unless it's used.
+	(x_iconify_frame, x_free_frame_resources): Don't declare locals
+	unless they are used.
 
 	* xfaces.c (clear_face_cache, Fx_list_fonts, Fface_font): Rename
 	or move locals to avoid shadowing.
diff --git a/src/xterm.c b/src/xterm.c
index f253ed0aa3f..9220d84815c 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9166,7 +9166,9 @@ x_make_frame_invisible (struct frame *f)
 void
 x_iconify_frame (struct frame *f)
 {
+#ifdef USE_X_TOOLKIT
   int result;
+#endif
   Lisp_Object type;
 
   /* Don't keep the highlight on an invisible frame.  */
@@ -9293,9 +9295,11 @@ void
 x_free_frame_resources (struct frame *f)
 {
   struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
+  Mouse_HLInfo *hlinfo = &dpyinfo->mouse_highlight;
+#ifdef USE_X_TOOLKIT
   Lisp_Object bar;
   struct scroll_bar *b;
-  Mouse_HLInfo *hlinfo = &dpyinfo->mouse_highlight;
+#endif
 
   BLOCK_INPUT;