Change an internal variable from "class" to "ns_class" for C++'s benefit.
Apparently BIND-8.2.1 uses ns_class. Submitted by: John Plevyak <jplevyak@inktomi.com>
This commit is contained in:
parent
c5b52d6d9d
commit
f05a568074
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=47742
@ -50,7 +50,7 @@
|
||||
|
||||
/*
|
||||
* From: Id: nameser.h,v 8.16 1998/02/06 00:35:58 halley Exp
|
||||
* $Id$
|
||||
* $Id: nameser.h,v 1.12 1998/06/11 08:55:15 peter Exp $
|
||||
*/
|
||||
|
||||
#ifndef _ARPA_NAMESER_H_
|
||||
@ -140,7 +140,7 @@ extern struct _ns_flagdata _ns_flagdata[];
|
||||
typedef struct __ns_rr {
|
||||
char name[NS_MAXDNAME]; /* XXX need to malloc */
|
||||
u_int16_t type;
|
||||
u_int16_t class;
|
||||
u_int16_t rr_class;
|
||||
u_int32_t ttl;
|
||||
u_int16_t rdlength;
|
||||
const u_char *rdata;
|
||||
@ -149,7 +149,7 @@ typedef struct __ns_rr {
|
||||
/* Accessor macros - this is part of the public interface. */
|
||||
#define ns_rr_name(rr) (((rr).name[0] != '\0') ? (rr).name : ".")
|
||||
#define ns_rr_type(rr) ((rr).type + 0)
|
||||
#define ns_rr_class(rr) ((rr).class + 0)
|
||||
#define ns_rr_class(rr) ((rr).rr_class + 0)
|
||||
#define ns_rr_ttl(rr) ((rr).ttl + 0)
|
||||
#define ns_rr_rdlen(rr) ((rr).rdlength + 0)
|
||||
#define ns_rr_rdata(rr) ((rr).rdata + 0)
|
||||
|
@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
#ifndef lint
|
||||
static char rcsid[] = "$Id: ns_parse.c,v 8.8 1998/02/17 17:20:33 vixie Exp $";
|
||||
static char rcsid[] = "$Id: ns_parse.c,v 1.1 1998/06/11 09:02:40 peter Exp $";
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -160,7 +160,7 @@ ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) {
|
||||
NS_GET16(rr->type, handle->_ptr);
|
||||
if (handle->_ptr + NS_INT16SZ > handle->_eom)
|
||||
goto emsgsize;
|
||||
NS_GET16(rr->class, handle->_ptr);
|
||||
NS_GET16(rr->rr_class, handle->_ptr);
|
||||
if (section == ns_s_qd) {
|
||||
rr->ttl = 0;
|
||||
rr->rdlength = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user