summaryrefslogtreecommitdiff
path: root/src/systime.h
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2005-09-30 22:38:16 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2005-09-30 22:38:16 +0000
commitfa8459a34e076cacde3b7c259af9b5dd84b60802 (patch)
treeb3d68a9fe6cdfe631bcecb42b30b087aa566e942 /src/systime.h
parentb17f937955a92bd8416821ec847d859bc9c3de85 (diff)
downloademacs-fa8459a34e076cacde3b7c259af9b5dd84b60802.tar.gz
* image.c (slurp_file, xbm_read_bitmap_data): Cast to the correct
type. * xterm.c (handle_one_xevent, handle_one_xevent): Likewise. * unexelf.c (fatal): Fix prototype. * term.c (fatal): Implement using varargs. * regex.c (re_char): Move typedef ... * regex.h (re_char): ... here. (re_iswctype, re_wctype, re_set_whitespace_regexp): New prototypes. * emacs.c (malloc_set_state): Fix return type. (endif): Fix type. * lisp.h (fatal): Add argument types. * dispextern.h (fatal): Delete prototype. * systime.h: (make_time): Prototype moved from ... * editfns.c (make_time): ... here. * editfns.c: Move systime.h include after lisp.h. * dired.c: * xsmfns.c: * process.c: Likewise. * alloc.c (old_malloc_hook, old_realloc_hook, old_realloc_hook): Add parameter types. (__malloc_hook, __realloc_hook, __free_hook): Fix prototypes. (emacs_blocked_free): Change definition to match __free_hook. (emacs_blocked_malloc): Change definition to match __malloc_hook. (emacs_blocked_realloc): Change definition to match __realloc_hook.
Diffstat (limited to 'src/systime.h')
-rw-r--r--src/systime.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/systime.h b/src/systime.h
index 1d0022e93d7..9851db4cf33 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -157,6 +157,14 @@ extern int set_file_times __P ((const char *, EMACS_TIME, EMACS_TIME));
/* defined in keyboard.c */
extern void set_waiting_for_input __P ((EMACS_TIME *));
+/* When lisp.h is not included Lisp_Object is not defined (this can
+ happen when this files is used outside the src directory).
+ Use GCPRO1 to determine if lisp.h was included. */
+#ifdef GCPRO1
+/* defined in dired.c */
+extern Lisp_Object make_time __P ((time_t));
+#endif
+
/* Compare times T1 and T2. Value is 0 if T1 and T2 are the same.
Value is < 0 if T1 is less than T2. Value is > 0 otherwise. */