From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 20 Jun 2006 15:06:38 +0000 (+0000)
Subject: Merged revisions 35121 via svnmerge from
X-Git-Tag: 1.4.0-beta1~837
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e704d616a53aabb62f9e5df65d7d393d004df21f;p=thirdparty%2Fasterisk.git

Merged revisions 35121 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r35121 | tilghman | 2006-06-20 10:05:23 -0500 (Tue, 20 Jun 2006) | 2 lines

Bug 7398 - Solaris puts its zoneinfo files in a nonstandard place

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35122 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/stdtime/private.h b/stdtime/private.h
index 60479d787f..8ef9ccfdde 100644
--- a/stdtime/private.h
+++ b/stdtime/private.h
@@ -20,7 +20,11 @@
 #define HAVE_STRERROR	1
 #define	HAVE_UNISTD_H	1
 #define	LOCALE_HOME	_PATH_LOCALE
+#ifdef SOLARIS
+#define TZDIR		"/usr/share/lib/zoneinfo"
+#else
 #define TZDIR		"/usr/share/zoneinfo"
+#endif /* def SOLARIS */
 #endif /* ndef TM_GMTOFF */
 
 /*