From a292836456b5f127782b10accd31ff3c0b7b445d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 15 Mar 2011 17:44:50 -0700 Subject: [PATCH] Move editfns decls to lisp.h to check interfaces. --- src/ChangeLog | 4 ++++ src/editfns.c | 2 -- src/lisp.h | 3 +++ src/process.c | 2 -- src/xrdb.c | 2 -- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c477a43693f..69cfabaad3b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2011-03-16 Paul Eggert + * lisp.h (get_system_name, get_operating_system_release): + Move decls here, to check interfaces. + * process.c (get_operating_system_release): Move decl to lisp.h. + * xrdb.c (get_system_name): Likewise. * editfns.c (init_editfns, Fuser_login_name, Fuser_uid): (Fuser_real_uid, Fuser_full_name): Remove unnecessary casts, some of which prompt warnings from gcc -Wbad-function-cast. diff --git a/src/editfns.c b/src/editfns.c index bfe07163cc8..9966eaaa057 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1391,8 +1391,6 @@ DEFUN ("system-name", Fsystem_name, Ssystem_name, 0, 0, 0, return Vsystem_name; } -/* For the benefit of callers who don't want to include lisp.h */ - const char * get_system_name (void) { diff --git a/src/lisp.h b/src/lisp.h index 5da73c57c66..5a5e7dbec6b 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2874,6 +2874,7 @@ extern Lisp_Object safe_call2 (Lisp_Object, Lisp_Object, Lisp_Object); extern void init_eval (void); extern void syms_of_eval (void); +/* Defined in editfns.c */ extern Lisp_Object Qfield; EXFUN (Fcurrent_message, 0); EXFUN (Fgoto_char, 1); @@ -2913,6 +2914,8 @@ extern Lisp_Object make_buffer_string (EMACS_INT, EMACS_INT, int); extern Lisp_Object make_buffer_string_both (EMACS_INT, EMACS_INT, EMACS_INT, EMACS_INT, int); extern void init_editfns (void); +const char *get_system_name (void); +const char *get_operating_system_release (void); extern void syms_of_editfns (void); EXFUN (Fconstrain_to_field, 5); EXFUN (Ffield_end, 3); diff --git a/src/process.c b/src/process.c index 7bfd2a3258a..39fa26e8b54 100644 --- a/src/process.c +++ b/src/process.c @@ -162,8 +162,6 @@ extern Lisp_Object QCfilter; /* Define first descriptor number available for subprocesses. */ #define FIRST_PROC_DESC 3 -extern const char *get_operating_system_release (void); - #ifndef HAVE_H_ERRNO extern int h_errno; #endif diff --git a/src/xrdb.c b/src/xrdb.c index 63e5851979c..a79f453e5e1 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -54,8 +54,6 @@ extern char *getenv (const char *); extern struct passwd *getpwuid (uid_t); extern struct passwd *getpwnam (const char *); -extern const char *get_system_name (void); - char *x_get_string_resource (XrmDatabase rdb, const char *name, const char *class); static int file_p (const char *filename); -- 2.39.2