aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-09-30 09:26:32 +0200
committerEli Zaretskii2012-09-30 09:26:32 +0200
commit84f72efd0c52bbae42a5169d9a94ad0feacb789e (patch)
tree883d863e39b1c07f572e28687f59f23e330384d5 /src
parentd89460ed93e67852a95a597a7a1a7983e8828fb9 (diff)
downloademacs-84f72efd0c52bbae42a5169d9a94ad0feacb789e.tar.gz
emacs-84f72efd0c52bbae42a5169d9a94ad0feacb789e.zip
Fix compilation failure introduced in 2012-09-30T06:19:33Z!eggert@cs.ucla.edu.
src/profiler.c (Fprofiler_cpu_stop): Use timer_settime only if HAVE_TIMER_SETTIME is defined.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/profiler.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 97f955e7136..cb8692b4589 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-09-30 Eli Zaretskii <eliz@gnu.org>
2
3 * profiler.c (Fprofiler_cpu_stop): Use timer_settime only if
4 HAVE_TIMER_SETTIME is defined.
5
12012-09-30 Paul Eggert <eggert@cs.ucla.edu> 62012-09-30 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Profiler improvements: more-accurate timers, overflow checks. 8 Profiler improvements: more-accurate timers, overflow checks.
@@ -8,7 +13,7 @@
8 (record_backtrace, handle_profiler_signal): Saturate on fixnum overflow. 13 (record_backtrace, handle_profiler_signal): Saturate on fixnum overflow.
9 (profiler_timer, profiler_timer_ok) [HAVE_TIMER_SETTIME]: 14 (profiler_timer, profiler_timer_ok) [HAVE_TIMER_SETTIME]:
10 New static vars. 15 New static vars.
11 (enum profiler_cpu_running): New enumn. 16 (enum profiler_cpu_running): New enum.
12 (profiler_cpu_running): Now of that enum type, not bool. 17 (profiler_cpu_running): Now of that enum type, not bool.
13 All uses changed to store the new value. 18 All uses changed to store the new value.
14 (handle_profiler_signal): Rename from sigprof_handler_1, 19 (handle_profiler_signal): Rename from sigprof_handler_1,
diff --git a/src/profiler.c b/src/profiler.c
index 489c68b7291..90a85c5230e 100644
--- a/src/profiler.c
+++ b/src/profiler.c
@@ -349,6 +349,7 @@ Return non-nil if the profiler was running. */)
349 case NOT_RUNNING: 349 case NOT_RUNNING:
350 return Qnil; 350 return Qnil;
351 351
352#ifdef HAVE_TIMER_SETTIME
352 case TIMER_SETTIME_RUNNING: 353 case TIMER_SETTIME_RUNNING:
353 { 354 {
354 struct itimerspec disable; 355 struct itimerspec disable;
@@ -356,6 +357,7 @@ Return non-nil if the profiler was running. */)
356 timer_settime (profiler_timer, 0, &disable, 0); 357 timer_settime (profiler_timer, 0, &disable, 0);
357 } 358 }
358 break; 359 break;
360#endif
359 361
360 case SETITIMER_RUNNING: 362 case SETITIMER_RUNNING:
361 { 363 {