From: Eli Zaretskii Date: Sun, 30 Sep 2012 07:26:32 +0000 (+0200) Subject: Fix compilation failure introduced in 2012-09-30T06:19:33Z!eggert@cs.ucla.edu. X-Git-Tag: emacs-24.2.90~244^2~12 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=84f72efd0c52bbae42a5169d9a94ad0feacb789e;p=emacs.git 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. --- diff --git a/src/ChangeLog b/src/ChangeLog index 97f955e7136..cb8692b4589 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-09-30 Eli Zaretskii + + * profiler.c (Fprofiler_cpu_stop): Use timer_settime only if + HAVE_TIMER_SETTIME is defined. + 2012-09-30 Paul Eggert Profiler improvements: more-accurate timers, overflow checks. @@ -8,7 +13,7 @@ (record_backtrace, handle_profiler_signal): Saturate on fixnum overflow. (profiler_timer, profiler_timer_ok) [HAVE_TIMER_SETTIME]: New static vars. - (enum profiler_cpu_running): New enumn. + (enum profiler_cpu_running): New enum. (profiler_cpu_running): Now of that enum type, not bool. All uses changed to store the new value. (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. */) case NOT_RUNNING: return Qnil; +#ifdef HAVE_TIMER_SETTIME case TIMER_SETTIME_RUNNING: { struct itimerspec disable; @@ -356,6 +357,7 @@ Return non-nil if the profiler was running. */) timer_settime (profiler_timer, 0, &disable, 0); } break; +#endif case SETITIMER_RUNNING: {