diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-01-04 15:13:23 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-01-05 15:20:16 +0000 |
| commit | 3478213ac422912df85308029e16c3f31b5a91d2 (patch) | |
| tree | 3912df78d1b76f8e42d00ccc123942c4f9fb2256 /includes | |
| parent | 6a9e521713cb4cbc3c49fa861aa936730c346e5e (diff) | |
| download | haskell-3478213ac422912df85308029e16c3f31b5a91d2.tar.gz | |
Rename the CCCS field of StgTSO so as not to conflict with the CCCS pseudo-register
Needed by #5357
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/mkDerivedConstants.c | 2 | ||||
| -rw-r--r-- | includes/rts/storage/TSO.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/mkDerivedConstants.c b/includes/mkDerivedConstants.c index 6688330a8c..0c3e9c0d16 100644 --- a/includes/mkDerivedConstants.c +++ b/includes/mkDerivedConstants.c @@ -297,7 +297,7 @@ main(int argc, char *argv[]) closure_field(StgTSO, flags); closure_field(StgTSO, dirty); closure_field(StgTSO, bq); - closure_field_("StgTSO_CCCS", StgTSO, prof.CCCS); + closure_field_("StgTSO_cccs", StgTSO, prof.cccs); closure_field(StgTSO, stackobj); closure_field(StgStack, sp); diff --git a/includes/rts/storage/TSO.h b/includes/rts/storage/TSO.h index 20c6ebf4f2..5e54bff72c 100644 --- a/includes/rts/storage/TSO.h +++ b/includes/rts/storage/TSO.h @@ -13,7 +13,7 @@ * PROFILING info in a TSO */ typedef struct { - CostCentreStack *CCCS; /* thread's current CCS */ + CostCentreStack *cccs; /* thread's current CCS */ } StgTSOProfInfo; /* |