[Emacs-diffs] trunk r117290: If a C name must be extern on some platforms, make it extern on all.

[Paul Eggert]

------------------------------------------------------------
revno: 117290
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2014-06-08 11:27:22 -0700
message:
  If a C name must be extern on some platforms, make it extern on all.
  
  * dispextern.h (set_vertical_scroll_bar, erase_phys_cursor)
  (load_color):
  * font.h (ftxfont_driver) [HAVE_XFT]:
  * keyboard.h (menu_items_inuse, ignore_mouse_drag_p, make_ctrl_char):
  * lisp.h (get_frame_param):
  * menu.h (tty_menu_show):
  * process.h (conv_sockaddr_to_lisp, catch_child_signal):
  * termhooks.h (encode_terminal_code):
  * xterm.h (x_menu_wait_for_event):
  Always declare.
  * frame.c (get_frame_param):
  * fringe.c (max_used_fringe_bitmap):
  * ftxfont.c (ftxfont_driver):
  * keyboard.c (ignore_mouse_drag_p, make_ctrl_char):
  * menu.c (menu_items_inuse):
  * process.c (conv_sockaddr_to_lisp, catch_child_signal):
  * term.c (encode_terminal_code, tty_menu_show):
  * xdisp.c (set_vertical_scroll_bar, erase_phys_cursor):
  * xfaces.c (load_color):
  * xmenu.c (x_menu_wait_for_event):
  Now always extern.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/dispextern.h               
dispextern.h-20091113204419-o5vbwnq5f7feedwu-218
  src/font.h                     font.h-20091113204419-o5vbwnq5f7feedwu-8541
  src/frame.c                    frame.c-20091113204419-o5vbwnq5f7feedwu-243
  src/fringe.c                   fringe.c-20091113204419-o5vbwnq5f7feedwu-2965
  src/ftxfont.c                  ftxfont.c-20091113204419-o5vbwnq5f7feedwu-8544
  src/keyboard.c                 keyboard.c-20091113204419-o5vbwnq5f7feedwu-449
  src/keyboard.h                 keyboard.h-20091113204419-o5vbwnq5f7feedwu-450
  src/lisp.h                     lisp.h-20091113204419-o5vbwnq5f7feedwu-253
  src/menu.c                     menu.c-20091113204419-o5vbwnq5f7feedwu-8676
  src/menu.h                     menu.h-20091113204419-o5vbwnq5f7feedwu-8702
  src/process.c                  process.c-20091113204419-o5vbwnq5f7feedwu-462
  src/process.h                  process.h-20091113204419-o5vbwnq5f7feedwu-272
  src/term.c                     term.c-20091113204419-o5vbwnq5f7feedwu-220
  src/termhooks.h                termhooks.h-20091113204419-o5vbwnq5f7feedwu-249
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240
  src/xfaces.c                   xfaces.c-20091113204419-o5vbwnq5f7feedwu-560
  src/xmenu.c                    xmenu.c-20091113204419-o5vbwnq5f7feedwu-161
  src/xterm.h                    xterm.h-20091113204419-o5vbwnq5f7feedwu-228

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-08 15:06:03 +0000
+++ b/src/ChangeLog     2014-06-08 18:27:22 +0000
@@ -1,3 +1,28 @@
+2014-06-08  Paul Eggert  <address@hidden>
+
+       If a C name must be extern on some platforms, make it extern on all.
+       * dispextern.h (set_vertical_scroll_bar, erase_phys_cursor)
+       (load_color):
+       * font.h (ftxfont_driver) [HAVE_XFT]:
+       * keyboard.h (menu_items_inuse, ignore_mouse_drag_p, make_ctrl_char):
+       * lisp.h (get_frame_param):
+       * menu.h (tty_menu_show):
+       * process.h (conv_sockaddr_to_lisp, catch_child_signal):
+       * termhooks.h (encode_terminal_code):
+       * xterm.h (x_menu_wait_for_event):
+       Always declare.
+       * frame.c (get_frame_param):
+       * fringe.c (max_used_fringe_bitmap):
+       * ftxfont.c (ftxfont_driver):
+       * keyboard.c (ignore_mouse_drag_p, make_ctrl_char):
+       * menu.c (menu_items_inuse):
+       * process.c (conv_sockaddr_to_lisp, catch_child_signal):
+       * term.c (encode_terminal_code, tty_menu_show):
+       * xdisp.c (set_vertical_scroll_bar, erase_phys_cursor):
+       * xfaces.c (load_color):
+       * xmenu.c (x_menu_wait_for_event):
+       Now always extern.
+
 2014-06-08  Dmitry Antipov  <address@hidden>
 
        Change object marking routines to minimize stack usage.

