Commit c783d15b authored by Paul Eggert's avatar Paul Eggert
Browse files

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

This avoids a gcc warning in some configurations.
parent 76c1cebc
2011-02-27 Paul Eggert <eggert@cs.ucla.edu> 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.c (x_set_screen_gamma): Rename local to avoid shadowing.
   
* frame.h: Avoid gcc -Wmissing-prototypes diagnostics. * frame.h: Avoid gcc -Wmissing-prototypes diagnostics.
...@@ -262,7 +262,8 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, struct m ...@@ -262,7 +262,8 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, struct m
for (k = 0; k < window_size; ++k) for (k = 0; k < window_size; ++k)
copy_from[k] = -1; copy_from[k] = -1;
#define CHECK_BOUNDS \ #if GLYPH_DEBUG
# define CHECK_BOUNDS \
do \ do \
{ \ { \
int k; \ int k; \
...@@ -271,6 +272,7 @@ do_scrolling (struct frame *frame, struct glyph_matrix *current_matrix, struct m ...@@ -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)); \ || (copy_from[k] >= 0 && copy_from[k] < window_size)); \
} \ } \
while (0); while (0);
#endif
/* When j is advanced, this corresponds to deleted lines. /* When j is advanced, this corresponds to deleted lines.
When i is advanced, this corresponds to inserted lines. */ When i is advanced, this corresponds to inserted lines. */
...@@ -1035,4 +1037,3 @@ do_line_insertion_deletion_costs (FRAME_PTR frame, ...@@ -1035,4 +1037,3 @@ do_line_insertion_deletion_costs (FRAME_PTR frame,
FRAME_DELETE_COST (frame), FRAME_DELETEN_COST (frame), FRAME_DELETE_COST (frame), FRAME_DELETEN_COST (frame),
coefficient); coefficient);
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment