merge trunk

38 files changed, 212 insertions, 866 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7e79e65b0c9..3e750aed54b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,94 @@
         * font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the
         number of glyphs gets smaller than the original length.
 
+2010-07-26  Juanma Barranquero  <lekktu@gmail.com>
+
+        * lread.c (unreadpure, mapatoms_1): Make static.
+
+2010-07-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * terminfo.c (tparam): Fix prototype of tparm.
+
+2010-07-25  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * emacs.c (main) [PROFILING]: Use __executable_start if defined to
+        find start of text segment.
+        * dispnew.c (safe_bcopy): Don't define if HAVE___EXECUTABLE_START
+        is defined.
+
+        * callproc.c (set_initial_environment): Avoid unbalanced braces.
+
+2010-07-25  Ken Brown  <kbrown@cornell.edu>
+
+        * vm-limit.c (check_memory_limits): Fix previous change;
+        accidentally reverted an earlier change.
+
+2010-07-25  Ken Brown  <kbrown@cornell.edu>
+
+        * mem-limits.h (BSD4_2) [cygwin]: Don't define here; instead...
+        * vm-limit.c: ...add 'defined (CYGWIN)' here (Bug#6715).
+
+2010-07-25  Juanma Barranquero  <lekktu@gmail.com>
+
+        * callproc.c (relocate_fd): Set inside #ifndef WINDOWSNT.
+        * dired.c (opendir, readdir): Fix prototypes.
+        * editfns.c (w32_get_internal_run_time): Fix prototypes.
+        * keyboard.c (input_available_signal): Declare inside #ifdef SIGIO.
+        * ndir.h (opendir, readdir, seekdir, closedir): Fix prototypes.
+        (telldir): Remove declaration.
+        * ralloc.c (real_morecore, __morecore): Fix prototypes.
+        * sound.c (alsa_sound_perror): Declare inside #ifdef HAVE_ALSA.
+        * syssignal.h (strsignal): Fix prototype.
+        * term.c (tparam): Fix prototype.
+        (term_get_fkeys_address, term_get_fkeys_kboard, term_get_fkeys_1)
+        (term_get_fkeys): Set inside "#ifndef DOS_NT".
+        * vm-limit.c (check_memory_limits): Fix prototypes of real_morecore
+        and __morecore.
+        * w32gui.h (XParseGeometry): Fix prototype.
+        * w32heap.h (get_data_start, get_data_end, init_heap): Fix prototypes.
+        * w32term.c (my_set_focus): Declare inside #if 0.
+        * w32term.h (x_window_to_frame, x_display_info_for_name, w32_term_init)
+        (w32_fill_rect, w32_clear_window, init_crit, delete_crit, signal_quit)
+        (drain_message_queue, get_next_msg, post_msg, parse_button)
+        (ClipboardSequence_Proc): Fix prototypes.
+        (wait_for_sync): Remove declaration.
+
+2010-07-24  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32fns.c (w32_to_x_color): Remove, unused.
+
+2010-07-24  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * lisp.h: Remove leftover P_.
+
+2010-07-24  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * ecrt0.c, unexalpha.c: Remove files, unused.
+
+2010-07-24  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * cmds.c (internal_self_insert): Make static.
+        * lisp.h (internal_self_insert): Remove declaration.
+
+2010-07-23  Juanma Barranquero  <lekktu@gmail.com>
+
+        * alloc.c (free_float):
+        * font.c [ENABLE_CHECKING] (font_match_xlfd, font_check_xlfd_parse):
+        * frame.c (delete_frame_handler):
+        * ralloc.c (reorder_bloc):
+        * w32menu.c (menubar_id_to_frame, add_left_right_boundary):
+        Remove unused static functions.
+
+        * menu.c (cleanup_popup_menu): Set inside "#ifdef HAVE_NS";
+        it is called only from NS code.
+
+        * w32term.c (my_set_focus): #ifdef away; it is called only from
+        "#ifdef 0" code.
+
+        * w32fns.c (x_edge_detection):
+        * xfaces.c (may_use_scalable_font_p):
+        Remove obsolete static declarations.
+
 2010-07-20  Juanma Barranquero  <lekktu@gmail.com>
 
         * alloc.c (emacs_blocked_free, emacs_blocked_malloc)
@@ -2732,7 +2820,7 @@
         (struct xsettings): Add font and tb_style, set xft stuff inside #ifdef
         HAVE_XFT.
         (something_changedCB): store_font_changed_event is now
-        store_config_changed_event
+        store_config_changed_event.
         (parse_settings): Rename from parse_xft_settings.  Read
         non-xft xsettings outside #ifdef HAVE_XFT.
         (read_settings): Renamed from read_xft_settings.
@@ -4481,7 +4569,7 @@
         (scroll_end_callback): Remove.
         (xg_create_scroll_bar): Add parameter end_callback, bind it to
         button-release-event.  Replace value-changed event with change-value,
-        bug #5177,
+        bug #5177.
         (xg_event_is_for_scrollbar): Only return true if button is less than 4,
         bug #5177.
 
@@ -4502,7 +4590,7 @@
 
 2009-12-12  Eli Zaretskii  <eliz@gnu.org>
 
-        * dispextern.h (struct text_pos): Use EMACS_INT;
+        * dispextern.h (struct text_pos): Use EMACS_INT.
         (struct glyph): Use EMACS_INT for charpos.
         (struct it): Use EMACS_INT for stop_charpos, end_charpos,
         region_beg_charpos, region_end_charpos,
@@ -12068,8 +12156,8 @@
 2008-07-15  Chris Hall  <chris@web.workinglinux.com>  (tiny change)
             YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        (make_initial_frame): Call init_frame_faces(f) in CANNOT_DUMP case --
-        fix crash due to different init order.
+        * frame.c (make_initial_frame): Call init_frame_faces(f) in
+        CANNOT_DUMP case -- fix crash due to different init order.
 
 2008-07-15  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
@@ -12266,7 +12354,7 @@
         * m/macppc.h:
         * m/alpha.h: Use GNU_LINUX instead of LINUX.  Reorganize conditionals.
 
-        * m/ibms390x.h (XINT, XUINT): Don't define, same as the default
+        * m/ibms390x.h (XINT, XUINT): Don't define, same as the default.
         (SPECIAL_EMACS_INT):
         * m/ia64.h (SPECIAL_EMACS_INT):
         * m/amdx86-64.h (SPECIAL_EMACS_INT):
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 24818e6770f..dd847f8a64e 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -3252,7 +3252,7 @@
 2006-07-02  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (display_tool_bar_line): Skip glyphs which are too big
-        to ever fit the tool-bar,
+        to ever fit the tool-bar.
         (MAX_FRAME_TOOL_BAR_HEIGHT): New macro.
         (tool_bar_lines_needed): Use unused mode-line row as temp_row.
         (redisplay_tool_bar): Only clear desired matrix if we actually
@@ -7869,7 +7869,7 @@
 
 2005-07-19  Juanma Barranquero  <lekktu@gmail.com>
 
-        * eval.c (Fprog2, Fcalled_interactively_p),
+        * eval.c (Fprog2, Fcalled_interactively_p)
         (syms_of_eval) <debug-on-quit>: Doc fixes.
         (syms_of_eval) <max-specpdl-size>:
         (Finteractive_p): Fix typos in docstrings.
@@ -11250,7 +11250,7 @@
 2004-12-18  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macterm.c (endif, x_font_name_to_mac_font_name):
-        Use maccentraleurroman instead of maccentraleuropean
+        Use maccentraleurroman instead of maccentraleuropean.
         (mac_c_string_match, mac_do_list_fonts): Speed up font search by
         quickly finding a specific font without needing regexps.
 
@@ -12477,7 +12477,7 @@
 
         * gtkutil.h (xg_frame_cleared): Remove.
 
-        * xterm.c (x_clear_frame): Remove call to xg_frame_cleared
+        * xterm.c (x_clear_frame): Remove call to xg_frame_cleared.
         (x_scroll_bar_create, XTset_vertical_scroll_bar):
         Remove arguments left and width to xg_update_scrollbar_pos.
         (XTset_vertical_scroll_bar): Do x_clear_area for USE_GTK also.
@@ -13017,9 +13017,9 @@
 
         * macmenu.c (ENCODE_MENU_STRING): Added to handle multibyte
         strings in menu items.
-        (single_submenu): Use ENCODE_MENU_STRING
+        (single_submenu): Use ENCODE_MENU_STRING.
         (mac_menu_show): Use ENCODE_MENU_STRING.  Reset grabbed because
-        button release isn't passed to event loop
+        button release isn't passed to event loop.
         (add_menu_item): Use SetMenuItemWithCFString.
 
 2004-08-26  Steven Tamm  <steventamm@mac.com>
@@ -15407,7 +15407,7 @@
         (Fxw_display_color_p): Use dpyinfo->color_p.
         (Fx_display_grayscale_p, Fx_display_planes): Don't use
         dpyinfo->n_cbits.
-        (Fx_display_color_cells): Use dpyinfo->n_planes;
+        (Fx_display_color_cells): Use dpyinfo->n_planes.
         (QCmatrix, QCcolor_adjustment, QCmask, Qemboss, Qedge_detection)
         (Qheuristic, cross_disabled_images, emboss_matrix)
         (laplace_matrix): New variables (from xfns.c).
@@ -16414,7 +16414,7 @@
         (append_glyph, append_composite_glyph, produce_image_glyph)
         (append_stretch_glyph): Set glyph's ascent and descent.
         (on_hot_spot_p): New function to check if position is inside an
-        rectangular, circular, or polygon-shaped image hot-spot,
+        rectangular, circular, or polygon-shaped image hot-spot.
         (find_hot_spot): New function to search for image hot-spot.
         (Flookup_image_map): New defun to search for image hot-spot.
         (define_frame_cursor1): New aux function to determine frame
@@ -18570,7 +18570,7 @@
         change/simplify relevant callers.
         (x_y_to_hpos_vpos): Adapt to per-window fringes and scroll bars,
         and new fringe vs. display margin position.
-        Use window_box_left_offset and window_box_right_offset
+        Use window_box_left_offset and window_box_right_offset.
         (get_glyph_string_clip_rect): Adapt to per-window fringes and
         scroll bars, and new fringe vs. display margin position.
         Use WINDOW_LEFT_EDGE_X and WINDOW_TOTAL_WIDTH.
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index 7313f56ae8e..41e280a71b3 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -3102,9 +3102,9 @@
         [So (-259 . (259 . x)) means to format x -exactly- 259 chars wide.]
 
         * dispnew.c (Fding):
-        Do not terminate macro-definition if given an argument
+        Do not terminate macro-definition if given an argument.
         (This is so things like asynchronous process notifications
-        can beep but not screw)
+        can beep but not screw.)
 
 1986-11-10  Richard M. Stallman  (rms@prep)
 
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 241019b51c7..e3c5ab70f66 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -6993,7 +6993,7 @@
 
         * keyboard.c (Qvertical_split): Renamed to `vertical-line',
         since the window arrangement is actually referred to as a
-        `horizontal split.'
+        `horizontal split'.
         (make_lispy_event, make_lispy_movement, syms_of_keyboard): Uses
         renamed here.
         * keyboard.h (Qvertical_split): Extern declaration changed here.
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index e4991971461..f27186079ac 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -387,7 +387,7 @@
         based on frame name and icon_name fields.
         (x_set_icon_name): New function.
         (x_icon): Call x_text_icon.
-        (x_set_name): Look at icon_name field when setting the icon name,
+        (x_set_name): Look at icon_name field when setting the icon name.
         (x_frame_parms): Add icon-name.
         (syms_of_xfns): Set up Qicon_name.
 
@@ -903,7 +903,7 @@
 
 1995-05-04  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
 
-        * s/freebsd.h: (GETPGRP_NO_ARG): Defined
+        * s/freebsd.h (GETPGRP_NO_ARG): Define.
         (HAVE_GETPAGESIZE): Definition deleted.
 
         * data.c (store_symval_forwarding): Error if value out of range
@@ -1308,7 +1308,7 @@
 
         * ntinevt.c (do_mouse_event): Use XSETFASTINT.
         (SET_FRAME): Undefined.
-        (select): Renamed to sys_select to correspond to routine in sysdep.c
+        (select): Renamed to sys_select to correspond to routine in sysdep.c.
         (sys_select): Support struct timeval.
         (key_event): Support German keyboard.
         Replace SET_FRAME with XSETFRAME.
@@ -4217,7 +4217,7 @@
 
         * process.c: Handle multiple keyboard input descriptors.
         (non_keyboard_wait_mask): New variable.
-        (Fset_process_filter): Update non_keyboard_wait_mask
+        (Fset_process_filter): Update non_keyboard_wait_mask.
         (create_process, Fopen_network_stream, deactivate_process):
         (init_process, sigchld_handler): Likewise.
         (wait_reading_process_input): Maybe use non_keyboard_wait_mask.
@@ -4456,7 +4456,7 @@
 
         * xfns.c: Use FRAME_X_DISPLAY instead of x_current_display
         and XDISPLAY.
-        (x_in_use): New variable,
+        (x_in_use): New variable.
         (check_x, using_x_p): Test x_in_use.
         (Fx_open_connection): Set x_in_use.
         (check_x_frame): New function.
@@ -5953,7 +5953,7 @@
 1994-09-03  Kaveh R. Ghazi  (ghazi@noc.rutgers.edu)
 
         * m/delta88k.h [__GNUC__] (HAVE_ALLOCA): Defined.
-        [__GNUC__] (C_ALLOCA): Add #undef
+        [__GNUC__] (C_ALLOCA): Add #undef.
         (LIB_X11_LIB): Add #undef.
         (HAVE_TERMIOS): Defined.
         (HAVE_TERMIO): Add #undef.
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index 6c7d04a531e..3b1bdbffabc 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -2830,7 +2830,7 @@
         * dosfns.c (Fint86, Fdos_memget, Fdos_memput, Fmsdos_set_keyboard):
         Harmonize arguments with documentation.
 
-        * editfns.c (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time,
+        * editfns.c (Fchar_to_string, Fstring_to_char, Fgoto_char, Fencode_time)
         (Finsert_char, Fbuffer_substring, Fbuffer_substring_no_properties)
         (Finsert_buffer_substring, Fdelete_region, Fnarrow_to_region):
         Harmonize arguments with documentation.
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index 6e53a39ac93..9146a6465a8 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -1126,7 +1126,7 @@
 
         * xterm.c (note_mouse_highlight) <help-echo>: When looking for
         help-echo for a string which doesn't have help-echo itself, use
-        get-char-property to obtain the help-echo from the string's buffer
+        get-char-property to obtain the help-echo from the string's buffer.
         (note_mouse_highlight) <mouse-face>: When on a string that doesn't
         have mouse-face, look ``under'' the string for mouse-face from an
         overlay.
@@ -3119,7 +3119,7 @@
         * w32fns.c (Fx_show_tip): Fix calls to make_number.
         (x_set_font): If font hasn't changed, avoid recomputing
         faces and other things.
-        (x_set_tool_bar_lines): Do nothing if frame is minibuffer-only,
+        (x_set_tool_bar_lines): Do nothing if frame is minibuffer-only.
         (Fx_create_frame): Add the tool bar height to the frame height.
         (x_create_tip_frame): Prevent changing the tooltip's
         background color by specifying a color for the default font
@@ -4887,7 +4887,7 @@
 
         * md5.c: Delay include of md5.h until after namespace cleaning.
 
-        * makefile.w32-in (fns.o): Depend on md5.h
+        * makefile.w32-in (fns.o): Depend on md5.h.
         (md5.o): New target.
         (sunfns.o): Remove.
 
@@ -7254,7 +7254,7 @@
 
         * charset.h (MAKE_CHAR): Be sure to set MSB of C1 to 0.
 
-        * charset.c: Include composite.h
+        * charset.c: Include composite.h.
         (lisp_string_width): New function.
         (Fstring_width): Call lisp_string_width instead of strwidth.
 
@@ -7333,7 +7333,7 @@
 
         * s/ms-w32.h (ORDINARY_LINK): New define.
 
-        * w32.c (_ANONYMOUS_UNION) [__GNUC__]: New define
+        * w32.c (_ANONYMOUS_UNION) [__GNUC__]: New define.
         (_ANONYMOUS_STRUCT) [__GNUC__]: New define.
 
         * makefile.w32-in (clean): Don't delete config.h and epaths.h.
@@ -8409,7 +8409,7 @@
         (encode_coding_iso2022): New local variable safe_chars.  Check
         unsafe chars.
         (setup_coding_system): Delete the code to initialize
-        coding->safe_charses
+        coding->safe_charses.
         (intersection, find_safe_codings): New functions.
         (Ffind_coding_systems_region_internal): New function.
         (syms_of_coding): Defsubr it.  Initialize Qsafe_chars,
@@ -8729,7 +8729,7 @@
         * w32term.c (help_echo_object, help_echo_pos): New variables.
         (note_mode_line_highlight): Store additional information about the
         help-echo in help_echo_object and help_echo_pos.  Check both
-        `local-map' and `keymap' properties for changing the cursor
+        `local-map' and `keymap' properties for changing the cursor.
         (note_mouse_highlight): Store additional information about the
         help-echo in help_echo_object and help_echo_pos.
         (note_tool_bar_highlight): Set help_echo_object to nil and
@@ -8797,7 +8797,7 @@
         * xterm.c (help_echo_object, help_echo_pos): New variables.
         (note_mode_line_highlight): Store additional information about the
         help-echo in help_echo_object and help_echo_pos.  Check both
-        `local-map' and `keymap' properties for changing the cursor
+        `local-map' and `keymap' properties for changing the cursor.
         (note_mouse_highlight): Store additional information about the
         help-echo in help_echo_object and help_echo_pos.
         (note_tool_bar_highlight): Set help_echo_object to nil and
@@ -11979,7 +11979,7 @@
         (detect_coding_utf_8): New function.
         (UTF_16_INVALID_P, UTF_16_HIGH_SURROGATE_P
         UTF_16_LOW_SURROGATE_P): New macros.
-        (detect_coding_utf_16): New function
+        (detect_coding_utf_16): New function.
         (detect_coding_mask): When priorities are specified, skip any
         categories that have `nil' coding-system.  Fix bug of returning
         wrong mask when PRIORITIES is specified and detect_coding_XXX()
@@ -12222,7 +12222,7 @@
 
         * makefile.nt: Add atimer.h to dependencies.
         * w32.c (init_environment): Set Vw32_num_mouse_buttons here.
-        * w32console.c: Only disable window system features for dispextern.h
+        * w32console.c: Only disable window system features for dispextern.h.
         (initialize_w32_display): Build a display info for the console.
         * w32faces.c (tty_defined_color): Apply xfaces.c change from 02-17.
         * w32fns.c (w32_wnd_proc) [WM_LBUTTON_DOWN, WM_RBUTTON_DOWN,
@@ -12825,7 +12825,7 @@
         (FRAME_XIM): Removed.
 
         * xfns.c (supported_styles): New variable.
-        (DEFAULT_STYLE, DEFAULT_FONT): New macros
+        (DEFAULT_STYLE, DEFAULT_FONT): New macros.
         (xic_create_xfontset, best_style, xic_create_frame)
         (xic_destroy_frame, xic_set_preeditarea, xic_set_statusarea)
         (xic_set_xfontset): New functions.
@@ -13156,7 +13156,7 @@
         (GC_STRING_BYTES, GC_STRING_CHARS): New macros.
         (DONT_COPY_FLAG): Removed.
         (SBLOCK_SIZE, LARGE_STRING_BYTES): New macros.
-        (struct sdata, struct sblock): New
+        (struct sdata, struct sblock): New.
         (struct string_block): Rewritten.
         (STRINGS_IN_STRING_BLOCK): New macro.
         (oldest_sblock, current_sblock, total_strings, total_free_strings)
diff --git a/src/alloc.c b/src/alloc.c
index 2ce74f97ff7..2ddec3dbe48 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -2538,16 +2538,6 @@ init_float (void)
 }
 
 
-/* Explicitly free a float cell by putting it on the free-list.  */
-
-static void
-free_float (struct Lisp_Float *ptr)
-{
-  ptr->u.chain = float_free_list;
-  float_free_list = ptr;
-}
-
-
 /* Return a new float object with value FLOAT_VALUE.  */
 
 Lisp_Object
diff --git a/src/callproc.c b/src/callproc.c
index 4286ab1ae29..7019d741b34 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -984,7 +984,9 @@ usage: (call-process-region START END PROGRAM &optional DELETE BUFFER DISPLAY &r
   RETURN_UNGCPRO (unbind_to (count, Fcall_process (nargs, args)));
 }
 
+#ifndef WINDOWSNT
 static int relocate_fd (int fd, int minfd);
+#endif
 
 static char **
 add_env (char **env, char **new_env, char *string)
@@ -1113,7 +1115,7 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L
     char **p, **q;
     register int new_length;
     Lisp_Object display = Qnil;
-    
+
     new_length = 0;
 
     for (tem = Vprocess_environment;
@@ -1149,7 +1151,7 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L
        but with corrected value.  */
     if (egetenv ("PWD"))
       *new_env++ = pwd_var;
- 
+
     if (STRINGP (display))
       {
         int vlen = strlen ("DISPLAY=") + strlen (SDATA (display)) + 1;
@@ -1179,7 +1181,7 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L
       }
   }
 
-  
+
 #ifdef WINDOWSNT
   prepare_standard_handles (in, out, err, handles);
   set_process_dir (SDATA (current_dir));
@@ -1265,6 +1267,7 @@ child_setup (int in, int out, int err, register char **new_argv, int set_pgrp, L
 #endif /* not MSDOS */
 }
 
+#ifndef WINDOWSNT
 /* Move the file descriptor FD so that its number is not less than MINFD.
    If the file descriptor is moved at all, the original is freed.  */
 static int
@@ -1298,6 +1301,7 @@ relocate_fd (int fd, int minfd)
       return new;
     }
 }
+#endif /* not WINDOWSNT */
 
 static int
 getenv_internal_1 (const char *var, int varlen, char **value, int *valuelen,
@@ -1526,13 +1530,12 @@ void
 set_initial_environment (void)
 {
   register char **envp;
-#ifndef CANNOT_DUMP
-  if (initialized)
-    {
+#ifdef CANNOT_DUMP
+  Vprocess_environment = Qnil;
 #else
-    {
-      Vprocess_environment = Qnil;
+  if (initialized)
 #endif
+    {
       for (envp = environ; *envp; envp++)
         Vprocess_environment = Fcons (build_string (*envp),
                                       Vprocess_environment);
diff --git a/src/cmds.c b/src/cmds.c
index 81f975a9885..2b686a44d87 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -45,6 +45,8 @@ Lisp_Object Vself_insert_face_command;
 
 extern Lisp_Object Qface;
 extern Lisp_Object Vtranslation_table_for_input;
+
+static int internal_self_insert (int, int);
 
 DEFUN ("forward-point", Fforward_point, Sforward_point, 1, 1, 0,
        doc: /* Return buffer position N characters after (before if N negative) point.  */)
@@ -347,7 +349,7 @@ After insertion, the value of `auto-fill-function' is called if the
 
 static Lisp_Object Qexpand_abbrev;
 
