[Emacs-diffs] /srv/bzr/emacs/trunk r110272: * syssignal.h (PROFILER_CPU_SUPPORT): Don't define if PROFILING.

[Paul Eggert]

------------------------------------------------------------
revno: 110272
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-30 01:15:11 -0700
message:
  * 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>.
modified:
  src/ChangeLog
  src/syssignal.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-30 07:26:32 +0000
+++ b/src/ChangeLog     2012-09-30 08:15:11 +0000
@@ -1,3 +1,9 @@
+2012-09-30  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * profiler.c (Fprofiler_cpu_stop): Use timer_settime only if

=== modified file 'src/syssignal.h'
--- a/src/syssignal.h   2012-09-30 06:19:33 +0000
+++ b/src/syssignal.h   2012-09-30 08:15:11 +0000
@@ -29,7 +29,8 @@
 #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