diff options
| author | Paul Eggert | 2011-03-14 18:32:33 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-03-14 18:32:33 -0700 |
| commit | b45db52287c1a23b2c639f4843395e4b5a4dbe92 (patch) | |
| tree | e124bdc3cfd045ce7e9a76e4d97c5bfc74ef739e /src | |
| parent | 40ef059ee2a2cd7b4e3e75eef58c8ddcd2abb15f (diff) | |
| download | emacs-b45db52287c1a23b2c639f4843395e4b5a4dbe92.tar.gz emacs-b45db52287c1a23b2c639f4843395e4b5a4dbe92.zip | |
* lisp.h (verify_bytepos, count_markers): New decls,
so that gcc does not warn that these functions aren't declared.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/lisp.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8bdf6881795..c438f1fb41a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-03-15 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2011-03-15 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * lisp.h (verify_bytepos, count_markers): New decls, | ||
| 4 | so that gcc does not warn that these functions aren't declared. | ||
| 5 | |||
| 3 | * insdel.c (check_markers, make_gap_larger, make_gap_smaller): | 6 | * insdel.c (check_markers, make_gap_larger, make_gap_smaller): |
| 4 | (reset_var_on_error, Fcombine_after_change_execute_1): Now static. | 7 | (reset_var_on_error, Fcombine_after_change_execute_1): Now static. |
| 5 | (CHECK_MARKERS): Redo to avoid gcc -Wempty-body diagnostic. | 8 | (CHECK_MARKERS): Redo to avoid gcc -Wempty-body diagnostic. |
diff --git a/src/lisp.h b/src/lisp.h index eacd68e42cb..3ba18186497 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -2995,12 +2995,14 @@ extern EMACS_INT marker_byte_position (Lisp_Object); | |||
| 2995 | extern void clear_charpos_cache (struct buffer *); | 2995 | extern void clear_charpos_cache (struct buffer *); |
| 2996 | extern EMACS_INT charpos_to_bytepos (EMACS_INT); | 2996 | extern EMACS_INT charpos_to_bytepos (EMACS_INT); |
| 2997 | extern EMACS_INT buf_charpos_to_bytepos (struct buffer *, EMACS_INT); | 2997 | extern EMACS_INT buf_charpos_to_bytepos (struct buffer *, EMACS_INT); |
| 2998 | extern EMACS_INT verify_bytepos (EMACS_INT charpos); | ||
| 2998 | extern EMACS_INT buf_bytepos_to_charpos (struct buffer *, EMACS_INT); | 2999 | extern EMACS_INT buf_bytepos_to_charpos (struct buffer *, EMACS_INT); |
| 2999 | extern void unchain_marker (struct Lisp_Marker *marker); | 3000 | extern void unchain_marker (struct Lisp_Marker *marker); |
| 3000 | extern Lisp_Object set_marker_restricted (Lisp_Object, Lisp_Object, Lisp_Object); | 3001 | extern Lisp_Object set_marker_restricted (Lisp_Object, Lisp_Object, Lisp_Object); |
| 3001 | extern Lisp_Object set_marker_both (Lisp_Object, Lisp_Object, EMACS_INT, EMACS_INT); | 3002 | extern Lisp_Object set_marker_both (Lisp_Object, Lisp_Object, EMACS_INT, EMACS_INT); |
| 3002 | extern Lisp_Object set_marker_restricted_both (Lisp_Object, Lisp_Object, | 3003 | extern Lisp_Object set_marker_restricted_both (Lisp_Object, Lisp_Object, |
| 3003 | EMACS_INT, EMACS_INT); | 3004 | EMACS_INT, EMACS_INT); |
| 3005 | extern int count_markers (struct buffer *); | ||
| 3004 | extern void syms_of_marker (void); | 3006 | extern void syms_of_marker (void); |
| 3005 | 3007 | ||
| 3006 | /* Defined in fileio.c */ | 3008 | /* Defined in fileio.c */ |