=== modified file 'src/dispextern.h'
--- a/src/dispextern.h  2014-06-04 09:16:46 +0000
+++ b/src/dispextern.h  2014-06-08 18:27:22 +0000
@@ -3163,9 +3163,7 @@
 int display_prop_intangible_p (Lisp_Object, Lisp_Object, ptrdiff_t, ptrdiff_t);
 void resize_echo_area_exactly (void);
 int resize_mini_window (struct window *, int);
-#if defined USE_TOOLKIT_SCROLL_BARS && !defined USE_GTK
 void set_vertical_scroll_bar (struct window *);
-#endif
 int try_window (Lisp_Object, struct text_pos, int);
 void window_box (struct window *, enum glyph_row_area,
                 int *, int *, int *, int *);
@@ -3238,9 +3236,7 @@
                                     enum draw_glyphs_face);
 extern void get_phys_cursor_geometry (struct window *, struct glyph_row *,
                                       struct glyph *, int *, int *, int *);
-#if HAVE_NTGUI
 extern void erase_phys_cursor (struct window *);
-#endif
 extern void display_and_set_cursor (struct window *, bool, int, int, int, int);
 extern void x_update_cursor (struct frame *, bool);
 extern void x_clear_cursor (struct window *);
@@ -3354,10 +3350,8 @@
                                        Lisp_Object);
 Lisp_Object tty_color_name (struct frame *, int);
 void clear_face_cache (int);
-#ifdef MSDOS
 unsigned long load_color (struct frame *, struct face *, Lisp_Object,
                           enum lface_attribute_index);
-#endif
 char *choose_face_font (struct frame *, Lisp_Object *, Lisp_Object,
                         int *);
 void prepare_face_for_display (struct frame *, struct face *);

=== modified file 'src/font.h'
--- a/src/font.h        2014-04-16 13:27:28 +0000
+++ b/src/font.h        2014-06-08 18:27:22 +0000
@@ -834,7 +834,8 @@
 extern Lisp_Object Qxft;
 extern struct font_driver xftfont_driver;
 extern void syms_of_xftfont (void);
-#elif defined HAVE_FREETYPE
+#endif
+#if defined HAVE_FREETYPE || defined HAVE_XFT
 extern struct font_driver ftxfont_driver;
 #endif
 #ifdef HAVE_BDFFONT

=== modified file 'src/frame.c'
--- a/src/frame.c       2014-06-02 00:18:22 +0000
+++ b/src/frame.c       2014-06-08 18:27:22 +0000
@@ -1965,9 +1965,6 @@
 /* Return the value of frame parameter PROP in frame FRAME.  */
 
 #ifdef HAVE_WINDOW_SYSTEM
