[sr-dev] git:master: rename the 'class' variable -- reserved keyword in c++

Module: sip-router Branch: master Commit: 113d89909962ad6ef7b2cdeed387129f34011f6e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=113d899… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Fri Nov 6 17:35:12 2009 +0100 rename the 'class' variable -- reserved keyword in c++ --- resolve.c | 4 ++-- resolve.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resolve.c b/resolve.c index be479c9..b68aadc 100644 --- a/resolve.c +++ b/resolve.c @@ -786,7 +786,7 @@ again: goto error; } rd->type=rtype; - rd->class=class; + rd->pclass=class; rd->ttl=ttl; rd->next=0; memcpy(rd->name, rec_name, rec_name_len); @@ -930,7 +930,7 @@ again: goto error; } rd->type=T_CNAME; - rd->class=fullname_rd->class; + rd->pclass=fullname_rd->pclass; rd->ttl=fullname_rd->ttl; rd->next=head; memcpy(rd->name, name, name_len); diff --git a/resolve.h b/resolve.h index 65bd0c0..9f0d4ef 100644 --- a/resolve.h +++ b/resolve.h @@ -88,7 +88,7 @@ union dns_query{ /* rdata struct*/ struct rdata { unsigned short type; - unsigned short class; + unsigned short pclass; unsigned int ttl; void* rdata; struct rdata* next;