diff options
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/scroll.c | 5 |
2 files changed, 6 insertions, 2 deletions
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); } - |