From 59a4279fb51e3d5158cb9898ed63d94c07aff72a Mon Sep 17 00:00:00 2001
From: Automerge script <automerge@asterisk.org>
Date: Tue, 20 Jun 2006 16:05:25 +0000
Subject: [PATCH] automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@35158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 stdtime/private.h | 4 ++++
 1 file changed, 4 insertions(+)

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 */
 
 /*