sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Avoid use of C++ reserved word class in headers (reported by Aki Goto, tracker item 375)

Browse source
This commit is contained in:
Erik van der Kouwe 2010-05-27 08:48:53 +00:00
parent b48b037fbe
commit 43b589c1cc
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/pci/pci.c
View file

@ -2593,7 +2593,7 @@ int devind;
pcidev[devind].pd_infclass;
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))
{
return TRUE;

4
include/minix/rs.h
View file

@ -54,7 +54,7 @@ struct rs_start
int rss_nr_pci_id;
struct { u16_t vid; u16_t did; } rss_pci_id[RS_NR_PCI_DEVICE];
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];
struct rss_label rss_label;
char *rss_ipc;
@ -72,7 +72,7 @@ struct rs_pci
int rsp_nr_device;
struct { u16_t vid; u16_t did; } rsp_device[RS_NR_PCI_DEVICE];
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. */

8
include/net/gen/resolv.h
View file

@ -77,14 +77,14 @@ extern struct state _res;
struct rrec;
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,
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 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 ));
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 res_send _ARGS(( const char *buf, int buflen, char *answer, int anslen ));
void _res_close _ARGS(( void ));

4
servers/rs/manager.c
View file

@ -1376,11 +1376,11 @@ endpoint_t source;
rpub->pci_acl.rsp_nr_class= rs_start->rss_nr_pci_class;
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;
if(rs_verbose)
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);
}