-int
+static int
 internal_self_insert (int c, int noautofill)
 {
   int hairy = 0;
diff --git a/src/config.in b/src/config.in
index 40b62633446..647c8804dff 100644
--- a/src/config.in
+++ b/src/config.in
@@ -801,6 +801,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you want to use the X window system. */
 #undef HAVE_X_WINDOWS
 
+/* Define to 1 if you have the `__executable_start' function. */
+#undef HAVE___EXECUTABLE_START
+
 /* Define to 1 if you have the `__fpending' function. */
 #undef HAVE___FPENDING
 
diff --git a/src/dired.c b/src/dired.c
index cdb4545e81c..8f360e8879f 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -66,8 +66,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef MSDOS
 #define DIRENTRY struct direct
 
-extern DIR *opendir ();
-extern struct direct *readdir ();
+extern DIR *opendir (char *);
+extern struct direct *readdir (DIR *);
 
 #endif /* not MSDOS */
 #endif /* not SYSV_SYSTEM_DIR */
diff --git a/src/dispnew.c b/src/dispnew.c
index fe64143ec07..73aafe07d94 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -436,7 +436,7 @@ DEFUN ("dump-redisplay-history", Fdump_redisplay_history,
 #endif /* GLYPH_DEBUG == 0 */
 
 
-#ifdef PROFILING
+#if defined PROFILING && !HAVE___EXECUTABLE_START
 /* FIXME: only used to find text start for profiling.  */
 
 void
diff --git a/src/ecrt0.c b/src/ecrt0.c
deleted file mode 100644
index 458771319c7..00000000000
--- a/src/ecrt0.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/* C code startup routine.
-   Copyright (C) 1985, 1986, 1992, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-/* The standard Vax 4.2 Unix crt0.c cannot be used for Emacs
-   because it makes `environ' an initialized variable.
-   It is easiest to have a special crt0.c on all machines
-   though I don't know whether other machines actually need it.  */
-
-/* On the vax and 68000, in BSD4.2 and USG5.2,
-   this is the data format on startup:
-  (vax) ap and fp are unpredictable as far as I know; don't use them.
-  sp ->  word containing argc
-         word pointing to first arg string
-         [word pointing to next arg string]... 0 or more times
-         0
-Optionally:
-         [word pointing to environment variable]... 1 or more times
-         ...
-         0
-And always:
-         first arg string
-         [next arg string]... 0 or more times
-*/
-
-#ifdef emacs
-#include <config.h>
-#endif
-
-/*              ********  WARNING ********
-    Do not insert any data definitions before data_start!
-    Since this is the first file linked, the address of the following
-    variable should correspond to the start of initialized data space.
-    On some systems this is a constant that is independent of the text
-    size for shared executables.  On others, it is a function of the
-    text size. In short, this seems to be the most portable way to
-    discover the start of initialized data space dynamically at runtime,
-    for either shared or unshared executables, on either swapping or
-    virtual systems.  It only requires that the linker allocate objects
-    in the order encountered, a reasonable model for most Unix systems.
-    Similarly, note that the address of _start() should be the start
-    of text space.   Fred Fish, UniSoft Systems Inc.  */
-
-int data_start = 0;
-
-char **environ;
-
-static start1 ();
-
-/* Define symbol "start": here; some systems want that symbol.  */
-asm("   .text           ");
-asm("   .globl start    ");
-asm("   start:          ");
-
-_start ()
-{
-/* On vax, nothing is pushed here  */
-  start1 ();
-}
-
-static
-start1 (bogus_fp, argc, xargv)
-     int argc;
-     char *xargv;
-{
-  register char **argv = &xargv;
-  environ = argv + argc + 1;
-
-  if ((char *)environ == xargv)
-    environ--;
-  exit (main (argc, argv, environ));
-
-  /* Refer to `start1' so GCC will not think it is never called
-     and optimize it out.  */
-  (void) &start1;
-}
-
-/* arch-tag: 4025c2fb-d6b1-4d29-b1b6-8100b6bd1e74
-   (do not change this comment) */
diff --git a/src/editfns.c b/src/editfns.c
index 805dba60446..96ae1766e04 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -90,7 +90,7 @@ extern size_t emacs_strftimeu (char *, size_t, const char *,
                                const struct tm *, int);
 
 #ifdef WINDOWSNT
-extern Lisp_Object w32_get_internal_run_time ();
+extern Lisp_Object w32_get_internal_run_time (void);
 #endif
 
 static int tm_diff (struct tm *, struct tm *);
diff --git a/src/emacs.c b/src/emacs.c
index fbae7763877..a5d57116c4f 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1747,9 +1747,18 @@ main (int argc, char **argv)
 #else
       extern char etext;
 #endif
+#ifdef HAVE___EXECUTABLE_START
+      /* This symbol is defined by GNU ld to the start of the text
+         segment.  */
+      extern char __executable_start[];
+#else
       extern void safe_bcopy ();
+#endif
 
       atexit (_mcleanup);
+#ifdef HAVE___EXECUTABLE_START
+      monstartup (__executable_start, &etext);
+#else
       /* This uses safe_bcopy because that function comes first in the
          Emacs executable.  It might be better to use something that
          gives the start of the text segment, but start_of_text is not
@@ -1757,6 +1766,7 @@ main (int argc, char **argv)
       /* FIXME: Does not work on architectures with function
          descriptors.  */
       monstartup (safe_bcopy, &etext);
+#endif
     }
   else
     moncontrol (0);
diff --git a/src/font.c b/src/font.c
index ed4da9c75ac..c35716c7c67 100644
--- a/src/font.c
+++ b/src/font.c
@@ -980,39 +980,6 @@ font_expand_wildcards (Lisp_Object *field, int n)
 }
 
 
