[git commit future 1/1] time.c: fix a guard to avoid a warning about unused label

Khem Raj raj.khem at gmail.com
Sat Mar 19 18:51:25 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=089b3bd609d46625d66a0fd2d609debc1be64330
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/future

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
 libc/misc/time/time.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libc/misc/time/time.c b/libc/misc/time/time.c
index 11ca641..0962300 100644
--- a/libc/misc/time/time.c
+++ b/libc/misc/time/time.c
@@ -2096,7 +2096,8 @@ DONE:
 	daylight = !!_time_tzinfo[1].tzname[0];
 	timezone = _time_tzinfo[0].gmt_offset;
 
-#if defined(__UCLIBC_HAS_TZ_FILE__) || defined(__UCLIBC_HAS_TZ_CACHING__)
+#if (defined(__UCLIBC_HAS_TZ_FILE__) && !defined(__UCLIBC_HAS_TZ_FILE_READ_MANY__)) || \
+	defined(__UCLIBC_HAS_TZ_CACHING__)
 FAST_DONE:
 #endif
 	__UCLIBC_MUTEX_UNLOCK(_time_tzlock);
-- 
1.7.3.4



More information about the uClibc-cvs mailing list