automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@35158 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/stdtime/private.h b/stdtime/private.h
index 60479d787f0a36228801bcee753c086a704d62f1..8ef9ccfddeaf6fc5eef17ebe1d35b2a2d6f4dd4c 100644 (file)
--- 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 */
 
 /*