aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2006-03-11 12:33:03 +0000
committerEli Zaretskii2006-03-11 12:33:03 +0000
commit8890220d927ff4c24530dc47c8b3df433e2c9432 (patch)
treec0a52dc5799fb07561eeabefb1b0c30e034d050c /src
parent29c8385073b8c0448b4429a01c198f05807f1c57 (diff)
downloademacs-8890220d927ff4c24530dc47c8b3df433e2c9432.tar.gz
emacs-8890220d927ff4c24530dc47c8b3df433e2c9432.zip
Remove duplicate prototypes. Make the prototype of getloadavg be conditioned
on HAVE_GETLOADAVG being undefined.
Diffstat (limited to 'src')
-rw-r--r--src/lisp.h9
1 files changed, 2 insertions, 7 deletions
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);
2732EXFUN (Fformat, MANY); 2732EXFUN (Fformat, MANY);
2733EXFUN (Fmessage, MANY); 2733EXFUN (Fmessage, MANY);
2734extern Lisp_Object format2 P_ ((char *, Lisp_Object, Lisp_Object)); 2734extern Lisp_Object format2 P_ ((char *, Lisp_Object, Lisp_Object));
2735extern Lisp_Object make_buffer_string P_ ((int, int, int));
2736EXFUN (Fbuffer_substring, 2); 2735EXFUN (Fbuffer_substring, 2);
2737EXFUN (Fbuffer_string, 0); 2736EXFUN (Fbuffer_string, 0);
2738extern Lisp_Object save_excursion_save P_ ((void)); 2737extern Lisp_Object save_excursion_save P_ ((void));
@@ -2751,7 +2750,6 @@ extern Lisp_Object make_buffer_string P_ ((int, int, int));
2751extern Lisp_Object make_buffer_string_both P_ ((int, int, int, int, int)); 2750extern Lisp_Object make_buffer_string_both P_ ((int, int, int, int, int));
2752extern void init_editfns P_ ((void)); 2751extern void init_editfns P_ ((void));
2753extern void syms_of_editfns P_ ((void)); 2752extern void syms_of_editfns P_ ((void));
2754EXFUN (Fcurrent_message, 0);
2755extern Lisp_Object Vinhibit_field_text_motion; 2753extern Lisp_Object Vinhibit_field_text_motion;
2756EXFUN (Fconstrain_to_field, 5); 2754EXFUN (Fconstrain_to_field, 5);
2757EXFUN (Ffield_string, 1); 2755EXFUN (Ffield_string, 1);
@@ -2849,7 +2847,6 @@ extern Lisp_Object close_file_unwind P_ ((Lisp_Object));
2849extern void report_file_error P_ ((const char *, Lisp_Object)); 2847extern void report_file_error P_ ((const char *, Lisp_Object));
2850extern int internal_delete_file P_ ((Lisp_Object)); 2848extern int internal_delete_file P_ ((Lisp_Object));
2851extern void syms_of_fileio P_ ((void)); 2849extern void syms_of_fileio P_ ((void));
2852EXFUN (Fmake_temp_name, 1);
2853extern void init_fileio_once P_ ((void)); 2850extern void init_fileio_once P_ ((void));
2854extern Lisp_Object make_temp_name P_ ((Lisp_Object, int)); 2851extern Lisp_Object make_temp_name P_ ((Lisp_Object, int));
2855EXFUN (Fmake_symbolic_link, 3); 2852EXFUN (Fmake_symbolic_link, 3);
@@ -3139,7 +3136,6 @@ extern void sys_subshell P_ ((void));
3139extern void sys_suspend P_ ((void)); 3136extern void sys_suspend P_ ((void));
3140extern void discard_tty_input P_ ((void)); 3137extern void discard_tty_input P_ ((void));
3141extern void init_sys_modes P_ ((void)); 3138extern void init_sys_modes P_ ((void));
3142extern void reset_sys_modes P_ ((void));
3143extern void get_frame_size P_ ((int *, int *)); 3139extern void get_frame_size P_ ((int *, int *));
3144extern void wait_for_termination P_ ((int)); 3140extern void wait_for_termination P_ ((int));
3145extern void flush_pending_output P_ ((int)); 3141extern void flush_pending_output P_ ((int));
@@ -3192,8 +3188,10 @@ EXFUN (Fset_fontset_font, 4);
3192/* Defined in xfaces.c */ 3188/* Defined in xfaces.c */
3193extern void syms_of_xfaces P_ ((void)); 3189extern void syms_of_xfaces P_ ((void));
3194 3190
3191#ifndef HAVE_GETLOADAVG
3195/* Defined in getloadavg.c */ 3192/* Defined in getloadavg.c */
3196extern int getloadavg P_ ((double *, int)); 3193extern int getloadavg P_ ((double *, int));
3194#endif
3197 3195
3198#ifdef HAVE_X_WINDOWS 3196#ifdef HAVE_X_WINDOWS
3199/* Defined in xfns.c */ 3197/* Defined in xfns.c */
@@ -3214,9 +3212,6 @@ extern void syms_of_xselect P_ ((void));
3214/* Defined in xterm.c */ 3212/* Defined in xterm.c */
3215extern void syms_of_xterm P_ ((void)); 3213extern void syms_of_xterm P_ ((void));
3216 3214
3217/* Defined in getloadavg.c */
3218extern int getloadavg P_ ((double [], int));
3219
3220#ifdef MSDOS 3215#ifdef MSDOS
3221/* Defined in msdos.c */ 3216/* Defined in msdos.c */
3222EXFUN (Fmsdos_downcase_filename, 1); 3217EXFUN (Fmsdos_downcase_filename, 1);