diff options
| author | Peter Johnson <peter@tortall.net> | 2010-01-03 01:04:18 +0000 |
|---|---|---|
| committer | Peter Johnson <peter@tortall.net> | 2010-01-03 01:04:18 +0000 |
| commit | 5501768adbef05e82ffb5b62a0fc40a702b3f49a (patch) | |
| tree | 23558296b485f24fe4b8b40e49f89347385b44cb /libyasm | |
| parent | 40f06c127537be8d72cadcf6e7ada96e493cf345 (diff) | |
| download | yasm-5501768adbef05e82ffb5b62a0fc40a702b3f49a.tar.gz | |
Use queue.h HEAD macros more portably (also avoiding compiler warning).
svn path=/trunk/yasm/; revision=2258
Diffstat (limited to 'libyasm')
| -rw-r--r-- | libyasm/errwarn.c | 4 | ||||
| -rw-r--r-- | libyasm/section.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libyasm/errwarn.c b/libyasm/errwarn.c index 644d7d27..fa136005 100644 --- a/libyasm/errwarn.c +++ b/libyasm/errwarn.c @@ -69,7 +69,7 @@ typedef struct warn { yasm_warn_class wclass; /*@owned@*/ /*@null@*/ char *wstr; } warn; -static STAILQ_HEAD(, warn) yasm_warns; +static STAILQ_HEAD(warn_head, warn) yasm_warns; /* Enabled warnings. See errwarn.h for a list. */ static unsigned long warn_class_enabled; @@ -86,7 +86,7 @@ typedef struct errwarn_data { } errwarn_data; struct yasm_errwarns { - /*@reldef@*/ SLIST_HEAD(, errwarn_data) errwarns; + /*@reldef@*/ SLIST_HEAD(errwarn_head, errwarn_data) errwarns; /* Total error count */ unsigned int ecount; diff --git a/libyasm/section.c b/libyasm/section.c index 2c6c8de6..3271e391 100644 --- a/libyasm/section.c +++ b/libyasm/section.c @@ -871,10 +871,11 @@ struct yasm_span { }; typedef struct optimize_data { - /*@reldef@*/ TAILQ_HEAD(, yasm_span) spans; - /*@reldef@*/ STAILQ_HEAD(, yasm_span) QA, QB; + /*@reldef@*/ TAILQ_HEAD(yasm_span_head, yasm_span) spans; + /*@reldef@*/ STAILQ_HEAD(yasm_span_shead, yasm_span) QA, QB; /*@only@*/ IntervalTree *itree; - /*@reldef@*/ STAILQ_HEAD(, yasm_offset_setter) offset_setters; + /*@reldef@*/ STAILQ_HEAD(offset_setters_head, yasm_offset_setter) + offset_setters; long len_diff; /* used only for optimize_term_expand */ yasm_span *span; /* used only for check_cycle */ yasm_offset_setter *os; |