To prevent future name collisions "chip_t" changed to "canchip_t"

[lincan.git] / lincan / include / can_queue.h

diff --git a/lincan/include/can_queue.h b/lincan/include/can_queue.h
index 5ed1fe41fc31f5ab30a62ef10810e7ee8828e7e7..859334629b3f96d5f3ab3beca0a51cc490a20f9d 100644 (file)
--- a/lincan/include/can_queue.h
+++ b/lincan/include/can_queue.h
@@ -273,7 +273,7 @@ int canque_fifo_init_slots(struct canque_fifo_t *fifo);
 
 /* Forward declarations for external types */
 struct msgobj_t;
 
 /* Forward declarations for external types */
 struct msgobj_t;

-struct chip_t;
+struct canchip_t;

 
 /**
  * struct canque_edge_t - CAN message delivery subsystem graph edge
 
 /**
  * struct canque_edge_t - CAN message delivery subsystem graph edge


@@ -382,7 +382,7 @@ struct canque_ends_t {
            #endif /*CAN_WITH_RTL*/
                struct {
                        struct msgobj_t *msgobj;
            #endif /*CAN_WITH_RTL*/
                struct {
                        struct msgobj_t *msgobj;

-                       struct chip_t *chip;
+                       struct canchip_t *chip;

                    #ifndef CAN_WITH_RTL
                        wait_queue_head_t daemonq;
                    #else /*CAN_WITH_RTL*/
                    #ifndef CAN_WITH_RTL
                        wait_queue_head_t daemonq;
                    #else /*CAN_WITH_RTL*/