summaryrefslogtreecommitdiff
path: root/rts/Profiling.h
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-06-24 20:51:13 +0100
committerIan Lynagh <igloo@earth.li>2011-06-25 19:16:32 +0100
commit0a6f26f6d29c8762b254e2f1040fce5c3571feea (patch)
tree6706444dab64cb0c2d6143ecb17db0e9ca2fc0cd /rts/Profiling.h
parent12b93887fd8b6a185b1bff994c865c897d22a6a6 (diff)
downloadhaskell-0a6f26f6d29c8762b254e2f1040fce5c3571feea.tar.gz
Fix gcc 4.6 warnings; fixes #5176
Based on a patch from David Terei. Some parts are a little ugly (e.g. defining things that only ASSERTs use only when DEBUG is defined), so we might want to tweak things a little. I've also turned off -Werror for didn't-inline warnings, as we now get a few such warnings.
Diffstat (limited to 'rts/Profiling.h')
-rw-r--r--rts/Profiling.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/rts/Profiling.h b/rts/Profiling.h
index e27ad4c5ed..3e365fe536 100644
--- a/rts/Profiling.h
+++ b/rts/Profiling.h
@@ -12,6 +12,13 @@
#include <stdio.h>
#include "BeginPrivate.h"
+#include "Rts.h"
+
+#ifdef PROFILING
+#define PROFILING_ONLY(s) s
+#else
+#define PROFILING_ONLY(s) doNothing()
+#endif
void initProfiling1 (void);
void initProfiling2 (void);