michaelh/zephyr
1
0
Fork 0
Code Releases Activity

lib/libc/min: Handle duplicate time definitions

Browse source 
time_t and suseconds_t are defined in time.h and sys/types.h.  Handle
the duplication by adding ifdef protection around them similar to what
is being done for other types.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2019-08-06 15:43:38 -05:00 • committed by Andrew Boie
commit daf9f11024
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/libc/minimal/include/sys/types.h
View file

@ -42,8 +42,15 @@ typedef int off_t;
#endif #endif
#if !defined(__time_t_defined)
#define __time_t_defined
typedef int64_t time_t; typedef int64_t time_t;
#endif
#if !defined(__suseconds_t_defined)
#define __suseconds_t_defined
typedef int32_t suseconds_t; typedef int32_t suseconds_t;
#endif
#if !defined(__mem_word_t_defined) #if !defined(__mem_word_t_defined)
#define __mem_word_t_defined #define __mem_word_t_defined

7
lib/libc/minimal/include/time.h
View file

@ -31,8 +31,15 @@ struct tm {
int tm_isdst; int tm_isdst;
}; };
#if !defined(__time_t_defined)
#define __time_t_defined
typedef int64_t time_t; typedef int64_t time_t;
#endif
#if !defined(__suseconds_t_defined)
#define __suseconds_t_defined
typedef int32_t suseconds_t; typedef int32_t suseconds_t;
#endif
#include <sys/_timespec.h> #include <sys/_timespec.h>