From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 11 Mar 2006 12:33:03 +0000 (+0000)
Subject: Remove duplicate prototypes.  Make the prototype of getloadavg be conditioned
X-Git-Tag: emacs-pretest-22.0.90~3702
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8890220d927ff4c24530dc47c8b3df433e2c9432;p=emacs.git

Remove duplicate prototypes.  Make the prototype of getloadavg be conditioned
on HAVE_GETLOADAVG being undefined.
---

diff --git a/src/lisp.h b/src/lisp.h
index 99ed0575280..2eaa0987057 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2732,7 +2732,6 @@ EXFUN (Fbobp, 0);
 EXFUN (Fformat, MANY);
 EXFUN (Fmessage, MANY);
 extern Lisp_Object format2 P_ ((char *, Lisp_Object, Lisp_Object));
-extern Lisp_Object make_buffer_string P_ ((int, int, int));
 EXFUN (Fbuffer_substring, 2);
 EXFUN (Fbuffer_string, 0);
 extern Lisp_Object save_excursion_save P_ ((void));
@@ -2751,7 +2750,6 @@ extern Lisp_Object make_buffer_string P_ ((int, int, int));
 extern Lisp_Object make_buffer_string_both P_ ((int, int, int, int, int));
 extern void init_editfns P_ ((void));
 extern void syms_of_editfns P_ ((void));
-EXFUN (Fcurrent_message, 0);
 extern Lisp_Object Vinhibit_field_text_motion;
 EXFUN (Fconstrain_to_field, 5);
 EXFUN (Ffield_string, 1);
@@ -2849,7 +2847,6 @@ extern Lisp_Object close_file_unwind P_ ((Lisp_Object));
 extern void report_file_error P_ ((const char *, Lisp_Object));
 extern int internal_delete_file P_ ((Lisp_Object));
 extern void syms_of_fileio P_ ((void));
-EXFUN (Fmake_temp_name, 1);
 extern void init_fileio_once P_ ((void));
 extern Lisp_Object make_temp_name P_ ((Lisp_Object, int));
 EXFUN (Fmake_symbolic_link, 3);
@@ -3139,7 +3136,6 @@ extern void sys_subshell P_ ((void));
 extern void sys_suspend P_ ((void));
 extern void discard_tty_input P_ ((void));
 extern void init_sys_modes P_ ((void));
-extern void reset_sys_modes P_ ((void));
 extern void get_frame_size P_ ((int *, int *));
 extern void wait_for_termination P_ ((int));
 extern void flush_pending_output P_ ((int));
@@ -3192,8 +3188,10 @@ EXFUN (Fset_fontset_font, 4);
 /* Defined in xfaces.c */
 extern void syms_of_xfaces P_ ((void));
 
+#ifndef HAVE_GETLOADAVG
 /* Defined in getloadavg.c */
 extern int getloadavg P_ ((double *, int));
+#endif
 
 #ifdef HAVE_X_WINDOWS
 /* Defined in xfns.c */
@@ -3214,9 +3212,6 @@ extern void syms_of_xselect P_ ((void));
 /* Defined in xterm.c */
 extern void syms_of_xterm P_ ((void));
 
-/* Defined in getloadavg.c */
-extern int getloadavg P_ ((double [], int));
-
 #ifdef MSDOS
 /* Defined in msdos.c */
 EXFUN (Fmsdos_downcase_filename, 1);