Mercurial > emacs
changeset 109579:e82b1db50991
Make lisp_time_argument work on all systems.
* src/lisp.h (lisp_time_argument): Move declaration ...
* src/systime.h (lisp_time_argument): ... here
* src/editfns.c (lisp_time_argument): Remove declaration. (Bug#6751)
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 29 Jul 2010 08:50:04 -0700 |
| parents | eb3d38be02c7 |
| children | 3021343b766a |
| files | src/ChangeLog src/editfns.c src/lisp.h src/systime.h |
| diffstat | 4 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Jul 29 15:54:03 2010 +0200 +++ b/src/ChangeLog Thu Jul 29 08:50:04 2010 -0700 @@ -1,3 +1,10 @@ +2010-07-29 Dan Nicolaescu <dann@ics.uci.edu> + + Make lisp_time_argument declaration work on all systems. + * lisp.h (lisp_time_argument): Move declaration ... + * systime.h (lisp_time_argument): ... here + * editfns.c (lisp_time_argument): Remove declaration. (Bug#6751) + 2010-07-29 Jan Djärv <jan.h.d@swipnet.se> * vm-limit.c (POINTER): Add typedef for it.
--- a/src/editfns.c Thu Jul 29 15:54:03 2010 +0200 +++ b/src/editfns.c Thu Jul 29 08:50:04 2010 -0700 @@ -97,7 +97,6 @@ static void find_field (Lisp_Object, Lisp_Object, Lisp_Object, int *, Lisp_Object, int *); static void update_buffer_properties (int, int); static Lisp_Object region_limit (int); -int lisp_time_argument (Lisp_Object, time_t *, int *); static size_t emacs_memftimeu (char *, size_t, const char *, size_t, const struct tm *, int); static void general_insert_function (void (*) (const unsigned char *, EMACS_INT),
--- a/src/lisp.h Thu Jul 29 15:54:03 2010 +0200 +++ b/src/lisp.h Thu Jul 29 08:50:04 2010 -0700 @@ -2995,7 +2995,6 @@ EXFUN (Ffield_end, 3); EXFUN (Ffield_string_no_properties, 1); extern void set_time_zone_rule (const char *); -extern int lisp_time_argument (Lisp_Object, time_t *, int *); /* Defined in buffer.c */ extern int mouse_face_overlay_overlaps (Lisp_Object);
--- a/src/systime.h Thu Jul 29 15:54:03 2010 +0200 +++ b/src/systime.h Thu Jul 29 08:50:04 2010 -0700 @@ -147,6 +147,9 @@ #ifdef GCPRO1 /* defined in dired.c */ extern Lisp_Object make_time (time_t); + +/* defined in editfns.c*/ +extern int lisp_time_argument (Lisp_Object, time_t *, int *); #endif /* Compare times T1 and T2. Value is 0 if T1 and T2 are the same.