From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 27 Feb 2011 07:50:33 +0000 (-0800)
Subject: * scroll.c (CHECK_BOUNDS): #define only if GLYPH_DEBUG.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~715^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c783d15b93c536b1d2d07a0e9ca9462d1f377120;p=emacs.git

* scroll.c (CHECK_BOUNDS): #define only if GLYPH_DEBUG.

This avoids a gcc warning in some configurations.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5c5bd61d061..1929c3fc98a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-02-27  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* scroll.c (CHECK_BOUNDS): #define only if GLYPH_DEBUG.
+	This avoids a gcc warning in some configurations.
+
 	* frame.c (x_set_screen_gamma): Rename local to avoid shadowing.
 
 	* frame.h: Avoid gcc -Wmissing-prototypes diagnostics.
diff --git a/src/scroll.c b/src/scroll.c
index 08ae83eeee8..1343b89c41e 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -262,7 +262,8 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, struct m
   for (k = 0; k < window_size; ++k)
     copy_from[k] = -1;
 
-#define CHECK_BOUNDS							\
+#if GLYPH_DEBUG
+# define CHECK_BOUNDS							\
   do									\
     {									\
       int k;								\
@@ -271,6 +272,7 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, struct m
 		 || (copy_from[k] >= 0 && copy_from[k] < window_size));	\
     }									\
   while (0);
+#endif
 
   /* When j is advanced, this corresponds to deleted lines.
      When i is advanced, this corresponds to inserted lines.  */
@@ -1035,4 +1037,3 @@ do_line_insertion_deletion_costs (FRAME_PTR frame,
 		 FRAME_DELETE_COST (frame), FRAME_DELETEN_COST (frame),
 		 coefficient);
 }
-