aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMattias EngdegÄrd2024-05-12 14:55:55 +0200
committerMattias EngdegÄrd2024-05-12 15:04:47 +0200
commit9365feadccf1e28438e41c4ce8bf60ab8e4e1def (patch)
tree1bd6f459468fb5ccb5c80beac8a86f62fe1affc6 /src
parent38091e43bee991920db81263fe56da444a123fae (diff)
downloademacs-9365feadccf1e28438e41c4ce8bf60ab8e4e1def.tar.gz
emacs-9365feadccf1e28438e41c4ce8bf60ab8e4e1def.zip
Silence some macOS build warnings
* src/image.c (native_image_type): Declare static. * src/keyboard.c (lispy_function_keys): Declare static on NS. * src/nsmenu.m (context_menu_value): * src/nsterm.m (ns_frame_parm_handlers): Move extern declarations... * src/nsterm.h: ...here. * test/src/emacs-module-resources/mod-test.c: Add extern declaration.
Diffstat (limited to 'src')
-rw-r--r--src/image.c2
-rw-r--r--src/keyboard.c4
-rw-r--r--src/nsmenu.m1
-rw-r--r--src/nsterm.h4
-rw-r--r--src/nsterm.m1
5 files changed, 9 insertions, 3 deletions
diff --git a/src/image.c b/src/image.c
index e93fc3183af..3138ef25a63 100644
--- a/src/image.c
+++ b/src/image.c
@@ -12744,7 +12744,7 @@ static struct image_type const image_types[] =
12744}; 12744};
12745 12745
12746#if HAVE_NATIVE_IMAGE_API 12746#if HAVE_NATIVE_IMAGE_API
12747struct image_type native_image_type = 12747static struct image_type native_image_type =
12748 { SYMBOL_INDEX (Qnative_image), native_image_p, native_image_load, 12748 { SYMBOL_INDEX (Qnative_image), native_image_p, native_image_load,
12749 image_clear_image }; 12749 image_clear_image };
12750#endif 12750#endif
diff --git a/src/keyboard.c b/src/keyboard.c
index dff86bbca13..d5892115e4b 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5396,6 +5396,10 @@ static const char *const lispy_kana_keys[] =
5396 5396
5397/* You'll notice that this table is arranged to be conveniently 5397/* You'll notice that this table is arranged to be conveniently
5398 indexed by X Windows keysym values. */ 5398 indexed by X Windows keysym values. */
5399#ifdef HAVE_NS
5400/* FIXME: Why are we using X11 keysym values for NS? */
5401static
5402#endif
5399const char *const lispy_function_keys[] = 5403const char *const lispy_function_keys[] =
5400 { 5404 {
5401 /* X Keysym value */ 5405 /* X Keysym value */
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 0d21f7d03d3..46ee9e1c3fc 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -47,7 +47,6 @@ Carbon version by Yamamoto Mitsuharu. */
47#endif 47#endif
48 48
49 49
50extern long context_menu_value;
51EmacsMenu *svcsMenu; 50EmacsMenu *svcsMenu;
52/* Nonzero means a menu is currently active. */ 51/* Nonzero means a menu is currently active. */
53static int popup_activated_flag; 52static int popup_activated_flag;
diff --git a/src/nsterm.h b/src/nsterm.h
index ae940ec5b4f..3a713f8e8c9 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -921,6 +921,8 @@ struct ns_display_info
921/* This is a chain of structures for all the NS displays currently in use. */ 921/* This is a chain of structures for all the NS displays currently in use. */
922extern struct ns_display_info *x_display_list; 922extern struct ns_display_info *x_display_list;
923 923
924extern long context_menu_value;
925
924struct ns_output 926struct ns_output
925{ 927{
926#ifdef __OBJC__ 928#ifdef __OBJC__
@@ -1269,6 +1271,8 @@ extern void ns_finish_events (void);
1269 1271
1270extern double ns_frame_scale_factor (struct frame *); 1272extern double ns_frame_scale_factor (struct frame *);
1271 1273
1274extern frame_parm_handler ns_frame_parm_handlers[];
1275
1272#ifdef NS_IMPL_GNUSTEP 1276#ifdef NS_IMPL_GNUSTEP
1273extern char gnustep_base_version[]; /* version tracking */ 1277extern char gnustep_base_version[]; /* version tracking */
1274#endif 1278#endif
diff --git a/src/nsterm.m b/src/nsterm.m
index f26cdb17903..794630de1c1 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5438,7 +5438,6 @@ ns_flush_display (struct frame *f)
5438 redisplay interface. In addition, many of the ns_ methods have 5438 redisplay interface. In addition, many of the ns_ methods have
5439 code that is shared with all terms, indicating need for further 5439 code that is shared with all terms, indicating need for further
5440 refactoring. */ 5440 refactoring. */
5441extern frame_parm_handler ns_frame_parm_handlers[];
5442static struct redisplay_interface ns_redisplay_interface = 5441static struct redisplay_interface ns_redisplay_interface =
5443{ 5442{
5444 ns_frame_parm_handlers, 5443 ns_frame_parm_handlers,