-#if !HAVE_NS && !HAVE_NTGUI
-static
-#endif
 Lisp_Object
 get_frame_param (register struct frame *frame, Lisp_Object prop)
 {

=== modified file 'src/fringe.c'
--- a/src/fringe.c      2014-04-03 20:46:04 +0000
+++ b/src/fringe.c      2014-06-08 18:27:22 +0000
@@ -480,9 +480,6 @@
 static Lisp_Object *fringe_faces;
 static int max_fringe_bitmaps;
 
-#ifndef HAVE_NS
-static
-#endif
 int max_used_fringe_bitmap = MAX_STANDARD_FRINGE_BITMAPS;
 
 

=== modified file 'src/ftxfont.c'
--- a/src/ftxfont.c     2014-01-01 07:43:34 +0000
+++ b/src/ftxfont.c     2014-06-08 18:27:22 +0000
@@ -37,9 +37,6 @@
 
 static Lisp_Object Qftx;
 
-#if defined HAVE_XFT || !defined HAVE_FREETYPE
-static
-#endif
 struct font_driver ftxfont_driver;
 
 struct ftxfont_frame_data

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2014-06-06 02:35:17 +0000
+++ b/src/keyboard.c    2014-06-08 18:27:22 +0000
@@ -1286,9 +1286,6 @@
    If ignore_mouse_drag_p is non-zero, ignore (implicit) mouse movement
    after resizing the tool-bar window.  */
 
-#if !defined HAVE_WINDOW_SYSTEM || defined USE_GTK || defined HAVE_NS
-static
-#endif
 bool ignore_mouse_drag_p;
 
 static struct frame *
@@ -2085,9 +2082,6 @@
 
 /* Apply the control modifier to CHARACTER.  */
 
-#ifndef HAVE_NTGUI
-static
-#endif
 int
 make_ctrl_char (int c)
 {

=== modified file 'src/keyboard.h'
--- a/src/keyboard.h    2014-06-02 18:01:21 +0000
+++ b/src/keyboard.h    2014-06-08 18:27:22 +0000
@@ -305,9 +305,7 @@
 
 /* If non-nil, means that the global vars defined here are already in use.
    Used to detect cases where we try to re-enter this non-reentrant code.  */
-#if defined USE_GTK || defined USE_MOTIF
 extern Lisp_Object menu_items_inuse;
-#endif
 
 /* Number of slots currently allocated in menu_items.  */
 extern int menu_items_allocated;
@@ -415,9 +413,7 @@
    happens.  */
 extern struct timespec *input_available_clear_time;
 
-#if defined HAVE_WINDOW_SYSTEM && !defined USE_GTK && !defined HAVE_NS
 extern bool ignore_mouse_drag_p;
-#endif
 
 /* The primary selection.  */
 extern Lisp_Object QPRIMARY;
@@ -467,9 +463,7 @@
 extern void clear_input_pending (void);
 extern bool requeued_events_pending_p (void);
 extern void bind_polling_period (int);
-#if HAVE_NTGUI
 extern int make_ctrl_char (int) ATTRIBUTE_CONST;
-#endif
 extern void stuff_buffered_input (Lisp_Object);
 extern void clear_waiting_for_input (void);
 extern void swallow_events (bool);

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2014-06-02 06:08:49 +0000
+++ b/src/lisp.h        2014-06-08 18:27:22 +0000
@@ -4127,9 +4127,7 @@
 extern void store_frame_param (struct frame *, Lisp_Object, Lisp_Object);
 extern void store_in_alist (Lisp_Object *, Lisp_Object, Lisp_Object);
 extern Lisp_Object do_switch_frame (Lisp_Object, int, int, Lisp_Object);
-#if HAVE_NS || HAVE_NTGUI
 extern Lisp_Object get_frame_param (struct frame *, Lisp_Object);
-#endif
 extern void frames_discard_buffer (Lisp_Object);
 extern void syms_of_frame (void);
 

=== modified file 'src/menu.c'
--- a/src/menu.c        2014-06-04 15:16:54 +0000
+++ b/src/menu.c        2014-06-08 18:27:22 +0000
@@ -66,9 +66,6 @@
 
 /* If non-nil, means that the global vars defined here are already in use.
    Used to detect cases where we try to re-enter this non-reentrant code.  */
-#if ! (defined USE_GTK || defined USE_MOTIF)
-static
-#endif
 Lisp_Object menu_items_inuse;
 
 /* Number of slots currently allocated in menu_items.  */

=== modified file 'src/menu.h'
--- a/src/menu.h        2014-06-07 07:25:49 +0000
+++ b/src/menu.h        2014-06-08 18:27:22 +0000
@@ -64,14 +64,12 @@
 #ifdef HAVE_NTGUI
 extern Lisp_Object w32_menu_show (struct frame *, int, int, int,
                                  Lisp_Object, const char **);
-#ifdef WINDOWSNT
-extern Lisp_Object tty_menu_show (struct frame *, int, int, int,
-                                 Lisp_Object, const char **);
-#endif
 #endif
 #ifdef HAVE_NS
 extern Lisp_Object ns_menu_show (struct frame *, int, int, int,
                                 Lisp_Object, const char **);
 #endif
+extern Lisp_Object tty_menu_show (struct frame *, int, int, int,
+                                 Lisp_Object, const char **);
 extern ptrdiff_t menu_item_width (const unsigned char *);
 #endif /* MENU_H */

=== modified file 'src/process.c'
--- a/src/process.c     2014-06-05 06:24:54 +0000
+++ b/src/process.c     2014-06-08 18:27:22 +0000
@@ -1957,9 +1957,6 @@
 /* Convert an internal struct sockaddr to a lisp object (vector or string).
    The address family of sa is not included in the result.  */
 
-#ifndef WINDOWSNT
-static
-#endif
 Lisp_Object
 conv_sockaddr_to_lisp (struct sockaddr *sa, int len)
 {
@@ -7051,9 +7048,6 @@
    futz with the SIGCHLD handler, but before Emacs forks any children.
    This function's caller should block SIGCHLD.  */
 
-#ifndef NS_IMPL_GNUSTEP
-static
-#endif
 void
 catch_child_signal (void)
 {

=== modified file 'src/process.h'
--- a/src/process.h     2014-06-01 23:17:56 +0000
+++ b/src/process.h     2014-06-08 18:27:22 +0000
@@ -225,9 +225,7 @@
 
 extern void record_deleted_pid (pid_t, Lisp_Object);
 struct sockaddr;
-#ifdef WINDOWSNT
 extern Lisp_Object conv_sockaddr_to_lisp (struct sockaddr *, int);
-#endif
 extern void hold_keyboard_input (void);
 extern void unhold_keyboard_input (void);
 extern bool kbd_on_hold_p (void);
@@ -238,9 +236,7 @@
 extern void delete_read_fd (int fd);
 extern void add_write_fd (int fd, fd_callback func, void *data);
 extern void delete_write_fd (int fd);
-#ifdef NS_IMPL_GNUSTEP
 extern void catch_child_signal (void);
-#endif
 
 #ifdef WINDOWSNT
 extern Lisp_Object network_interface_list (void);

=== modified file 'src/term.c'
--- a/src/term.c        2014-06-08 00:35:27 +0000
+++ b/src/term.c        2014-06-08 18:27:22 +0000
@@ -527,9 +527,6 @@
    Set CODING->produced to the byte-length of the resulting byte
    sequence, and return a pointer to that byte sequence.  */
 
-#ifndef DOS_NT
-static
-#endif
 unsigned char *
 encode_terminal_code (struct glyph *src, int src_len,
                      struct coding_system *coding)
@@ -3583,9 +3580,6 @@
 }
 
 /* WINDOWSNT uses this as menu_show_hook, see w32console.c.  */
-#ifndef WINDOWSNT
-static
-#endif
 Lisp_Object
 tty_menu_show (struct frame *f, int x, int y, int menuflags,
               Lisp_Object title, const char **error_name)

=== modified file 'src/termhooks.h'
--- a/src/termhooks.h   2014-06-04 14:59:09 +0000
+++ b/src/termhooks.h   2014-06-08 18:27:22 +0000
@@ -651,10 +651,8 @@
 /* The initial terminal device, created by initial_term_init.  */
 extern struct terminal *initial_terminal;
 
-#ifdef DOS_NT
 extern unsigned char *encode_terminal_code (struct glyph *, int,
                                            struct coding_system *);
-#endif
 
 #ifdef HAVE_GPM
 extern void close_gpm (int gpm_fd);

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2014-05-30 07:40:29 +0000
+++ b/src/xdisp.c       2014-06-08 18:27:22 +0000
@@ -15710,9 +15710,6 @@
   return rc;
 }
 
-#if !defined USE_TOOLKIT_SCROLL_BARS || defined USE_GTK
-static
-#endif
 void
 set_vertical_scroll_bar (struct window *w)
 {
@@ -27055,9 +27052,6 @@
 
 /* Erase the image of a cursor of window W from the screen.  */
 
-#ifndef HAVE_NTGUI
-static
-#endif
 void
 erase_phys_cursor (struct window *w)
 {

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2014-04-05 19:30:36 +0000
+++ b/src/xfaces.c      2014-06-08 18:27:22 +0000
@@ -1248,9 +1248,6 @@
    record that fact in flags of the face so that we don't try to free
    these colors.  */
 
-#ifndef MSDOS
-static
-#endif
 unsigned long
 load_color (struct frame *f, struct face *face, Lisp_Object name,
            enum lface_attribute_index target_index)

=== modified file 'src/xmenu.c'
--- a/src/xmenu.c       2014-06-04 04:58:31 +0000
+++ b/src/xmenu.c       2014-06-08 18:27:22 +0000
@@ -208,9 +208,6 @@
 
 /* Wait for an X event to arrive or for a timer to expire.  */
 
-#ifndef USE_MOTIF
-static
-#endif
 void
 x_menu_wait_for_event (void *data)
 {

=== modified file 'src/xterm.h'
--- a/src/xterm.h       2014-06-02 18:01:21 +0000
+++ b/src/xterm.h       2014-06-08 18:27:22 +0000
@@ -1031,9 +1031,7 @@
 #if defined USE_GTK || defined USE_MOTIF
 extern void x_menu_set_in_use (int);
 #endif
-#ifdef USE_MOTIF
 extern void x_menu_wait_for_event (void *data);
-#endif
 extern int popup_activated (void);
 extern void initialize_frame_menubar (struct frame *);