mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

Complete pacification of build warnings on Android

Browse Source 
* 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.
This commit is contained in:
Po Lu 2024-05-13 08:25:39 +08:00
parent b20d4ab374
commit b86359d4ab
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build-aux/makecounter.sh
View File

@ -36,6 +36,7 @@ cat > $1 <<EOF
#define EXPORT __attribute__ ((visibility ("default"))) #define EXPORT __attribute__ ((visibility ("default")))
#endif /* HAVE_ANDROID */ #endif /* HAVE_ANDROID */
extern int emacs_shortlisp_counter;
#ifdef EXPORT #ifdef EXPORT
EXPORT EXPORT
#endif /* EXPORT */ #endif /* EXPORT */

2
src/android.c
View File

@ -153,7 +153,7 @@ char *android_cache_dir;
/* The list of archive files within which the Java virtual macine /* The list of archive files within which the Java virtual macine
looks for class files. */ looks for class files. */
char *android_class_path; static char *android_class_path;
/* The display's pixel densities. */ /* The display's pixel densities. */
double android_pixel_density_x, android_pixel_density_y; double android_pixel_density_x, android_pixel_density_y;

10
src/androidfont.c
View File

@ -136,26 +136,26 @@ struct androidfont_entity
/* Method and class identifiers associated with the EmacsFontDriver /* Method and class identifiers associated with the EmacsFontDriver
class. */ 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 /* Field and class identifiers associated with the
EmacsFontDriver$FontSpec class. */ 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. */ /* 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 /* Field and class identifiers associated with the
EmacsFontDriver$FontMetrics class. */ 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 /* Field and class identifiers associated with the
EmacsFontDriver$FontObject class. */ EmacsFontDriver$FontObject class. */
struct android_emacs_font_object font_object_class; static struct android_emacs_font_object font_object_class;
/* The font cache. */ /* The font cache. */

2
src/androidterm.c
View File

@ -6479,8 +6479,6 @@ static struct textconv_interface text_conversion_interface =
extern frame_parm_handler android_frame_parm_handlers[];
#endif /* !ANDROID_STUBIFY */ #endif /* !ANDROID_STUBIFY */
static struct redisplay_interface android_redisplay_interface = static struct redisplay_interface android_redisplay_interface =

1
src/androidterm.h
View File

@ -392,6 +392,7 @@ extern struct android_display_info *x_display_list;
/* From androidfns.c. */ /* From androidfns.c. */
extern frame_parm_handler android_frame_parm_handlers[];
extern void android_free_gcs (struct frame *); extern void android_free_gcs (struct frame *);
extern void android_default_font_parameter (struct frame *, Lisp_Object); extern void android_default_font_parameter (struct frame *, Lisp_Object);
extern void android_set_preeditarea (struct window *, int, int); extern void android_set_preeditarea (struct window *, int, int);