Author: cypromis Date: Fri Sep 5 09:36:47 2008 New Revision: 9462 Modified: freeswitch/trunk/src/mod/applications/mod_timezone/localtime_find.c freeswitch/trunk/src/mod/applications/mod_timezone/mod_timezone.c Log: fixes for Solaris Modified: freeswitch/trunk/src/mod/applications/mod_timezone/localtime_find.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_timezone/localtime_find.c (original) +++ freeswitch/trunk/src/mod/applications/mod_timezone/localtime_find.c Fri Sep 5 09:36:47 2008 @@ -722,11 +722,11 @@ /* ************************************************************************** ************************************************************************** */ -#if (_MSC_VER >= 1400) // VC8+ -#define switch_assert(expr) assert(expr);__analysis_assume( expr ) -#else -#define switch_assert(expr) assert(expr) -#endif +#if (_MSC_VER >= 1400) // VC8+ +#define switch_assert(expr) assert(expr);__analysis_assume( expr ) +#else +#define switch_assert(expr) assert(expr) +#endif static void timesub(const time_t * const timep, const long offset, register const struct state * const sp, register struct tm * const tmp) { @@ -832,7 +832,7 @@ tmp->tm_mday = (int) (days + 1); tmp->tm_isdst = 0; -#ifndef WIN32 +#if !defined(WIN32) && !defined(__SVR4) && !defined(__sun) tmp->tm_gmtoff = offset; #endif } @@ -888,7 +888,7 @@ { timesub( &t, ttisp->tt_gmtoff, sp, tmp); tmp->tm_isdst = ttisp->tt_isdst; -#ifndef WIN32 +#if !defined(WIN32) && !defined(__SVR4) && !defined(__sun) tmp->tm_zone = &sp->chars[ttisp->tt_abbrind]; #endif } Modified: freeswitch/trunk/src/mod/applications/mod_timezone/mod_timezone.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_timezone/mod_timezone.c (original) +++ freeswitch/trunk/src/mod/applications/mod_timezone/mod_timezone.c Fri Sep 5 09:36:47 2008 @@ -51,7 +51,8 @@ xt->tm_wday = tm->tm_wday; xt->tm_yday = tm->tm_yday; xt->tm_isdst = tm->tm_isdst; -#ifndef WIN32 +#if !defined(WIN32) && !defined(__SVR4) && !defined(__sun) + xt->tm_gmtoff = tm->tm_gmtoff; #endif