diff options
| author | Paul Eggert | 2011-03-15 17:44:50 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-15 17:44:50 -0700 |
| commit | a292836456b5f127782b10accd31ff3c0b7b445d (patch) | |
| tree | 07074ab238e8d3f09255f02c54ce25bc73416ab4 /src | |
| parent | 63c5d10bb25f33f82cda1877d4aff792c030db94 (diff) | |
| download | emacs-a292836456b5f127782b10accd31ff3c0b7b445d.tar.gz emacs-a292836456b5f127782b10accd31ff3c0b7b445d.zip | |
Move editfns decls to lisp.h to check interfaces.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/editfns.c | 2 | ||||
| -rw-r--r-- | src/lisp.h | 3 | ||||
| -rw-r--r-- | src/process.c | 2 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2011-03-16 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-03-16 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * lisp.h (get_system_name, get_operating_system_release): | ||
| 4 | Move decls here, to check interfaces. | ||
| 5 | * process.c (get_operating_system_release): Move decl to lisp.h. | ||
| 6 | * xrdb.c (get_system_name): Likewise. | ||
| 3 | * editfns.c (init_editfns, Fuser_login_name, Fuser_uid): | 7 | * editfns.c (init_editfns, Fuser_login_name, Fuser_uid): |
| 4 | (Fuser_real_uid, Fuser_full_name): Remove unnecessary casts, | 8 | (Fuser_real_uid, Fuser_full_name): Remove unnecessary casts, |
| 5 | some of which prompt warnings from gcc -Wbad-function-cast. | 9 | 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, | |||
| 1391 | return Vsystem_name; | 1391 | return Vsystem_name; |
| 1392 | } | 1392 | } |
| 1393 | 1393 | ||
| 1394 | /* For the benefit of callers who don't want to include lisp.h */ | ||
| 1395 | |||
| 1396 | const char * | 1394 | const char * |
| 1397 | get_system_name (void) | 1395 | get_system_name (void) |
| 1398 | { | 1396 | { |
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); | |||
| 2874 | extern void init_eval (void); | 2874 | extern void init_eval (void); |
| 2875 | extern void syms_of_eval (void); | 2875 | extern void syms_of_eval (void); |
| 2876 | 2876 | ||
| 2877 | /* Defined in editfns.c */ | ||
| 2877 | extern Lisp_Object Qfield; | 2878 | extern Lisp_Object Qfield; |
| 2878 | EXFUN (Fcurrent_message, 0); | 2879 | EXFUN (Fcurrent_message, 0); |
| 2879 | EXFUN (Fgoto_char, 1); | 2880 | EXFUN (Fgoto_char, 1); |
| @@ -2913,6 +2914,8 @@ extern Lisp_Object make_buffer_string (EMACS_INT, EMACS_INT, int); | |||
| 2913 | extern Lisp_Object make_buffer_string_both (EMACS_INT, EMACS_INT, EMACS_INT, | 2914 | extern Lisp_Object make_buffer_string_both (EMACS_INT, EMACS_INT, EMACS_INT, |
| 2914 | EMACS_INT, int); | 2915 | EMACS_INT, int); |
| 2915 | extern void init_editfns (void); | 2916 | extern void init_editfns (void); |
| 2917 | const char *get_system_name (void); | ||
| 2918 | const char *get_operating_system_release (void); | ||
| 2916 | extern void syms_of_editfns (void); | 2919 | extern void syms_of_editfns (void); |
| 2917 | EXFUN (Fconstrain_to_field, 5); | 2920 | EXFUN (Fconstrain_to_field, 5); |
| 2918 | EXFUN (Ffield_end, 3); | 2921 | 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; | |||
| 162 | /* Define first descriptor number available for subprocesses. */ | 162 | /* Define first descriptor number available for subprocesses. */ |
| 163 | #define FIRST_PROC_DESC 3 | 163 | #define FIRST_PROC_DESC 3 |
| 164 | 164 | ||
| 165 | extern const char *get_operating_system_release (void); | ||
| 166 | |||
| 167 | #ifndef HAVE_H_ERRNO | 165 | #ifndef HAVE_H_ERRNO |
| 168 | extern int h_errno; | 166 | extern int h_errno; |
| 169 | #endif | 167 | #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 *); | |||
| 54 | extern struct passwd *getpwuid (uid_t); | 54 | extern struct passwd *getpwuid (uid_t); |
| 55 | extern struct passwd *getpwnam (const char *); | 55 | extern struct passwd *getpwnam (const char *); |
| 56 | 56 | ||
| 57 | extern const char *get_system_name (void); | ||
| 58 | |||
| 59 | char *x_get_string_resource (XrmDatabase rdb, const char *name, | 57 | char *x_get_string_resource (XrmDatabase rdb, const char *name, |
| 60 | const char *class); | 58 | const char *class); |
| 61 | static int file_p (const char *filename); | 59 | static int file_p (const char *filename); |