fix duplicated definition of boolean_t
It is defined both in openair2/COMMON/commonDef.h and openair2/COMMON/platform_types.h. Removing one or the other definition creates many problems when compiling this or that part of the system (ue_ip.ko, at_nas_ue). Let's keep both and protect the definitions inside #ifdefs.
This commit is contained in:
@@ -43,6 +43,13 @@ Description Contains global common definitions
|
||||
#include <stddef.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
/* boolean_t is also defined in openair2/COMMON/platform_types.h
|
||||
* let's protect potential redefinition
|
||||
*/
|
||||
|
||||
#ifndef _BOOLEAN_T_DEFINED_
|
||||
#define _BOOLEAN_T_DEFINED_
|
||||
|
||||
typedef signed char boolean_t;
|
||||
|
||||
#if !defined(TRUE)
|
||||
@@ -55,6 +62,8 @@ typedef signed char boolean_t;
|
||||
|
||||
#define BOOL_NOT(b) (b^TRUE)
|
||||
|
||||
#endif /* _BOOLEAN_T_DEFINED_ */
|
||||
|
||||
#define NAS_UE_ID_FMT "0x%06x"
|
||||
|
||||
/****************************************************************************/
|
||||
|
||||
@@ -40,6 +40,13 @@
|
||||
//-----------------------------------------------------------------------------
|
||||
// GENERIC TYPES
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
/* boolean_t is also defined in openair2/COMMON/commonDef.h,
|
||||
* let's protect potential redefinition
|
||||
*/
|
||||
#ifndef _BOOLEAN_T_DEFINED_
|
||||
#define _BOOLEAN_T_DEFINED_
|
||||
|
||||
typedef signed char boolean_t;
|
||||
|
||||
#if !defined(TRUE)
|
||||
@@ -52,6 +59,8 @@ typedef signed char boolean_t;
|
||||
|
||||
#define BOOL_NOT(b) (b^TRUE)
|
||||
|
||||
#endif /* _BOOLEAN_T_DEFINED_ */
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// GENERIC ACCESS STRATUM TYPES
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user