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 --git a/src/ChangeLog b/src/ChangeLog
index 839973547189ff4cf6011d713e8c5ba28fb5fd9a..6dfd993ede429817cf9aca33d2b8ea41123c013d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/editfns.c b/src/editfns.c
index 24140eff15217a4d40c820c0e511bde8ed740424..e27e37fb33f584c8a3641358f3ac94a919dd8d3f 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -97,7 +97,6 @@ static int tm_diff (struct tm *, struct tm *);
 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 --git a/src/lisp.h b/src/lisp.h
index 06a8b672fba84ecb35fffa0a15688666444e67c2..f278f856f5c3539909fc84072e11117514adc138 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2995,7 +2995,6 @@ EXFUN (Ffield_beginning, 3);
 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 --git a/src/systime.h b/src/systime.h
index bd789e9bd32137a4a03d697d6f02aa5697e7a30a..9f6a907a9c21bad82e107586d16817ae2bc763b1 100644 (file)
--- a/src/systime.h
+++ b/src/systime.h
@@ -147,6 +147,9 @@ extern void set_waiting_for_input (EMACS_TIME *);
 #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.