From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Giorgos Keramidas Newsgroups: gmane.emacs.devel Subject: minor cleanup of src/lisp.h ? Date: Mon, 27 Feb 2006 13:54:36 +0200 Message-ID: <20060227115435.GA18761@flame.pc> NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1141154693 30518 80.91.229.2 (28 Feb 2006 19:24:53 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 28 Feb 2006 19:24:53 +0000 (UTC) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 28 20:24:51 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by ciao.gmane.org with esmtp (Exim 4.43) id 1FEASC-0000tD-Fu for ged-emacs-devel@m.gmane.org; Tue, 28 Feb 2006 20:24:13 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FDrGN-0007P7-Hx for ged-emacs-devel@m.gmane.org; Mon, 27 Feb 2006 17:54:43 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1FDh30-0006GM-Gk for emacs-devel@gnu.org; Mon, 27 Feb 2006 07:00:16 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1FDgyi-00051e-8F for emacs-devel@gnu.org; Mon, 27 Feb 2006 07:00:10 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1FDgyd-00050Q-Gc for emacs-devel@gnu.org; Mon, 27 Feb 2006 06:55:45 -0500 Original-Received: from [62.1.205.36] (helo=igloo.linux.gr) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1FDgzH-0006u5-HX for emacs-devel@gnu.org; Mon, 27 Feb 2006 06:56:24 -0500 Original-Received: from flame.pc (aris.bedc.ondsl.gr [62.103.39.226]) (authenticated bits=128) by igloo.linux.gr (8.13.5/8.13.5/Debian-3) with ESMTP id k1RBt5L0013286 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Mon, 27 Feb 2006 13:55:22 +0200 Original-Received: from flame.pc (flame [127.0.0.1]) by flame.pc (8.13.4/8.13.4) with ESMTP id k1RBsasj019715 for ; Mon, 27 Feb 2006 13:54:36 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Original-Received: (from keramida@localhost) by flame.pc (8.13.4/8.13.4/Submit) id k1RBsa4n019714 for emacs-devel@gnu.org; Mon, 27 Feb 2006 13:54:36 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Original-To: emacs-devel@gnu.org Content-Disposition: inline X-Hellug-MailScanner: Found to be clean X-Hellug-MailScanner-SpamCheck: not spam, SpamAssassin (score=-3.376, required 5, autolearn=not spam, ALL_TRUSTED -1.80, AWL 0.82, BAYES_00 -2.60, DNS_FROM_RFC_ABUSE 0.20) X-Hellug-MailScanner-From: keramida@ceid.upatras.gr X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:51021 Archived-At: Hi all, I've found a few duplicate C function prototypes in src/lisp.h which we can probably remove safely, and a duplicate prototype for getloadavg() which may also conflict with the system prototype of the same function. The following diff shows the duplicate prototypes: % Index: emacs/src/lisp.h % =================================================================== % --- emacs/src/lisp.h (revision 66) % +++ emacs/src/lisp.h (working copy) % @@ -2732,7 +2732,6 @@ % 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_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 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); % @@ -3134,7 +3131,6 @@ % extern void init_sigio P_ ((int)); % extern void request_sigio P_ ((void)); % extern void unrequest_sigio P_ ((void)); % -extern void reset_sys_modes P_ ((void)); % extern void sys_subshell P_ ((void)); % extern void sys_suspend P_ ((void)); % extern void discard_tty_input P_ ((void)); % @@ -3192,8 +3188,10 @@ % /* 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 @@ % /* 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); %