diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-06-24 20:51:13 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-06-25 19:16:32 +0100 |
| commit | 0a6f26f6d29c8762b254e2f1040fce5c3571feea (patch) | |
| tree | 6706444dab64cb0c2d6143ecb17db0e9ca2fc0cd /rts/Trace.h | |
| parent | 12b93887fd8b6a185b1bff994c865c897d22a6a6 (diff) | |
| download | haskell-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/Trace.h')
| -rw-r--r-- | rts/Trace.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/rts/Trace.h b/rts/Trace.h index 2b7c0fb3e3..b63e8760f3 100644 --- a/rts/Trace.h +++ b/rts/Trace.h @@ -194,7 +194,7 @@ void traceOSProcessInfo_ (void); #define debugTrace(class, str, ...) /* nothing */ #define debugTraceCap(class, cap, str, ...) /* nothing */ #define traceThreadStatus(class, tso) /* nothing */ -#define traceEventStartup_(n_caps) /* nothing */ +INLINE_HEADER void traceEventStartup_ (int n_caps STG_UNUSED) {}; #define traceCapsetModify_(tag, capset, other) /* nothing */ #define traceOSProcessInfo_() /* nothing */ @@ -243,8 +243,9 @@ void dtraceUserMsgWrapper(Capability *cap, char *msg); HASKELLEVENT_REQUEST_PAR_GC(cap) #define dtraceCreateSparkThread(cap, spark_tid) \ HASKELLEVENT_CREATE_SPARK_THREAD(cap, spark_tid) -#define dtraceStartup(num_caps) \ +INLINE_HEADER void dtraceStartup (int n_caps) { HASKELLEVENT_STARTUP(num_caps) +} #define dtraceUserMsg(cap, msg) \ HASKELLEVENT_USER_MSG(cap, msg) #define dtraceGcIdle(cap) \ @@ -278,7 +279,7 @@ void dtraceUserMsgWrapper(Capability *cap, char *msg); #define dtraceRequestSeqGc(cap) /* nothing */ #define dtraceRequestParGc(cap) /* nothing */ #define dtraceCreateSparkThread(cap, spark_tid) /* nothing */ -#define dtraceStartup(num_caps) /* nothing */ +INLINE_HEADER void dtraceStartup (int n_caps STG_UNUSED) {}; #define dtraceUserMsg(cap, msg) /* nothing */ #define dtraceGcIdle(cap) /* nothing */ #define dtraceGcWork(cap) /* nothing */ |