From: Bernhard Kölbl bkoelbl@codeweavers.com
--- tools/widl/attribute.c | 1 + tools/widl/header.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/widl/attribute.c b/tools/widl/attribute.c index b9aa99c9228..9af4e7b51de 100644 --- a/tools/widl/attribute.c +++ b/tools/widl/attribute.c @@ -157,6 +157,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_DEFAULTCOLLELEM */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultcollelem" }, /* ATTR_DEFAULTVALUE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "defaultvalue" }, /* ATTR_DEFAULTVTABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, "defaultvtable" }, + /* ATTR_DEPRECATED */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "deprecated" }, /* ATTR_DISABLECONSISTENCYCHECK */{ 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "disable_consistency_check" }, /* ATTR_DISPINTERFACE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, NULL }, /* ATTR_DISPLAYBIND */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "displaybind" }, diff --git a/tools/widl/header.c b/tools/widl/header.c index 5a8ee8bd430..a5d43241a35 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -164,12 +164,11 @@ static void write_deprecated(FILE *h, const expr_t *deprecated_attr) const expr_t *contract_req = deprecated_attr->ext2; if (deprecated_msg->type == EXPR_STRLIT && contract_req->type == EXPR_GTREQL) { const char *deprecated_text = deprecated_msg->u.sval; - const expr_t *contract_ver = contract_req->ref;
- write_apicontract_guard_start( h, contract_ver ); + write_apicontract_guard_start( h, contract_req ); indent( h, 0 ); fprintf( h, "DEPRECATED("%s")\n", deprecated_text ); - write_apicontract_guard_end( h, contract_ver ); + write_apicontract_guard_end( h, contract_req ); } else warning( "Deprecated attributes without explicit contract declaration are not supported, yet.\n" );