Merge from 1.2 tip.

--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c

2 files changed, 8 insertions, 4 deletions

diff --git a/lib/strtok_r.c b/lib/strtok_r.c
index cead029a2..8a5284a42 100644
--- a/lib/strtok_r.c
+++ b/lib/strtok_r.c
@@ -19,7 +19,7 @@ char *xine_private_strtok_r(char *s, const char *delim, char **ptrptr) {
   else s = *ptrptr;
 
   /* end of searching */
-  if (!s || s == '\0') return NULL;
+  if (!s || !*s) return NULL;
 
   /* cut the initial garbage */
   cutlen = strspn(s, delim);
@@ -32,12 +32,12 @@ char *xine_private_strtok_r(char *s, const char *delim, char **ptrptr) {
   }
   next = s + toklen;
 
+  /* prepare next call */
+  *ptrptr = *next ? next + 1 : NULL;
+
   /* cut current token */
   *next = '\0';
 
-  /* prepare next call */
-  *ptrptr = next + 1;
-
   /* return the token */
   return s;
 }
diff --git a/lib/timegm.c b/lib/timegm.c
index 588131afb..e86e66370 100644
--- a/lib/timegm.c
+++ b/lib/timegm.c
@@ -5,15 +5,19 @@
 
 time_t xine_private_timegm(struct tm *tm) {
   time_t ret;
+#if defined(HAVE_TZSET)
   char *tz;
 
   tz = getenv("TZ");
   setenv("TZ", "", 1);
   tzset();
+#endif
   ret = mktime(tm);
+#if defined(HAVE_TZSET)
   if (tz) setenv("TZ", tz, 1);
   else unsetenv("TZ");
   tzset();
+#endif
 
   return ret;
 }