-#ifdef ENABLE_CHECKING
-/* Match a 14-field XLFD pattern against a full XLFD font name.  */
-static int
-font_match_xlfd (char *pattern, char *name)
-{
-  while (*pattern && *name)
-    {
-      if (*pattern == *name)
-        pattern++;
-      else if (*pattern == '*')
-        if (*name == pattern[1])
-          pattern += 2;
-        else
-          ;
-      else
-        return 0;
-      name++;
-    }
-  return 1;
-}
-
-/* Make sure the font object matches the XLFD font name.  */
-static int
-font_check_xlfd_parse (Lisp_Object font, char *name)
-{
-  char name_check[256];
-  font_unparse_xlfd (font, 0, name_check, 255);
-  return font_match_xlfd (name_check, name);
-}
-
-#endif
-
-
 /* Parse NAME (null terminated) as XLFD and store information in FONT
    (font-spec or font-entity).  Size property of FONT is set as
    follows:
diff --git a/src/frame.c b/src/frame.c
index 69a640cdc96..0cd7377ece1 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1280,14 +1280,6 @@ other_visible_frames (FRAME_PTR f)
   return 1;
 }
 
-/* Error handler for `delete-frame-functions'. */
-static Lisp_Object
-delete_frame_handler (Lisp_Object arg)
-{
-  add_to_log ("Error during `delete-frame': %s", arg, Qnil);
-  return Qnil;
-}
-
 extern Lisp_Object Qrun_hook_with_args;
 
 /* Delete FRAME.  When FORCE equals Qnoelisp, delete FRAME
@@ -1299,7 +1291,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
      /* If we use `register' here, gcc-4.0.2 on amd64 using
         -DUSE_LISP_UNION_TYPE complains further down that we're getting the
         address of `force'.  Go figure.  */
-                              
+
 {
   struct frame *f;
   struct frame *sf = SELECTED_FRAME ();
diff --git a/src/keyboard.c b/src/keyboard.c
index c2f010cf4e7..1cc24f95bdc 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -635,7 +635,9 @@ static Lisp_Object apply_modifiers (int, Lisp_Object);
 static void clear_event (struct input_event *);
 static Lisp_Object restore_kboard_configuration (Lisp_Object);
 static SIGTYPE interrupt_signal (int signalnum);
+#ifdef SIGIO
 static SIGTYPE input_available_signal (int signo);
+#endif
 static void handle_interrupt (void);
 static void timer_start_idle (void);
 static void timer_stop_idle (void);
@@ -3895,7 +3897,7 @@ kbd_buffer_get_event (KBOARD **kbp,
 {
   register int c;
   Lisp_Object obj;
-  
+
   if (kbd_on_hold_p () && kbd_buffer_nr_stored () < KBD_BUFFER_SIZE/4)
     {
       /* Start reading input again, we have processed enough so we can
diff --git a/src/lisp.h b/src/lisp.h
index d1a14fcd894..6b5de400c06 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2393,7 +2393,6 @@ extern void swap_in_global_binding (struct Lisp_Symbol *);
 EXFUN (Fend_of_line, 1);
 EXFUN (Fforward_char, 1);
 EXFUN (Fforward_line, 1);
-extern int internal_self_insert (int, int);
 extern void syms_of_cmds (void);
 extern void keys_of_cmds (void);
 
@@ -3400,16 +3399,16 @@ extern int emacs_close (int);
 extern int emacs_read (int, char *, unsigned int);
 extern int emacs_write (int, const char *, unsigned int);
 #ifndef HAVE_MEMSET
-extern void *memset P_ ((void *, int, size_t));
+extern void *memset (void *, int, size_t);
 #endif
 #ifndef HAVE_MEMCPY
-extern void *memcpy P_ ((void *, void *, size_t));
+extern void *memcpy (void *, void *, size_t);
 #endif
 #ifndef HAVE_MEMMOVE
-extern void *memmove P_ ((void *, void *, size_t));
+extern void *memmove (void *, void *, size_t);
 #endif
 #ifndef HAVE_MEMCMP
-extern int memcmp P_ ((void *, void *, size_t));
+extern int memcmp (void *, void *, size_t);
 #endif
 
 /* Defined in filelock.c */
diff --git a/src/lread.c b/src/lread.c
index 96108ec4a72..b29971a5f88 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1276,7 +1276,6 @@ Return t if the file exists and loads successfully.  */)
 
 static Lisp_Object
 load_unwind (Lisp_Object arg)  /* used as unwind-protect function in load */
-                     
 {
   FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer;
   if (stream != NULL)
@@ -1567,9 +1566,8 @@ build_load_history (Lisp_Object filename, int entire)
                            Vload_history);
 }
 
-Lisp_Object
+static Lisp_Object
 unreadpure (Lisp_Object junk) /* Used as unwind-protect function in readevalloop */
-                      
 {
   read_pure = 0;
   return Qnil;
@@ -3818,7 +3816,7 @@ map_obarray (Lisp_Object obarray, void (*fn) (Lisp_Object, Lisp_Object), Lisp_Ob
     }
 }
 
-void
+static void
 mapatoms_1 (Lisp_Object sym, Lisp_Object function)
 {
   call1 (function, sym);
diff --git a/src/mem-limits.h b/src/mem-limits.h
index a550e1464b8..8827c458c02 100644
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -34,10 +34,6 @@ extern int etext;
 # endif
 #endif
 
-#ifdef CYGWIN
-#define BSD4_2
-#endif
-
 #ifdef BSD4_2
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/src/menu.c b/src/menu.c
index a424200fb3e..321dc2677a1 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -133,12 +133,14 @@ discard_menu_items (void)
   xassert (NILP (menu_items_inuse));
 }
 
+#ifdef HAVE_NS
 static Lisp_Object
 cleanup_popup_menu (Lisp_Object arg)
 {
   discard_menu_items ();
   return Qnil;
 }
+#endif
 
 /* This undoes save_menu_items, and it is called by the specpdl unwind
    mechanism.  */
diff --git a/src/ndir.h b/src/ndir.h
index d7bac9d3fae..92d198334b7 100644
--- a/src/ndir.h
+++ b/src/ndir.h
@@ -32,11 +32,10 @@ typedef struct
         char    dd_buf[DIRBLKSIZ];      /* directory block */
         }       DIR;                    /* stream data from opendir() */
 
-extern DIR              *opendir();
-extern struct direct    *readdir();
-extern long             telldir();
-extern void             seekdir();
-extern void             closedir();
+extern DIR              *opendir (char *);
+extern struct direct    *readdir (DIR *);
+extern void             seekdir (DIR *, long);
+extern void             closedir (DIR *);
 
 #define rewinddir( dirp )       seekdir( dirp, 0L )
 
diff --git a/src/ralloc.c b/src/ralloc.c
index 0a2b156e393..5f2b52fcc4b 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -79,7 +79,7 @@ static void r_alloc_init (void);
 /* Declarations for working with the malloc, ralloc, and system breaks.  */
 
 /* Function to set the real break value.  */
-POINTER (*real_morecore) ();
+POINTER (*real_morecore) (long int);
 
 /* The break value, as seen by malloc.  */
 static POINTER virtual_break_value;
@@ -111,7 +111,7 @@ static int extra_bytes;
    from the system.  */
 
 #ifndef SYSTEM_MALLOC
-extern POINTER (*__morecore) ();
+extern POINTER (*__morecore) (long int);
 #endif
 
 
@@ -519,35 +519,6 @@ relocate_blocs (bloc_ptr bloc, heap_ptr heap, POINTER address)
 
   return 1;
 }
