* syssignal.h (PROFILER_CPU_SUPPORT): Don't define if PROFILING.

Suggested by Eli Zaretskii in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00811.html>.

diff --git a/src/ChangeLog b/src/ChangeLog
index cb8692b45894ecb4b9770c2743cbf769aa8cd3d4..e07f7e131cb9d9c37f0ffe5eae2ab3711def1519 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * syssignal.h (PROFILER_CPU_SUPPORT): Don't define if PROFILING.
+       Suggested by Eli Zaretskii in
+       <http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00811.html>.
+
 2012-09-30  Eli Zaretskii  <eliz@gnu.org>
 
        * profiler.c (Fprofiler_cpu_stop): Use timer_settime only if

diff --git a/src/syssignal.h b/src/syssignal.h
index 0bc856769ba52c89a00fff865f017a2016ebdaca..ece2515dec9e573d4677e6340e95a7568756e8f4 100644 (file)
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -29,7 +29,8 @@ extern void init_signals (bool);
 #define FORWARD_SIGNAL_TO_MAIN_THREAD
 #endif
 
-#if defined SIGPROF && (defined HAVE_TIMER_SETTIME || defined HAVE_SETITIMER)
+#if (defined SIGPROF && (defined HAVE_TIMER_SETTIME || defined HAVE_SETITIMER) \
+     && !defined PROFILING)
 # define PROFILER_CPU_SUPPORT
 #endif