fixes for Solaris

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9462 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/applications/mod_timezone/localtime_find.c b/src/mod/applications/mod_timezone/localtime_find.c
index 2bbd2bf268433832753f9ce91262358127e60cd7..e2f16f729b8748ffe19ead1e1a3f5ddae2079b47 100644 (file)
--- a/src/mod/applications/mod_timezone/localtime_find.c
+++ b/src/mod/applications/mod_timezone/localtime_find.c
@@ -722,11 +722,11 @@ static int tzparse(const char *name, register struct state * const sp, const int
 /* **************************************************************************
            
    ************************************************************************** */
-#if (_MSC_VER >= 1400)                 // VC8+\r
-#define switch_assert(expr) assert(expr);__analysis_assume( expr )\r
-#else\r
-#define switch_assert(expr) assert(expr)\r
-#endif\r
+#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
                }

diff --git a/src/mod/applications/mod_timezone/mod_timezone.c b/src/mod/applications/mod_timezone/mod_timezone.c
index cf0f00f8727df49b22e2ca1d45c45ae03f25f2e0..b302d317251dd5fa77f1c22554faa1e4adcf9846 100644 (file)
--- a/src/mod/applications/mod_timezone/mod_timezone.c
+++ b/src/mod/applications/mod_timezone/mod_timezone.c
@@ -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