summaryrefslogtreecommitdiff
path: root/stdtime
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2006-06-20 15:06:38 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2006-06-20 15:06:38 +0000
commite704d616a53aabb62f9e5df65d7d393d004df21f (patch)
tree4df19231a3116255605fc315683699dea815f3b0 /stdtime
parentcb4221c7e9906b69becde867df256173baa9cde4 (diff)
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
Diffstat (limited to 'stdtime')
-rw-r--r--stdtime/private.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/stdtime/private.h b/stdtime/private.h
index 60479d787..8ef9ccfdd 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 */
/*