From 98ebcb4b8af31a07ac935eeaa1d101dc70cd43d4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 7 Dec 2019 14:04:00 +0000 Subject: [PATCH] pango: check if localtime_r is available HAVE_LOCALTIME_R was used, but never defined. --- ext/pango/gstclockoverlay.c | 16 ++++++++-------- meson.build | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ext/pango/gstclockoverlay.c b/ext/pango/gstclockoverlay.c index 46fda8c..1a0258d 100644 --- a/ext/pango/gstclockoverlay.c +++ b/ext/pango/gstclockoverlay.c @@ -79,17 +79,17 @@ gst_clock_overlay_render_time (GstClockOverlay * overlay) time_t now; gchar buf[256]; -#ifdef HAVE_LOCALTIME_R - struct tm dummy; -#endif - now = time (NULL); #ifdef HAVE_LOCALTIME_R - /* Need to call tzset explicitly when calling localtime_r for changes - to the timezone between calls to be visible. */ - tzset (); - t = localtime_r (&now, &dummy); + { + struct tm dummy; + + /* Need to call tzset explicitly when calling localtime_r for changes + * to the timezone between calls to be visible. */ + tzset (); + t = localtime_r (&now, &dummy); + } #else /* on win32 this apparently returns a per-thread struct which would be fine */ t = localtime (&now); diff --git a/meson.build b/meson.build index f95df5d..a8d7134 100644 --- a/meson.build +++ b/meson.build @@ -136,6 +136,7 @@ endforeach check_functions = [ ['HAVE_DCGETTEXT', 'dcgettext', '#include'], ['HAVE_GMTIME_R', 'gmtime_r', '#include'], + ['HAVE_LOCALTIME_R', 'localtime_r', '#include'], ['HAVE_LRINTF', 'lrintf', '#include'], ['HAVE_MMAP', 'mmap', '#include'], ['HAVE_LOG2', 'log2', '#include'], -- 2.7.4