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

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 36e3feecc8857f7051ec477f0dfcb9bdf60839cc..b72f6eb31cbce89835c1de17a4abafe4585e4c36 100644 (file)
--- 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 c5b1b0e06904ee7eddacc51562e7eacafd9d6d5f..2c4bd8235c35311cf19645bb261951ffb9b3b285 100644 (file)
--- 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 4ad157f50f789119aba998649cd3dfc1a69308b2..64779305d7c6e96f46aa68a26719e6f31431c346 100644 (file)
--- 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 c20bc3bbc23291de1cdd240b06885fe02af823ef..c3a6f823612a1741e8acc4527e917d032f26198b 100644 (file)
--- 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);
   }