From 13400e13758f7e23fc17bae753030723046ba3aa Mon Sep 17 00:00:00 2001 From: Krzysztof Blazewicz Date: Wed, 12 Oct 2016 18:14:30 +0200 Subject: [PATCH] stmhal/hal: do not include in HAL headers stdio.h was included in all HAL files only to provide definition of NULL symbol "stdio.h" includes "types.h" which contains some conflicting definitions with "drivers/cc3000/inc/socket.h" --- stmhal/hal/f4/inc/stm32f4xx_hal_def.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stmhal/hal/f4/inc/stm32f4xx_hal_def.h b/stmhal/hal/f4/inc/stm32f4xx_hal_def.h index 11ae7a1cf5..e7858ac2c9 100644 --- a/stmhal/hal/f4/inc/stm32f4xx_hal_def.h +++ b/stmhal/hal/f4/inc/stm32f4xx_hal_def.h @@ -47,7 +47,9 @@ /* Includes ------------------------------------------------------------------*/ #include "stm32f4xx.h" #include "Legacy/stm32_hal_legacy.h" -#include +#ifndef NULL +#define NULL (void*)0 +#endif /* Exported types ------------------------------------------------------------*/