fixes for Solaris
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9462 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
223ff87545
commit
bc1d36c366
|
@ -722,11 +722,11 @@ static int tzparse(const char *name, register struct state * const sp, const int
|
|||
/* **************************************************************************
|
||||
|
||||
************************************************************************** */
|
||||
#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 @@ static void timesub(const time_t * const timep, const long offset, register cons
|
|||
|
||||
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 @@ void tztime(const time_t * const timep, const char *tzstring, struct tm * const
|
|||
{
|
||||
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
|
||||
}
|
||||
|
|
|
@ -51,7 +51,8 @@ static void tm2switchtime(struct tm * tm, switch_time_exp_t *xt )
|
|||
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
|
||||
|
||||
|
|
Loading…
Reference in New Issue