From cb5b02667a8dcfc00d990103b2fb3236259bd627 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 30 Sep 2012 01:15:11 -0700
Subject: [PATCH] * 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>.
---
 src/ChangeLog   | 6 ++++++
 src/syssignal.h | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index cb8692b4589..e07f7e131cb 100644
--- 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 0bc856769ba..ece2515dec9 100644
--- 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
 
-- 
2.39.2