[Mesa-dev] [PATCH 7/7] c11: Make TIME_UTC a conditional macro.

[Ian Romanick]

This should get squashed with patch #2 when you push this.  That will
prevent possible build breaks while bisecting.

On 01/09/2014 11:20 AM, jfonseca at vmware.com wrote:
> From: José Fonseca <jfonseca at vmware.com>
> 
> Some system headers already define it, so this prevents conflict.
> ---
>  include/c11/threads.h | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/include/c11/threads.h b/include/c11/threads.h
> index 678774c..4a4079d 100644
> --- a/include/c11/threads.h
> +++ b/include/c11/threads.h
> @@ -10,6 +10,10 @@
>  
>  #include <time.h>
>  
> +#ifndef TIME_UTC
> +#define TIME_UTC 1
> +#endif
> +
>  #include "c99_compat.h" /* for `inline` */
>  
>  /*---------------------------- types ----------------------------*/
> @@ -39,8 +43,6 @@ enum {
>      thrd_nomem        // out of memory
>  };
>  
> -enum { TIME_UTC = 1 };
> -
>  /*-------------------------- functions --------------------------*/
>  
>  #if defined(_WIN32) && !defined(__CYGWIN__)
>