summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Seipp <austin@well-typed.com>2014-11-18 21:21:47 -0600
committerAustin Seipp <austin@well-typed.com>2014-11-19 17:03:04 -0600
commit8e0a480ca655010e67a38aca9b8705ecbd0f0c97 (patch)
treeb88fd35b9b70d7de8251eda7b783fda9d8094ebe
parent4ba884bdd3a9521ea92fcda8f601a7d0f3537bc1 (diff)
downloadhaskell-8e0a480ca655010e67a38aca9b8705ecbd0f0c97.tar.gz
rts: remove old-style field designator extension (#9396)
Authored-by: jrp Signed-off-by: Austin Seipp <austin@well-typed.com>
-rw-r--r--includes/rts/prof/CCS.h48
-rw-r--r--rts/RetainerSet.c10
2 files changed, 29 insertions, 29 deletions
diff --git a/includes/rts/prof/CCS.h b/includes/rts/prof/CCS.h
index 85b03f38b3..74f18b85c0 100644
--- a/includes/rts/prof/CCS.h
+++ b/includes/rts/prof/CCS.h
@@ -210,32 +210,32 @@ extern CostCentreStack * RTS_VAR(CCS_LIST); // registered CCS list
* Declaring Cost Centres & Cost Centre Stacks.
* -------------------------------------------------------------------------- */
-# define CC_DECLARE(cc_ident,name,mod,loc,caf,is_local) \
- is_local CostCentre cc_ident[1] \
- = {{ ccID : 0, \
- label : name, \
- module : mod, \
- srcloc : loc, \
- time_ticks : 0, \
- mem_alloc : 0, \
- link : 0, \
- is_caf : caf \
+# define CC_DECLARE(cc_ident,name,mod,loc,caf,is_local) \
+ is_local CostCentre cc_ident[1] \
+ = {{ .ccID = 0, \
+ .label = name, \
+ .module = mod, \
+ .srcloc = loc, \
+ .time_ticks = 0, \
+ .mem_alloc = 0, \
+ .link = 0, \
+ .is_caf = caf \
}};
-# define CCS_DECLARE(ccs_ident,cc_ident,is_local) \
- is_local CostCentreStack ccs_ident[1] \
- = {{ ccsID : 0, \
- cc : cc_ident, \
- prevStack : NULL, \
- indexTable : NULL, \
- root : NULL, \
- depth : 0, \
- selected : 0, \
- scc_count : 0, \
- time_ticks : 0, \
- mem_alloc : 0, \
- inherited_ticks : 0, \
- inherited_alloc : 0 \
+# define CCS_DECLARE(ccs_ident,cc_ident,is_local) \
+ is_local CostCentreStack ccs_ident[1] \
+ = {{ .ccsID = 0, \
+ .cc = cc_ident, \
+ .prevStack = NULL, \
+ .indexTable = NULL, \
+ .root = NULL, \
+ .depth = 0, \
+ .selected = 0, \
+ .scc_count = 0, \
+ .time_ticks = 0, \
+ .mem_alloc = 0, \
+ .inherited_ticks = 0, \
+ .inherited_alloc = 0 \
}};
/* -----------------------------------------------------------------------------
diff --git a/rts/RetainerSet.c b/rts/RetainerSet.c
index 1905866e8a..234532a879 100644
--- a/rts/RetainerSet.c
+++ b/rts/RetainerSet.c
@@ -40,11 +40,11 @@ static int nextId; // id of next retainer set
* from growing too large.
* -------------------------------------------------------------------------- */
RetainerSet rs_MANY = {
- num : 0,
- hashKey : 0,
- link : NULL,
- id : 1,
- element : {}
+ .num = 0,
+ .hashKey = 0,
+ .link = NULL,
+ .id = 1,
+ .element = {}
};
/* -----------------------------------------------------------------------------