Avoid use of C++ reserved word class in headers (reported by Aki Goto, tracker item 375)
This commit is contained in:
parent
b48b037fbe
commit
43b589c1cc
4 changed files with 9 additions and 9 deletions
|
@ -2593,7 +2593,7 @@ int devind;
|
||||||
pcidev[devind].pd_infclass;
|
pcidev[devind].pd_infclass;
|
||||||
for (i= 0; i<aclp->rsp_nr_class; i++)
|
for (i= 0; i<aclp->rsp_nr_class; i++)
|
||||||
{
|
{
|
||||||
if (aclp->rsp_class[i].class ==
|
if (aclp->rsp_class[i].pciclass ==
|
||||||
(class_id & aclp->rsp_class[i].mask))
|
(class_id & aclp->rsp_class[i].mask))
|
||||||
{
|
{
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
|
@ -54,7 +54,7 @@ struct rs_start
|
||||||
int rss_nr_pci_id;
|
int rss_nr_pci_id;
|
||||||
struct { u16_t vid; u16_t did; } rss_pci_id[RS_NR_PCI_DEVICE];
|
struct { u16_t vid; u16_t did; } rss_pci_id[RS_NR_PCI_DEVICE];
|
||||||
int rss_nr_pci_class;
|
int rss_nr_pci_class;
|
||||||
struct { u32_t class; u32_t mask; } rss_pci_class[RS_NR_PCI_CLASS];
|
struct { u32_t pciclass; u32_t mask; } rss_pci_class[RS_NR_PCI_CLASS];
|
||||||
bitchunk_t rss_system[SYS_CALL_MASK_SIZE];
|
bitchunk_t rss_system[SYS_CALL_MASK_SIZE];
|
||||||
struct rss_label rss_label;
|
struct rss_label rss_label;
|
||||||
char *rss_ipc;
|
char *rss_ipc;
|
||||||
|
@ -72,7 +72,7 @@ struct rs_pci
|
||||||
int rsp_nr_device;
|
int rsp_nr_device;
|
||||||
struct { u16_t vid; u16_t did; } rsp_device[RS_NR_PCI_DEVICE];
|
struct { u16_t vid; u16_t did; } rsp_device[RS_NR_PCI_DEVICE];
|
||||||
int rsp_nr_class;
|
int rsp_nr_class;
|
||||||
struct { u32_t class; u32_t mask; } rsp_class[RS_NR_PCI_CLASS];
|
struct { u32_t pciclass; u32_t mask; } rsp_class[RS_NR_PCI_CLASS];
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Definition of a public entry of the system process table. */
|
/* Definition of a public entry of the system process table. */
|
||||||
|
|
|
@ -77,14 +77,14 @@ extern struct state _res;
|
||||||
struct rrec;
|
struct rrec;
|
||||||
|
|
||||||
int res_init _ARGS(( void ));
|
int res_init _ARGS(( void ));
|
||||||
int res_mkquery _ARGS(( int op, const char *dname, int class, int type,
|
int res_mkquery _ARGS(( int op, const char *dname, int cls, int type,
|
||||||
const char *data, int datalen, const struct rrec *newrr,
|
const char *data, int datalen, const struct rrec *newrr,
|
||||||
char *buf, int buflen ));
|
char *buf, int buflen ));
|
||||||
int res_query _ARGS(( char *name, int class, int type, u8_t *answer,
|
int res_query _ARGS(( char *name, int cls, int type, u8_t *answer,
|
||||||
int anslen ));
|
int anslen ));
|
||||||
int res_querydomain _ARGS(( char *name, char *domain, int class, int type,
|
int res_querydomain _ARGS(( char *name, char *domain, int cls, int type,
|
||||||
u8_t *answer, int anslen ));
|
u8_t *answer, int anslen ));
|
||||||
int res_search _ARGS(( char *name, int class, int type, u8_t *answer,
|
int res_search _ARGS(( char *name, int cls, int type, u8_t *answer,
|
||||||
int anslen ));
|
int anslen ));
|
||||||
int res_send _ARGS(( const char *buf, int buflen, char *answer, int anslen ));
|
int res_send _ARGS(( const char *buf, int buflen, char *answer, int anslen ));
|
||||||
void _res_close _ARGS(( void ));
|
void _res_close _ARGS(( void ));
|
||||||
|
|
|
@ -1376,11 +1376,11 @@ endpoint_t source;
|
||||||
rpub->pci_acl.rsp_nr_class= rs_start->rss_nr_pci_class;
|
rpub->pci_acl.rsp_nr_class= rs_start->rss_nr_pci_class;
|
||||||
for (i= 0; i<rpub->pci_acl.rsp_nr_class; i++)
|
for (i= 0; i<rpub->pci_acl.rsp_nr_class; i++)
|
||||||
{
|
{
|
||||||
rpub->pci_acl.rsp_class[i].class= rs_start->rss_pci_class[i].class;
|
rpub->pci_acl.rsp_class[i].pciclass=rs_start->rss_pci_class[i].pciclass;
|
||||||
rpub->pci_acl.rsp_class[i].mask= rs_start->rss_pci_class[i].mask;
|
rpub->pci_acl.rsp_class[i].mask= rs_start->rss_pci_class[i].mask;
|
||||||
if(rs_verbose)
|
if(rs_verbose)
|
||||||
printf("RS: init_slot: PCI class %06x mask %06x\n",
|
printf("RS: init_slot: PCI class %06x mask %06x\n",
|
||||||
(unsigned int) rpub->pci_acl.rsp_class[i].class,
|
(unsigned int) rpub->pci_acl.rsp_class[i].pciclass,
|
||||||
(unsigned int) rpub->pci_acl.rsp_class[i].mask);
|
(unsigned int) rpub->pci_acl.rsp_class[i].mask);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue