[Emacs-diffs] /srv/bzr/emacs/trunk r100937: Make lisp_time_argument work on all systems.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 100937
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Thu 2010-07-29 08:50:04 -0700
message:
  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)
modified:
  src/ChangeLog
  src/editfns.c
  src/lisp.h
  src/systime.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-29 06:59:29 +0000
+++ b/src/ChangeLog     2010-07-29 15:50:04 +0000
@@ -1,3 +1,10 @@
+2010-07-29  Dan Nicolaescu  <address@hidden>
+
+       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  <address@hidden>
 
        * vm-limit.c (POINTER): Add typedef for it.

=== modified file 'src/editfns.c'
--- a/src/editfns.c     2010-07-27 03:52:35 +0000
+++ b/src/editfns.c     2010-07-29 15:50:04 +0000
@@ -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),

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2010-07-29 05:48:06 +0000
+++ b/src/lisp.h        2010-07-29 15:50:04 +0000
@@ -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);

=== modified file 'src/systime.h'
--- a/src/systime.h     2010-07-02 09:26:33 +0000
+++ b/src/systime.h     2010-07-29 15:50:04 +0000
@@ -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.