[asterisk-commits] tilghman: trunk r82292 - in /trunk: ./ main/stdtime/tzfile.h

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Sep 12 16:32:24 2007
New Revision: 82292

URL: http://svn.digium.com/view/asterisk?view=rev&rev=82292
Log:
Merged revisions 82291 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82291 | tilghman | 2007-09-12 16:28:33 -0500 (Wed, 12 Sep 2007) | 2 lines

Oops, wrong location for FreeBSD zone files

........

Modified:
    trunk/   (props changed)
    trunk/main/stdtime/tzfile.h

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

Modified: trunk/main/stdtime/tzfile.h
URL: http://svn.digium.com/view/asterisk/trunk/main/stdtime/tzfile.h?view=diff&rev=82292&r1=82291&r2=82292
==============================================================================
--- trunk/main/stdtime/tzfile.h (original)
+++ trunk/main/stdtime/tzfile.h Wed Sep 12 16:32:24 2007
@@ -33,11 +33,7 @@
 #ifdef SOLARIS
 #define TZDIR	"/usr/share/lib/zoneinfo"
 #else
-#ifdef FREEBSD
-#define TZDIR	"/usr/local/etc/zoneinfo" /* Time zone object file directory */
-#else
 #define TZDIR	"/usr/share/zoneinfo"
-#endif /* defined FREEBSD */
 #endif /* defined SOLARIS */
 #endif /* !defined TZDIR */