-
-/* Reorder the bloc BLOC to go before bloc BEFORE in the doubly linked list.
-   This is necessary if we put the memory of space of BLOC
-   before that of BEFORE.  */
-
-static void
-reorder_bloc (bloc_ptr bloc, bloc_ptr before)
-{
-  bloc_ptr prev, next;
-
-  /* Splice BLOC out from where it is.  */
-  prev = bloc->prev;
-  next = bloc->next;
-
-  if (prev)
-    prev->next = next;
-  if (next)
-    next->prev = prev;
-
-  /* Splice it in before BEFORE.  */
-  prev = before->prev;
-
-  if (prev)
-    prev->next = bloc;
-  bloc->prev = prev;
-
-  before->prev = bloc;
-  bloc->next = before;
-}
 
 /* Update the records of which heaps contain which blocs, starting
    with heap HEAP and bloc BLOC.  */
diff --git a/src/sound.c b/src/sound.c
index e0ebd565151..4e3d583ccf0 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -115,7 +115,9 @@ enum sound_attr
   SOUND_ATTR_SENTINEL
 };
 
+#ifdef HAVE_ALSA
 static void alsa_sound_perror (char *, int) NO_RETURN;
+#endif
 static void sound_perror (char *) NO_RETURN;
 static void sound_warning (char *);
 static int parse_sound (Lisp_Object, Lisp_Object *);
diff --git a/src/syssignal.h b/src/syssignal.h
index e3765add425..f034e9e0761 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -160,7 +160,7 @@ sigset_t sys_sigsetmask (sigset_t new_mask);
 
 #ifndef HAVE_STRSIGNAL
 /* strsignal is in sysdep.c */
-char *strsignal ();
+char *strsignal (int);
 #endif
 
 #ifdef FORWARD_SIGNAL_TO_MAIN_THREAD
diff --git a/src/term.c b/src/term.c
index 3233db84cf7..25501370cdf 100644
--- a/src/term.c
+++ b/src/term.c
@@ -183,7 +183,7 @@ static int no_controlling_tty;
 
 static int system_uses_terminfo;
 
-char *tparam ();
+char *tparam (char *, char *, int, int, ...);
 
 extern char *tgetstr (char *, char **);
 
@@ -1363,6 +1363,7 @@ static struct fkey_table keys[] =
   {"!3", "S-undo"}       /*shifted undo key*/
   };
 
+#ifndef DOS_NT
 static char **term_get_fkeys_address;
 static KBOARD *term_get_fkeys_kboard;
 static Lisp_Object term_get_fkeys_1 (void);
@@ -1500,6 +1501,7 @@ term_get_fkeys_1 (void)
 
   return Qnil;
 }
+#endif /* not DOS_NT */
 
 
 /***********************************************************************
diff --git a/src/terminfo.c b/src/terminfo.c
index 89d7426e8f4..50749492cfe 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -35,10 +35,12 @@ char *UP, *BC, PC;
 */
 
 char *
