# HG changeset patch # User Dan Nicolaescu # Date 1280418604 25200 # Node ID e82b1db5099103d94aff936094d1b5b00b21d716 # Parent eb3d38be02c7684ed924cf32730e274a9fcb006c 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) diff -r eb3d38be02c7 -r e82b1db50991 src/ChangeLog --- 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 + + 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 * vm-limit.c (POINTER): Add typedef for it. diff -r eb3d38be02c7 -r e82b1db50991 src/editfns.c --- 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), diff -r eb3d38be02c7 -r e82b1db50991 src/lisp.h --- 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); diff -r eb3d38be02c7 -r e82b1db50991 src/systime.h --- 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.