From ddc0054287ae41ac3bdbd2b0f0835ad3e6942d08 Mon Sep 17 00:00:00 2001 From: Adam Green Date: Sun, 27 Oct 2013 01:14:02 -0700 Subject: [PATCH] GCC: conflicting types for 'can_filter' params Definition was previously updated to use uint32_t and int_t types for the can_filter() function parameters but the declaration in the header file didn't contain the same updates. On GCC, this resulted in the following error: .../can_api.c:85:5: error: conflicting types for 'can_filter' In file included from .../can_api.c:16:0: .../can_api.h:68:15: note: previous declaration of 'can_filter' was here --- libraries/mbed/hal/can_api.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/mbed/hal/can_api.h b/libraries/mbed/hal/can_api.h index bb90367cffb..0046c3ec7ed 100644 --- a/libraries/mbed/hal/can_api.h +++ b/libraries/mbed/hal/can_api.h @@ -65,7 +65,7 @@ void can_irq_set (can_t *obj, CanIrqType irq, uint32_t enable); int can_write (can_t *obj, CAN_Message, int cc); int can_read (can_t *obj, CAN_Message *msg, int handle); int can_mode (can_t *obj, CanMode mode); -int can_filter (can_t *obj, unsigned int id, unsigned int mask, CANFormat format, int handle); +int can_filter (can_t *obj, uint32_t id, uint32_t mask, CANFormat format, int32_t handle); void can_reset (can_t *obj); unsigned char can_rderror (can_t *obj); unsigned char can_tderror (can_t *obj);