master b86359d4abf 1/2: Complete pacification of build warnings on Android

[Po Lu]

branch: master
commit b86359d4abfb47820b5644adb0306bd628de6dd8
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Complete pacification of build warnings on Android
    
    * build-aux/makecounter.sh: Introduce extern declaration of
    emacs_shortlisp_counter.
    
    * src/android.c (android_class_path): Declare static.
    
    * src/androidfont.c (font_driver_class, font_spec_class)
    (integer_class, font_metrics_class, font_object_class): Declare
    static.
    
    * src/androidterm.c (android_frame_parm_handlers): Move
    declaration...
    
    * src/androidterm.h (android_frame_parm_handlers): ... here.
---
 build-aux/makecounter.sh |  1 +
 src/android.c            |  2 +-
 src/androidfont.c        | 10 +++++-----
 src/androidterm.c        |  2 --
 src/androidterm.h        |  1 +
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build-aux/makecounter.sh b/build-aux/makecounter.sh
index a63fcbb7c61..4d572d5ab80 100755
--- a/build-aux/makecounter.sh
+++ b/build-aux/makecounter.sh
@@ -36,6 +36,7 @@ cat > $1 <<EOF
 #define EXPORT __attribute__ ((visibility ("default")))
 #endif /* HAVE_ANDROID */
 
+extern int emacs_shortlisp_counter;
 #ifdef EXPORT
 EXPORT
 #endif /* EXPORT */
diff --git a/src/android.c b/src/android.c
index c25ecd88a5a..72ef9e689ef 100644
--- a/src/android.c
+++ b/src/android.c
@@ -153,7 +153,7 @@ char *android_cache_dir;
 
 /* The list of archive files within which the Java virtual macine
    looks for class files.  */
-char *android_class_path;
+static char *android_class_path;
 
 /* The display's pixel densities.  */
 double android_pixel_density_x, android_pixel_density_y;
diff --git a/src/androidfont.c b/src/androidfont.c
index 20a18327ff8..5cd23a006e8 100644
--- a/src/androidfont.c
+++ b/src/androidfont.c
@@ -136,26 +136,26 @@ struct androidfont_entity
 /* Method and class identifiers associated with the EmacsFontDriver
    class.  */
 
-struct android_emacs_font_driver font_driver_class;
+static struct android_emacs_font_driver font_driver_class;
 
 /* Field and class identifiers associated with the
    EmacsFontDriver$FontSpec class.  */
 
-struct android_emacs_font_spec font_spec_class;
+static struct android_emacs_font_spec font_spec_class;
 
 /* Method and class identifiers associated with the Integer class.  */
 
-struct android_integer integer_class;
+static struct android_integer integer_class;
 
 /* Field and class identifiers associated with the
    EmacsFontDriver$FontMetrics class.  */
 
-struct android_emacs_font_metrics font_metrics_class;
+static struct android_emacs_font_metrics font_metrics_class;
 
 /* Field and class identifiers associated with the
    EmacsFontDriver$FontObject class.  */
 
-struct android_emacs_font_object font_object_class;
+static struct android_emacs_font_object font_object_class;
 
 /* The font cache.  */
 
diff --git a/src/androidterm.c b/src/androidterm.c
index e1cd96c9176..67c20ec5245 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -6479,8 +6479,6 @@ static struct textconv_interface 
text_conversion_interface =
 
 
 
-extern frame_parm_handler android_frame_parm_handlers[];
-
 #endif /* !ANDROID_STUBIFY */
 
 static struct redisplay_interface android_redisplay_interface =
diff --git a/src/androidterm.h b/src/androidterm.h
index 24eb2c30f12..f4459c45dc9 100644
--- a/src/androidterm.h
+++ b/src/androidterm.h
@@ -392,6 +392,7 @@ extern struct android_display_info *x_display_list;
 
 /* From androidfns.c.  */
 
+extern frame_parm_handler android_frame_parm_handlers[];
 extern void android_free_gcs (struct frame *);
 extern void android_default_font_parameter (struct frame *, Lisp_Object);
 extern void android_set_preeditarea (struct window *, int, int);