aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2010-07-29 08:50:04 -0700
committerDan Nicolaescu2010-07-29 08:50:04 -0700
commit26469a38e110614fd3ea603f0b6ee2ab6d27a3be (patch)
tree51e55466bdd4a5569410366c01b0d47d74254fa9 /src
parentbace45fe155ea01bb387dac6316852bb9c1c5df4 (diff)
downloademacs-26469a38e110614fd3ea603f0b6ee2ab6d27a3be.tar.gz
emacs-26469a38e110614fd3ea603f0b6ee2ab6d27a3be.zip
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)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/editfns.c1
-rw-r--r--src/lisp.h1
-rw-r--r--src/systime.h3
4 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 83997354718..6dfd993ede4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12010-07-29 Dan Nicolaescu <dann@ics.uci.edu>
2
3 Make lisp_time_argument declaration work on all systems.
4 * lisp.h (lisp_time_argument): Move declaration ...
5 * systime.h (lisp_time_argument): ... here
6 * editfns.c (lisp_time_argument): Remove declaration. (Bug#6751)
7
12010-07-29 Jan Djärv <jan.h.d@swipnet.se> 82010-07-29 Jan Djärv <jan.h.d@swipnet.se>
2 9
3 * vm-limit.c (POINTER): Add typedef for it. 10 * vm-limit.c (POINTER): Add typedef for it.
diff --git a/src/editfns.c b/src/editfns.c
index 24140eff152..e27e37fb33f 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -97,7 +97,6 @@ static int tm_diff (struct tm *, struct tm *);
97static void find_field (Lisp_Object, Lisp_Object, Lisp_Object, int *, Lisp_Object, int *); 97static void find_field (Lisp_Object, Lisp_Object, Lisp_Object, int *, Lisp_Object, int *);
98static void update_buffer_properties (int, int); 98static void update_buffer_properties (int, int);
99static Lisp_Object region_limit (int); 99static Lisp_Object region_limit (int);
100int lisp_time_argument (Lisp_Object, time_t *, int *);
101static size_t emacs_memftimeu (char *, size_t, const char *, 100static size_t emacs_memftimeu (char *, size_t, const char *,
102 size_t, const struct tm *, int); 101 size_t, const struct tm *, int);
103static void general_insert_function (void (*) (const unsigned char *, EMACS_INT), 102static void general_insert_function (void (*) (const unsigned char *, EMACS_INT),
diff --git a/src/lisp.h b/src/lisp.h
index 06a8b672fba..f278f856f5c 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2995,7 +2995,6 @@ EXFUN (Ffield_beginning, 3);
2995EXFUN (Ffield_end, 3); 2995EXFUN (Ffield_end, 3);
2996EXFUN (Ffield_string_no_properties, 1); 2996EXFUN (Ffield_string_no_properties, 1);
2997extern void set_time_zone_rule (const char *); 2997extern void set_time_zone_rule (const char *);
2998extern int lisp_time_argument (Lisp_Object, time_t *, int *);
2999 2998
3000/* Defined in buffer.c */ 2999/* Defined in buffer.c */
3001extern int mouse_face_overlay_overlaps (Lisp_Object); 3000extern int mouse_face_overlay_overlaps (Lisp_Object);
diff --git a/src/systime.h b/src/systime.h
index bd789e9bd32..9f6a907a9c2 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -147,6 +147,9 @@ extern void set_waiting_for_input (EMACS_TIME *);
147#ifdef GCPRO1 147#ifdef GCPRO1
148/* defined in dired.c */ 148/* defined in dired.c */
149extern Lisp_Object make_time (time_t); 149extern Lisp_Object make_time (time_t);
150
151/* defined in editfns.c*/
152extern int lisp_time_argument (Lisp_Object, time_t *, int *);
150#endif 153#endif
151 154
152/* Compare times T1 and T2. Value is 0 if T1 and T2 are the same. 155/* Compare times T1 and T2. Value is 0 if T1 and T2 are the same.