[asterisk-commits] trunk r35122 - in /trunk: ./ stdtime/private.h

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Tue Jun 20 10:06:38 2006
New Revision: 35122

URL: http://svn.digium.com/view/asterisk?rev=35122&view=rev
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/stdtime/private.h

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/stdtime/private.h
URL: http://svn.digium.com/view/asterisk/trunk/stdtime/private.h?rev=35122&r1=35121&r2=35122&view=diff
==============================================================================
--- trunk/stdtime/private.h (original)
+++ trunk/stdtime/private.h Tue Jun 20 10:06:38 2006
@@ -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 */
 
 /*