Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 11:29:58 +03:00
Code Issues Wiki Activity

Fix UNUSED() macro conflict with STM libraries

Browse source 
Added `#if !defined(` blocks around the `UNUSED()` definitions in the libraries to prevent conflicts.
This commit is contained in:
Bruce Luckcuck 2019-02-17 09:52:49 -05:00
parent 966971c750
commit 02a368a8e7
8 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/main/STM32F1/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
View file

@ -85,7 +85,9 @@ typedef enum
(__DMA_HANDLE__).Parent = (__HANDLE__); \ (__DMA_HANDLE__).Parent = (__HANDLE__); \
} while(0U) } while(0U)
#if !defined(UNUSED)
#define UNUSED(x) ((void)(x)) #define UNUSED(x) ((void)(x))
#endif
/** @brief Reset the Handle's State field. /** @brief Reset the Handle's State field.
* @param __HANDLE__: specifies the Peripheral Handle. * @param __HANDLE__: specifies the Peripheral Handle.

2
lib/main/STM32F3/Drivers/STM32F3xx_HAL_Driver/Inc/stm32f3xx_hal_def.h
View file

@ -83,7 +83,9 @@ typedef enum
(__DMA_HANDLE_).Parent = (__HANDLE__); \ (__DMA_HANDLE_).Parent = (__HANDLE__); \
} while(0U) } while(0U)
#if !defined(UNUSED)
#define UNUSED(x) ((void)(x)) #define UNUSED(x) ((void)(x))
#endif
/** @brief Reset the Handle's State field. /** @brief Reset the Handle's State field.
* @param __HANDLE__ specifies the Peripheral Handle. * @param __HANDLE__ specifies the Peripheral Handle.

2
lib/main/STM32F4/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_def.h
View file

@ -83,7 +83,9 @@ typedef enum
(__DMA_HANDLE__).Parent = (__HANDLE__); \ (__DMA_HANDLE__).Parent = (__HANDLE__); \
} while(0) } while(0)
#if !defined(UNUSED)
#define UNUSED(x) ((void)(x)) #define UNUSED(x) ((void)(x))
#endif
/** @brief Reset the Handle's State field. /** @brief Reset the Handle's State field.
* @param __HANDLE__: specifies the Peripheral Handle. * @param __HANDLE__: specifies the Peripheral Handle.

2
lib/main/STM32F7/Drivers/STM32F7xx_HAL_Driver/Inc/stm32f7xx_hal_def.h
View file

@ -82,7 +82,9 @@ typedef enum
(__DMA_HANDLE__).Parent = (__HANDLE__); \ (__DMA_HANDLE__).Parent = (__HANDLE__); \
} while(0) } while(0)
#if !defined(UNUSED)
#define UNUSED(x) ((void)(x)) #define UNUSED(x) ((void)(x))
#endif
/** @brief Reset the Handle's State field. /** @brief Reset the Handle's State field.
* @param __HANDLE__: specifies the Peripheral Handle. * @param __HANDLE__: specifies the Peripheral Handle.

2
lib/main/STM32_USB_Device_Library/Class/msc/src/usbd_msc_bot.c
View file

@ -31,7 +31,9 @@
#include "usbd_ioreq.h" #include "usbd_ioreq.h"
#include "usbd_msc_mem.h" #include "usbd_msc_mem.h"
#if !defined(UNUSED)
#define UNUSED(x) (void)(x) #define UNUSED(x) (void)(x)
#endif
/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY /** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
* @{ * @{

2
lib/main/STM32_USB_Device_Library/Class/msc/src/usbd_msc_core.c
View file

@ -46,7 +46,9 @@
#include "usbd_msc_bot.h" #include "usbd_msc_bot.h"
#include "usbd_req.h" #include "usbd_req.h"
#if !defined(UNUSED)
#define UNUSED(x) (void)(x) #define UNUSED(x) (void)(x)
#endif
/** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY /** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
* @{ * @{

2
lib/main/STM32_USB_Device_Library/Class/msc/src/usbd_msc_scsi.c
View file

@ -31,7 +31,9 @@
#include "usbd_msc_mem.h" #include "usbd_msc_mem.h"
#include "usbd_msc_data.h" #include "usbd_msc_data.h"
#if !defined(UNUSED)
#define UNUSED(x) (void)(x) #define UNUSED(x) (void)(x)
#endif

2
src/test/unit/unittest_macros.h
View file

@ -18,4 +18,6 @@
#pragma once #pragma once
#if !defined(UNUSED)
#define UNUSED(x) (void)(x) #define UNUSED(x) (void)(x)
#endif