-tparam (char *string, char *outstring, int len, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9)
+tparam (char *string, char *outstring,
+        int len, int arg1, int arg2, int arg3, int arg4,
+        int arg5, int arg6, int arg7, int arg8, int arg9)
 {
   char *temp;
-  extern char *tparm(/* ??? */);
+  extern char *tparm (char *str, ...);
 
   temp = tparm (string, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   if (outstring == 0)
diff --git a/src/unexalpha.c b/src/unexalpha.c
deleted file mode 100644
index d0faa179931..00000000000
--- a/src/unexalpha.c
+++ /dev/null
@@ -1,539 +0,0 @@
-/* Unexec for DEC alpha.
-
-   Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
-
-Author: Rainer Schoepf <schoepf@sc.ZIB-Berlin.DE>
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-#include <config.h>
-#include <sys/types.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#if !defined (__NetBSD__) && !defined (__OpenBSD__)
-#include <filehdr.h>
-#include <aouthdr.h>
-#include <scnhdr.h>
-#include <syms.h>
-#ifndef __linux__
-# include <reloc.h>
-# include <elf_abi.h>
-#endif
-#else /* __NetBSD__ or __OpenBSD__ */
-/*
- * NetBSD/Alpha does not have 'normal' user-land ECOFF support because
- * there's no desire to support ECOFF as the executable format in the
- * long term.
- */
-#include <sys/exec_ecoff.h>
-
-/* Structures, constants, etc., that NetBSD defines strangely. */
-#define filehdr         ecoff_filehdr
-#define aouthdr         ecoff_aouthdr
-#define scnhdr          ecoff_scnhdr
-#define HDRR            struct ecoff_symhdr
-#define pHDRR           HDRR *
-#define cbHDRR          sizeof(HDRR)
-#ifdef __OpenBSD__
-#define ALPHAMAGIC      ECOFF_MAGIC_NATIVE_ALPHA
-#else
-#define ALPHAMAGIC      ECOFF_MAGIC_NETBSD_ALPHA
-#endif
-#define ZMAGIC          ECOFF_ZMAGIC
-
-/* Misc. constants that NetBSD doesn't define at all. */
-#define ALPHAUMAGIC     0617
-#define _MIPS_NSCNS_MAX 35
-#define STYP_TEXT       0x00000020
-#define STYP_DATA       0x00000040
-#define STYP_BSS        0x00000080
-#define STYP_RDATA      0x00000100
-#define STYP_SDATA      0x00000200
-#define STYP_SBSS       0x00000400
-#define STYP_INIT       0x80000000
-#define _TEXT           ".text"
-#define _DATA           ".data"
-#define _BSS            ".bss"
-#define _INIT           ".init"
-#define _RDATA          ".rdata"
-#define _SDATA          ".sdata"
-#define _SBSS           ".sbss"
-#define TEXT_START     0x120000000
-#endif /* __NetBSD__ || __OpenBSD__ */
-
-
-static void fatal_unexec (char *, char *);
-static void mark_x (char *);
-
-static void update_dynamic_symbols (char *, char *, int, struct aouthdr);
-
-#define READ(_fd, _buffer, _size, _error_message, _error_arg) \
-        errno = EEOF; \
-        if (read (_fd, _buffer, _size) != _size) \
-          fatal_unexec (_error_message, _error_arg);
-
-#define WRITE(_fd, _buffer, _size, _error_message, _error_arg) \
-        if (write (_fd, _buffer, _size) != _size) \
-          fatal_unexec (_error_message, _error_arg);
-
-#define SEEK(_fd, _position, _error_message, _error_arg) \
-        errno = EEOF; \
-        if (lseek (_fd, _position, L_SET) != _position) \
-          fatal_unexec (_error_message, _error_arg);
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#else
-void *sbrk ();
-#endif
-
-#define EEOF -1
-
-static struct scnhdr *text_section;
-static struct scnhdr *rel_dyn_section;
-static struct scnhdr *dynstr_section;
-static struct scnhdr *dynsym_section;
-static struct scnhdr *init_section;
-static struct scnhdr *finit_section;
-static struct scnhdr *rdata_section;
-static struct scnhdr *rconst_section;
-static struct scnhdr *data_section;
-static struct scnhdr *pdata_section;
-static struct scnhdr *xdata_section;
-static struct scnhdr *got_section;
-static struct scnhdr *lit8_section;
-static struct scnhdr *lit4_section;
-static struct scnhdr *sdata_section;
-static struct scnhdr *sbss_section;
-static struct scnhdr *bss_section;
-
-static struct scnhdr old_data_scnhdr;
-
-static unsigned long Brk;
-
-struct headers {
-    struct filehdr fhdr;
-    struct aouthdr aout;
-    struct scnhdr section[_MIPS_NSCNS_MAX];
-};
-
-
-void
-unexec (new_name, a_name, data_start, bss_start, entry_address)
-     char *new_name, *a_name;
-     unsigned long data_start, bss_start, entry_address;
-{
-  int new, old;
-  char * oldptr;
-  struct headers ohdr, nhdr;
-  struct stat stat;
-  long pagesize, brk;
-  long newsyms, symrel;
-  int nread;
-  int i;
-  long vaddr, scnptr;
-#define BUFSIZE 8192
-  char buffer[BUFSIZE];
-
-  if ((old = open (a_name, O_RDONLY)) < 0)
-    fatal_unexec ("opening %s", a_name);
-
-  new = creat (new_name, 0666);
-  if (new < 0) fatal_unexec ("creating %s", new_name);
-
-  if ((fstat (old, &stat) == -1))
-    fatal_unexec ("fstat %s", a_name);
-
-  oldptr = (char *)mmap (0, stat.st_size, PROT_READ, MAP_FILE|MAP_SHARED, old, 0);
-
-  if (oldptr == (char *)-1)
-    fatal_unexec ("mmap %s", a_name);
-
-  close (old);
-
-  /* This is a copy of the a.out header of the original executable */
-
-  ohdr = (*(struct headers *)oldptr);
-
-  /* This is where we build the new header from the in-memory copy */
-
-  nhdr = *((struct headers *)TEXT_START);
-
-  /* First do some consistency checks */
-
-  if (nhdr.fhdr.f_magic != ALPHAMAGIC
-      && nhdr.fhdr.f_magic != ALPHAUMAGIC)
-    {
-      fprintf (stderr, "unexec: input file magic number is %x, not %x or %x.\n",
-               nhdr.fhdr.f_magic, ALPHAMAGIC, ALPHAUMAGIC);
-      exit (1);
-    }
-
-  if (nhdr.fhdr.f_opthdr != sizeof (nhdr.aout))
-    {
-      fprintf (stderr, "unexec: input a.out header is %d bytes, not %d.\n",
-               nhdr.fhdr.f_opthdr, (int)sizeof (nhdr.aout));
-      exit (1);
-    }
-  if (nhdr.aout.magic != ZMAGIC)
-    {
-      fprintf (stderr, "unexec: input file a.out magic number is %o, not %o.\n",
-               nhdr.aout.magic, ZMAGIC);
-      exit (1);
-    }
-
-
-  /* Now check the existence of certain header section and grab
-     their addresses. */
-
-#define CHECK_SCNHDR(ptr, name, flags)                                  \
-  ptr = NULL;                                                           \
-  for (i = 0; i < nhdr.fhdr.f_nscns && !ptr; i++)                       \
-    if (strncmp (nhdr.section[i].s_name, name, 8) == 0)                 \
-      {                                                                 \
-        if (nhdr.section[i].s_flags != flags)                           \
-          fprintf (stderr, "unexec: %x flags (%x expected) in %s section.\n", \
-                   nhdr.section[i].s_flags, flags, name);               \
-        ptr = nhdr.section + i;                                         \
-      }                                                                 \
-
-  CHECK_SCNHDR (text_section,  _TEXT,  STYP_TEXT);
-  CHECK_SCNHDR (init_section,  _INIT,  STYP_INIT);
-#ifdef _REL_DYN
-  CHECK_SCNHDR (rel_dyn_section, _REL_DYN,  STYP_REL_DYN);
-#endif /* _REL_DYN */
-#ifdef _DYNSYM
-  CHECK_SCNHDR (dynsym_section, _DYNSYM,  STYP_DYNSYM);
-#endif /* _REL_DYN */
-#ifdef _DYNSTR
-  CHECK_SCNHDR (dynstr_section, _DYNSTR,  STYP_DYNSTR);
-#endif /* _REL_DYN */
-#ifdef _FINI
-  CHECK_SCNHDR (finit_section, _FINI,  STYP_FINI);
-#endif /* _FINI */
-  CHECK_SCNHDR (rdata_section, _RDATA, STYP_RDATA);
-#ifdef _RCONST
-  CHECK_SCNHDR (rconst_section, _RCONST, STYP_RCONST);
-#endif
-#ifdef _PDATA
-  CHECK_SCNHDR (pdata_section, _PDATA, STYP_PDATA);
-#endif /* _PDATA */
-#ifdef _GOT
-  CHECK_SCNHDR (got_section,   _GOT,   STYP_GOT);
-#endif /* _GOT */
-  CHECK_SCNHDR (data_section,  _DATA,  STYP_DATA);
-#ifdef _XDATA
-  CHECK_SCNHDR (xdata_section, _XDATA, STYP_XDATA);
-#endif /* _XDATA */
-#ifdef _LIT8
-  CHECK_SCNHDR (lit8_section,  _LIT8,  STYP_LIT8);
-  CHECK_SCNHDR (lit4_section,  _LIT4,  STYP_LIT4);
-#endif /* _LIT8 */
-  CHECK_SCNHDR (sdata_section, _SDATA, STYP_SDATA);
-  CHECK_SCNHDR (sbss_section,  _SBSS,  STYP_SBSS);
-  CHECK_SCNHDR (bss_section,   _BSS,   STYP_BSS);
-
-
-  pagesize = getpagesize ();
-  brk = (((long) (sbrk (0))) + pagesize - 1) & (-pagesize);
-
-  /* Remember the current break */
-
-  Brk = brk;
-
-  memcpy (&old_data_scnhdr, data_section, sizeof (old_data_scnhdr));
-
-  nhdr.aout.dsize = brk - DATA_START;
-  nhdr.aout.bsize = 0;
-  if (entry_address == 0)
-    {
-      extern __start ();
-      nhdr.aout.entry = (unsigned long)__start;
-    }
-  else
-    nhdr.aout.entry = entry_address;
-
-  nhdr.aout.bss_start = nhdr.aout.data_start + nhdr.aout.dsize;
-
-  if (rdata_section != NULL)
-    {
-      rdata_section->s_size = data_start - DATA_START;
-
-      /* Adjust start and virtual addresses of rdata_section, too.  */
-      rdata_section->s_vaddr = DATA_START;
-      rdata_section->s_paddr = DATA_START;
-      rdata_section->s_scnptr = text_section->s_scnptr + nhdr.aout.tsize;
-    }
-
-  data_section->s_vaddr = data_start;
-  data_section->s_paddr = data_start;
-  data_section->s_size = brk - data_start;
-
-  if (rdata_section != NULL)
-    {
-      data_section->s_scnptr = rdata_section->s_scnptr + rdata_section->s_size;
-    }
-
-  vaddr = data_section->s_vaddr + data_section->s_size;
-  scnptr = data_section->s_scnptr + data_section->s_size;
-  if (lit8_section != NULL)
-    {
-      lit8_section->s_vaddr = vaddr;
-      lit8_section->s_paddr = vaddr;
-      lit8_section->s_size = 0;
-      lit8_section->s_scnptr = scnptr;
-    }
-  if (lit4_section != NULL)
-    {
-      lit4_section->s_vaddr = vaddr;
-      lit4_section->s_paddr = vaddr;
-      lit4_section->s_size = 0;
-      lit4_section->s_scnptr = scnptr;
-    }
-  if (sdata_section != NULL)
-    {
-      sdata_section->s_vaddr = vaddr;
-      sdata_section->s_paddr = vaddr;
-      sdata_section->s_size = 0;
-      sdata_section->s_scnptr = scnptr;
-    }
-#ifdef _XDATA
-  if (xdata_section != NULL)
-    {
-      xdata_section->s_vaddr = vaddr;
-      xdata_section->s_paddr = vaddr;
-      xdata_section->s_size = 0;
-      xdata_section->s_scnptr = scnptr;
-    }
-#endif
-#ifdef _GOT
-  if (got_section != NULL)
-    {
-      memcpy (buffer, got_section, sizeof (struct scnhdr));
-
-      got_section->s_vaddr = vaddr;
-      got_section->s_paddr = vaddr;
-      got_section->s_size = 0;
-      got_section->s_scnptr = scnptr;
-    }
-#endif /*_GOT */
-  if (sbss_section != NULL)
-    {
-      sbss_section->s_vaddr = vaddr;
-      sbss_section->s_paddr = vaddr;
-      sbss_section->s_size = 0;
-      sbss_section->s_scnptr = scnptr;
-    }
-  if (bss_section != NULL)
-    {
-      bss_section->s_vaddr = vaddr;
-      bss_section->s_paddr = vaddr;
-      bss_section->s_size = 0;
-      bss_section->s_scnptr = scnptr;
-    }
-
-  WRITE (new, (char *)TEXT_START, nhdr.aout.tsize,
-         "writing text section to %s", new_name);
-  WRITE (new, (char *)DATA_START, nhdr.aout.dsize,
-         "writing data section to %s", new_name);
-
-#ifdef _GOT
-#define old_got_section ((struct scnhdr *)buffer)
-
-  if (got_section != NULL)
-    {
-      SEEK (new, old_got_section->s_scnptr,
-            "seeking to start of got_section in %s", new_name);
-      WRITE (new, oldptr + old_got_section->s_scnptr, old_got_section->s_size,
-             "writing new got_section of %s", new_name);
-      SEEK (new, nhdr.aout.tsize + nhdr.aout.dsize,
-            "seeking to end of data section of %s", new_name);
-    }
-
-#undef old_got_section
-#endif
-
-  /*
-   * Construct new symbol table header
-   */
-
-  memcpy (buffer, oldptr + nhdr.fhdr.f_symptr, cbHDRR);
-
-#define symhdr ((pHDRR)buffer)
-  newsyms = nhdr.aout.tsize + nhdr.aout.dsize;
-  symrel = newsyms - nhdr.fhdr.f_symptr;
-  nhdr.fhdr.f_symptr = newsyms;
-  symhdr->cbLineOffset += symrel;
-  symhdr->cbDnOffset += symrel;
-  symhdr->cbPdOffset += symrel;
-  symhdr->cbSymOffset += symrel;
-  symhdr->cbOptOffset += symrel;
-  symhdr->cbAuxOffset += symrel;
-  symhdr->cbSsOffset += symrel;
-  symhdr->cbSsExtOffset += symrel;
-  symhdr->cbFdOffset += symrel;
-  symhdr->cbRfdOffset += symrel;
-  symhdr->cbExtOffset += symrel;
-
-  WRITE (new, buffer, cbHDRR, "writing symbol table header of %s", new_name);
-
-  /*
-   * Copy the symbol table and line numbers
-   */
-  WRITE (new, oldptr + ohdr.fhdr.f_symptr + cbHDRR,
-         stat.st_size - ohdr.fhdr.f_symptr - cbHDRR,
-         "writing symbol table of %s", new_name);
-
-#ifdef _REL_DYN
-  if (rel_dyn_section)
-    update_dynamic_symbols (oldptr, new_name, new, nhdr.aout);
-#endif
-
-#undef symhdr
-
-  SEEK (new, 0, "seeking to start of header in %s", new_name);
-  WRITE (new, &nhdr, sizeof (nhdr),
-         "writing header of %s", new_name);
-
-  close (old);
-  close (new);
-  mark_x (new_name);
-}
-
-
-static void
-update_dynamic_symbols (old, new_name, new, aout)
-     char *old;                 /* Pointer to old executable */
-     char *new_name;            /* Name of new executable */
-     int new;                   /* File descriptor for new executable */
-     struct aouthdr aout;       /* a.out info from the file header */
-{
-#if !defined (__linux__) && !defined (__NetBSD__) && !defined (__OpenBSD__)
-
-  typedef struct dynrel_info {
-    char * addr;
-    unsigned type:8;
-    unsigned index:24;
-    unsigned info:8;
-    unsigned pad:8;
-  } dr_info;
-
-  int nsyms = rel_dyn_section->s_size / sizeof (struct dynrel_info);
-  int i;
-  dr_info * rd_base = (dr_info *) (old + rel_dyn_section->s_scnptr);
-  Elf32_Sym * ds_base = (Elf32_Sym *) (old + dynsym_section->s_scnptr);
-
-  for (i = 0; i < nsyms; i++) {
-    register Elf32_Sym x;
-
-    if (rd_base[i].index == 0)
-      continue;
-
-    x = ds_base[rd_base[i].index];
-
-#if 0
-      fprintf (stderr, "Object inspected: %s, addr = %lx, shndx = %x",
-               old + dynstr_section->s_scnptr + x.st_name, rd_base[i].addr, x.st_shndx);
-#endif
-
-
-    if ((ELF32_ST_BIND (x.st_info) == STB_GLOBAL)
-        && (x.st_shndx == 0)
-        /* && (x.st_value == NULL) */
-        ) {
-      /* OK, this is probably a reference to an object in a shared
-         library, so copy the old value. This is done in several steps:
-         1. reladdr is the address of the location in question relative to
-            the start of the data section,
-         2. oldref is the addr is the mapped in temacs executable,
-         3. newref is the address of the location in question in the
-            undumped executable,
-         4. len is the size of the object reference in bytes --
-            currently only 4 (long) and 8 (quad) are supported.
-            */
-      register unsigned long reladdr = (long)rd_base[i].addr - old_data_scnhdr.s_vaddr;
-      char * oldref = old + old_data_scnhdr.s_scnptr + reladdr;
-      unsigned long newref = aout.tsize + reladdr;
-      int len;
-
-#if 0
-      fprintf (stderr, "...relocated\n");
-#endif
-
-      if (rd_base[i].type == R_REFLONG)
-        len = 4;
-      else if (rd_base[i].type == R_REFQUAD)
-        len = 8;
-      else
-        fatal_unexec ("unrecognized relocation type in .dyn.rel section (symbol #%d)", (char *) i);
-
-      SEEK (new, newref, "seeking to dynamic symbol in %s", new_name);
-      WRITE (new, oldref, len, "writing old dynrel info in %s", new_name);
-    }
-
-#if 0
-    else
-      fprintf (stderr, "...not relocated\n");
-#endif
-
-  }
-
-#endif /* not __linux__ and not __NetBSD__ and not __OpenBSD__ */
-}
-
-
-/*
- * mark_x
- *
- * After successfully building the new a.out, mark it executable
- */
-
-static void
-mark_x (name)
-     char *name;
-{
-  struct stat sbuf;
-  int um = umask (777);
-  umask (um);
-  if (stat (name, &sbuf) < 0)
-    fatal_unexec ("getting protection on %s", name);
-  sbuf.st_mode |= 0111 & ~um;
-  if (chmod (name, sbuf.st_mode) < 0)
-    fatal_unexec ("setting protection on %s", name);
-}
-
-static void
-fatal_unexec (s, arg)
-     char *s;
-     char *arg;
-{
-  if (errno == EEOF)
-    fputs ("unexec: unexpected end of file, ", stderr);
-  else
-    fprintf (stderr, "unexec: %s, ", strerror (errno));
-  fprintf (stderr, s, arg);
-  fputs (".\n", stderr);
-  exit (1);
-}
-
-/* arch-tag: 46316c49-ee08-4aa3-942b-00798902f5bd
-   (do not change this comment) */
diff --git a/src/vm-limit.c b/src/vm-limit.c
index b288276f394..71ad82d687e 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -100,7 +100,7 @@ get_lim_data (void)
 }
 
 #else
-#if !defined (BSD4_2) && !defined (__osf__)
+#if !defined (BSD4_2) && !defined (__osf__) && !defined (CYGWIN)
 
 #ifdef MSDOS
 void
@@ -173,9 +173,9 @@ static void
 check_memory_limits (void)
 {
 #ifdef REL_ALLOC
-  extern POINTER (*real_morecore) ();
+  extern POINTER (*real_morecore) (SIZE);
 #endif
-  extern POINTER (*__morecore) ();
+  extern POINTER (*__morecore) (SIZE);
 
   register POINTER cp;
   unsigned long five_percent;
diff --git a/src/w32fns.c b/src/w32fns.c
index 57786d76795..72830c435e9 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -439,8 +439,6 @@ void x_explicitly_set_name (struct frame *, Lisp_Object, Lisp_Object);
 void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
 void x_set_title (struct frame *, Lisp_Object, Lisp_Object);
 void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
-static void x_edge_detection (struct frame *, struct image *, Lisp_Object,
-                              Lisp_Object);
 
 
 
@@ -788,25 +786,6 @@ DEFUN ("w32-default-color-map", Fw32_default_color_map, Sw32_default_color_map,
 }
 
 static Lisp_Object
-w32_to_x_color (Lisp_Object rgb)
-{
-  Lisp_Object color;
-
-  CHECK_NUMBER (rgb);
-
-  BLOCK_INPUT;
-
-  color = Frassq (rgb, Vw32_color_map);
-
-  UNBLOCK_INPUT;
-
-  if (!NILP (color))
-    return (Fcar (color));
-  else
-    return Qnil;
-}
-
-static Lisp_Object
 w32_color_map_lookup (char *colorname)
 {
   Lisp_Object tail, ret = Qnil;
diff --git a/src/w32gui.h b/src/w32gui.h
index 07a6fed0b47..9cad4f21f21 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -118,7 +118,7 @@ extern int nCmdShow;
 #define PBaseSize       (1L << 8) /* program specified base for incrementing */
 #define PWinGravity     (1L << 9) /* program specified window gravity */
 
-extern int XParseGeometry ();
+extern int XParseGeometry (char *, int *, int *, unsigned *, unsigned *);
 
 
 typedef struct {
diff --git a/src/w32heap.h b/src/w32heap.h
index cbd7f7ae96d..20a49a4e0ac 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -41,8 +41,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 #define get_w32_major_version()         w32_major_version
 #define get_w32_minor_version()         w32_minor_version
 
-extern unsigned char *get_data_start();
-extern unsigned char *get_data_end();
+extern unsigned char *get_data_start (void);
+extern unsigned char *get_data_end (void);
 extern unsigned long  reserved_heap_size;
 extern SYSTEM_INFO    sysinfo_cache;
 extern OSVERSIONINFO  osinfo_cache;
@@ -62,7 +62,7 @@ extern int os_subtype;
 extern void *sbrk (unsigned long size);
 
 /* Initialize heap structures for sbrk on startup.  */
-extern void init_heap ();
+extern void init_heap (void);
 
 /* Round the heap to this size.  */
 extern void round_heap (unsigned long size);
diff --git a/src/w32menu.c b/src/w32menu.c
index e96b70b59dc..919f8505da8 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -111,30 +111,6 @@ void w32_free_menu_strings (HWND);
 
 int pending_menu_activation;
 
-
-/* Return the frame whose ->output_data.w32->menubar_widget equals
-   ID, or 0 if none.  */
-
-static struct frame *
-menubar_id_to_frame (HMENU id)
-{
-  Lisp_Object tail, frame;
-  FRAME_PTR f;
-
-  for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
-    {
-      frame = XCAR (tail);
-      if (!FRAMEP (frame))
-        continue;
-      f = XFRAME (frame);
-      if (!FRAME_WINDOW_P (f))
-        continue;
-      if (f->output_data.w32->menubar_widget == id)
-        return f;
-    }
-  return 0;
-}
-
 #ifdef HAVE_MENUS
 
 DEFUN ("x-popup-dialog", Fx_popup_dialog, Sx_popup_dialog, 2, 3, 0,
@@ -1316,14 +1292,6 @@ name_is_separator (char *name)
   return (*name == '\0' || start + 2 == name);
 }
 
-
-/* Indicate boundary between left and right.  */
-static int
-add_left_right_boundary (HMENU menu)
-{
-  return AppendMenu (menu, MF_MENUBARBREAK, 0, NULL);
-}
-
 /* UTF8: 0xxxxxxx, 110xxxxx 10xxxxxx, 1110xxxx, 10xxxxxx, 10xxxxxx */
 static void
 utf8to16 (unsigned char * src, int len, WCHAR * dest)
diff --git a/src/w32term.c b/src/w32term.c
index 3a0a1b1abae..fc03034b14b 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -268,7 +268,9 @@ static void x_draw_bar_cursor (struct window *, struct glyph_row *, int,
 static void w32_clip_to_row (struct window *, struct glyph_row *, int, HDC);
 static BOOL my_show_window (struct frame *, HWND, int);
 static void my_set_window_pos (HWND, HWND, int, int, int, int, UINT);
+#if 0
 static void my_set_focus (struct frame *, HWND);
+#endif
 static void my_set_foreground_window (HWND);
 static void my_destroy_window (struct frame *, HWND);
 
@@ -3366,12 +3368,14 @@ my_set_window_pos (HWND hwnd, HWND hwndAfter,
 #endif
 }
 
+#if 0
 static void
 my_set_focus (struct frame * f, HWND hwnd)
 {
   SendMessage (FRAME_W32_WINDOW (f), WM_EMACS_SETFOCUS,
                (WPARAM) hwnd, 0);
 }
+#endif
 
 static void
 my_set_foreground_window (HWND hwnd)
diff --git a/src/w32term.h b/src/w32term.h
index b5b3d4451f2..ea245144ac3 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -48,8 +48,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 extern MSG CurMsg;
 extern BOOL bUseDflt;
 
-extern struct frame *x_window_to_frame ();
-
 /* Structure recording bitmaps and reference count.
    If REFCOUNT is 0 then this record is free to be reused.  */
 
@@ -226,13 +224,16 @@ extern Lisp_Object w32_display_name_list;
 /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'.  */
 extern Lisp_Object Vx_pixel_size_width_font_regexp;
 
-struct w32_display_info *x_display_info_for_name ();
+extern struct frame *x_window_to_frame (struct w32_display_info *, HWND);
+
+struct w32_display_info *x_display_info_for_name (Lisp_Object);
 
 Lisp_Object display_x_get_resource (struct w32_display_info *,
                                     Lisp_Object, Lisp_Object,
                                     Lisp_Object, Lisp_Object);
 
-extern struct w32_display_info *w32_term_init ();
+extern struct w32_display_info *w32_term_init (Lisp_Object,
+                                               char *, char *);
 
 extern int x_display_pixel_height (struct w32_display_info *);
 extern int x_display_pixel_width (struct w32_display_info *);
@@ -544,8 +545,10 @@ struct scroll_bar {
 #define VERTICAL_SCROLL_BAR_WIDTH_TRIM (0)
 
 
-extern void w32_fill_rect ();
-extern void w32_clear_window ();
+struct frame;  /* from frame.h */
+
+extern void w32_fill_rect (struct frame *, HDC, COLORREF, RECT *);
+extern void w32_clear_window (struct frame *);
 
 #define w32_fill_area(f,hdc,pix,x,y,nx,ny) \
 do { \
@@ -645,10 +648,10 @@ typedef struct deferred_msg
 
 extern CRITICAL_SECTION critsect;
 
-extern void init_crit ();
-extern void delete_crit ();
+extern void init_crit (void);
+extern void delete_crit (void);
 
-extern void signal_quit ();
+extern void signal_quit (void);
 
 #define enter_crit() EnterCriticalSection (&critsect)
 #define leave_crit() LeaveCriticalSection (&critsect)
@@ -658,14 +661,13 @@ extern void deselect_palette (struct frame * f, HDC hdc);
 extern HDC get_frame_dc (struct frame * f);
 extern int release_frame_dc (struct frame * f, HDC hDC);
 
-extern void drain_message_queue ();
+extern void drain_message_queue (void);
 
-extern BOOL get_next_msg ();
-extern BOOL post_msg ();
+extern BOOL get_next_msg (W32Msg *, BOOL);
+extern BOOL post_msg (W32Msg *);
 extern void complete_deferred_msg (HWND hwnd, UINT msg, LRESULT result);
-extern void wait_for_sync ();
 
-extern BOOL parse_button ();
+extern BOOL parse_button (int, int, int *, int *);
 
 extern void w32_sys_ring_bell (struct frame *f);
 extern void x_delete_display (struct w32_display_info *dpyinfo);
@@ -725,7 +727,7 @@ struct frame * check_x_frame (Lisp_Object);
 EXFUN (Fx_display_color_p, 1);
 EXFUN (Fx_display_grayscale_p, 1);
 
-typedef DWORD (WINAPI * ClipboardSequence_Proc) ();
+typedef DWORD (WINAPI * ClipboardSequence_Proc) (void);
 typedef BOOL (WINAPI * AppendMenuW_Proc) (
     IN HMENU,
     IN UINT,
diff --git a/src/xfaces.c b/src/xfaces.c
index d5aabd40c0c..c0c53f3aa1f 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -513,7 +513,6 @@ struct named_merge_point;
 static void map_tty_color (struct frame *, struct face *,
                            enum lface_attribute_index, int *);
 static Lisp_Object resolve_face_name (Lisp_Object, int);
-static int may_use_scalable_font_p (const char *);
 static void set_font_frame_param (Lisp_Object, Lisp_Object);
 static int get_lface_attributes (struct frame *, Lisp_Object, Lisp_Object *,
                                  int, struct named_merge_point *);