From: Erik van der Kouwe <erik@minix3.org>
Date: Thu, 27 May 2010 08:48:53 +0000 (+0000)
Subject: Avoid use of C++ reserved word class in headers (reported by Aki Goto, tracker item... 
X-Git-Tag: v3.1.7~29
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/static/host.html?a=commitdiff_plain;h=43b589c1ccb1d54b64d7c81b584823a6e7c702d3;p=minix.git

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

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 36e3feecc..b72f6eb31 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -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;
diff --git a/include/minix/rs.h b/include/minix/rs.h
index c5b1b0e06..2c4bd8235 100644
--- a/include/minix/rs.h
+++ b/include/minix/rs.h
@@ -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. */
diff --git a/include/net/gen/resolv.h b/include/net/gen/resolv.h
index 4ad157f50..64779305d 100644
--- a/include/net/gen/resolv.h
+++ b/include/net/gen/resolv.h
@@ -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 ));
diff --git a/servers/rs/manager.c b/servers/rs/manager.c
index c20bc3bbc..c3a6f8236 100644
--- a/servers/rs/manager.c
+++ b/servers/rs/manager.c
@@ -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);
   }