3 files changed, 10 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index dcbab4b96b7..baf0c1f10a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2011-04-11  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * charset.h (charset_iso_8859_1): Remove decl.
+        * charset.c (charset_iso_8859_1, charset_emacs, map_charset_for_dump):
+        Now static.
+
         * ccl.h (check_ccl_update, Vccl_program_table): Remove decls.
         * ccl.c (Vccl_program_table): Now static.
         (check_ccl_update): Remove; unused.
diff --git a/src/charset.c b/src/charset.c
index dc91cea2e12..cc7c53ae61c 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -76,9 +76,9 @@ static Lisp_Object Qemacs;
 /* The corresponding charsets.  */
 int charset_ascii;
 int charset_eight_bit;
-int charset_iso_8859_1;
+static int charset_iso_8859_1;
 int charset_unicode;
-int charset_emacs;
+static int charset_emacs;
 
 /* The other special charsets.  */
 int charset_jisx0201_roman;
@@ -652,12 +652,10 @@ DEFUN ("charsetp", Fcharsetp, Scharsetp, 1, 1, 0,
 }
 
 
-void map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object),
-                           Lisp_Object function, Lisp_Object arg,
-                           unsigned from, unsigned to);
-
-void
-map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object), Lisp_Object function, Lisp_Object arg, unsigned int from, unsigned int to)
+static void
+map_charset_for_dump (void (*c_function) (Lisp_Object, Lisp_Object),
+                      Lisp_Object function, Lisp_Object arg,
+                      unsigned int from, unsigned int to)
 {
   int from_idx = CODE_POINT_TO_INDEX (temp_charset_work->current, from);
   int to_idx = CODE_POINT_TO_INDEX (temp_charset_work->current, to);
diff --git a/src/charset.h b/src/charset.h
index fef50394e6e..74d55a31b43 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -519,7 +519,6 @@ extern Lisp_Object Qcharsetp;
 
 extern Lisp_Object Qascii;
 extern int charset_ascii, charset_eight_bit;
-extern int charset_iso_8859_1;
 extern int charset_unicode;
 extern int charset_jisx0201_roman;
 extern int charset_jisx0208_1978;