* fringe.c (standard_bitmaps): Now static.

(max_used_fringe_bitmap): Now static, unless HAVE_NS.

diff --git a/src/ChangeLog b/src/ChangeLog
index ea90a2f80577864fc78d7f5fee151f671330da1b..a83bfbb2f4690c8009414566d343f6a703322351 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-13  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * fringe.c (standard_bitmaps): Now static.
+       (max_used_fringe_bitmap): Now static, unless HAVE_NS.
+
        * frame.c: Make symbols static if they're not exported.
        (x_report_frame_params, make_terminal_frame): Now static.
        (get_frame_param): Now static, unless HAVE_NS.

diff --git a/src/fringe.c b/src/fringe.c
index 281b563c9b73dbd6857c6281437fe73eb3d18f38..bc6b493584ca07a3bb8ad2db04cae0a1c2b5efd2 100644 (file)
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -427,7 +427,7 @@ static unsigned short empty_line_bits[] = {
 /* NOTE:  The order of these bitmaps must match the sequence
    used in fringe.el to define the corresponding symbols.  */
 
-struct fringe_bitmap standard_bitmaps[] =
+static struct fringe_bitmap standard_bitmaps[] =
 {
   { NULL, 0, 0, 0, 0, 0 }, /* NO_FRINGE_BITMAP */
   { FRBITS (question_mark_bits),      8, 0, ALIGN_BITMAP_CENTER, 0 },
@@ -462,6 +462,9 @@ static struct fringe_bitmap **fringe_bitmaps;
 static Lisp_Object *fringe_faces;
 static int max_fringe_bitmaps;
 
+#ifndef HAVE_NS
+static
+#endif
 int max_used_fringe_bitmap = MAX_STANDARD_FRINGE_BITMAPS;