Skip to content

Commit

Permalink
compat: fix localtime_r() replacement
Browse files Browse the repository at this point in the history
 - Do not clobber thread-specific state on Windows
 - Be thread-safe on non-Windows
  • Loading branch information
Rémi Denis-Courmont committed Mar 16, 2015
1 parent b6f66cf commit d60d510
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions compat/localtime_r.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*****************************************************************************
* localtime_r.c: POSIX localtime_r() replacement
*****************************************************************************
* Copyright © 1998-2008 VLC authors and VideoLAN
* Copyright © 1998-2015 VLC authors and VideoLAN
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as published by
Expand All @@ -18,20 +18,26 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/

#if (__STDC_VERSION__ >= 201112L)
# define __STDC_WANT_LIB_EXT1__ 1
#endif
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif

#include <errno.h>
#include <time.h>

/* If localtime_r() is not provided, we assume localtime() uses
* thread-specific storage. */
struct tm *localtime_r (const time_t *timep, struct tm *result)
{
struct tm *s = localtime (timep);
if (s == NULL)
return NULL;

*result = *s;
return result;
#if (__STDC_VERSION__ >= 201112L)
return localtime_s(timep, result);
#elif defined (_WIN32)
return ((errno = localtime_s(result, timep)) == 0) ? result : NULL;
#else
# warning localtime_r() not implemented!
return gmtime_r(timep, result);
#endif
}

0 comments on commit d60d510

Please sign in to comment.