aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-08-16 22:14:06 -0700
committerPaul Eggert2012-08-16 22:14:06 -0700
commit927c7216ad1efbcb0d1b0d2395e026f3ab13f70a (patch)
tree9b42952f93d3f7fbdbec0cfeb3c520505700445e /src
parent93044f7b87430236c1cb661d9e122f9d65cb24d1 (diff)
downloademacs-927c7216ad1efbcb0d1b0d2395e026f3ab13f70a.tar.gz
emacs-927c7216ad1efbcb0d1b0d2395e026f3ab13f70a.zip
* lisp.h (duration_to_sec_usec): Remove unused decl.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/lisp.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a3ae89b86f2..b1b6ac1cc4b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-08-17 Paul Eggert <eggert@cs.ucla.edu>
2
3 * lisp.h (duration_to_sec_usec): Remove unused decl.
4
12012-08-17 Alp Aker <alp.tekin.aker@gmail.com> 52012-08-17 Alp Aker <alp.tekin.aker@gmail.com>
2 6
3 * nsfont.m (ns_ascii_average_width): Send initWithFormat selector 7 * nsfont.m (ns_ascii_average_width): Send initWithFormat selector
@@ -3451,6 +3455,7 @@
3451 has at least microseconds now. All uses removed. 3455 has at least microseconds now. All uses removed.
3452 (update_frame, update_single_window, update_window, update_frame_1) 3456 (update_frame, update_single_window, update_window, update_frame_1)
3453 (Fsleep_for, sit_for): Port to higher-resolution time stamps. 3457 (Fsleep_for, sit_for): Port to higher-resolution time stamps.
3458 (duration_to_sec_usec): Remove; no longer needed.
3454 3459
3455 * editfns.c (time_overflow): Now extern. 3460 * editfns.c (time_overflow): Now extern.
3456 (Fcurrent_time, Fget_internal_run_time, make_time, lisp_time_argument) 3461 (Fcurrent_time, Fget_internal_run_time, make_time, lisp_time_argument)
diff --git a/src/lisp.h b/src/lisp.h
index fb0e44520d6..8ac01211a1f 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2682,7 +2682,6 @@ _Noreturn void __executable_start (void);
2682#endif 2682#endif
2683extern Lisp_Object selected_frame; 2683extern Lisp_Object selected_frame;
2684extern Lisp_Object Vwindow_system; 2684extern Lisp_Object Vwindow_system;
2685void duration_to_sec_usec (double, int *, int *);
2686extern Lisp_Object sit_for (Lisp_Object, int, int); 2685extern Lisp_Object sit_for (Lisp_Object, int, int);
2687extern void init_display (void); 2686extern void init_display (void);
2688extern void syms_of_display (void); 2687extern void syms_of_display (void);