From 365bc664e900fd85e40bf3a938373cc2c7412910 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 15 Apr 2016 13:44:19 +0200 Subject: [PATCH] Add BSD guard for timer_t Signed-off-by: Sebastian Huber --- newlib/libc/include/sys/_types.h | 3 ++- newlib/libc/include/sys/types.h | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/newlib/libc/include/sys/_types.h b/newlib/libc/include/sys/_types.h index 6e6e2d307..7c2d9634d 100644 --- a/newlib/libc/include/sys/_types.h +++ b/newlib/libc/include/sys/_types.h @@ -154,7 +154,8 @@ typedef _TIME_T_ __time_t; #define _CLOCKID_T_ unsigned long typedef _CLOCKID_T_ __clockid_t; -#define _TIMER_T_ unsigned long +#define _TIMER_T_ unsigned long +typedef _TIMER_T_ __timer_t; typedef long __suseconds_t; /* microseconds (signed) */ diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h index f8db419e1..d0627fdbe 100644 --- a/newlib/libc/include/sys/types.h +++ b/newlib/libc/include/sys/types.h @@ -197,9 +197,10 @@ typedef __clockid_t clockid_t; #define _CLOCKID_T_DECLARED #endif -#ifndef __timer_t_defined -typedef _TIMER_T_ timer_t; -#define __timer_t_defined +#if !defined(__timer_t_defined) && !defined(_TIMER_T_DECLARED) +typedef __timer_t timer_t; +#define __timer_t_defined +#define _TIMER_T_DECLARED #endif typedef unsigned long useconds_t;