diff --git a/src/mod/applications/mod_timezone/localtime_find.c b/src/mod/applications/mod_timezone/localtime_find.c
index 2bbd2bf268..e2f16f729b 100644
--- 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+
-#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
 		}
diff --git a/src/mod/applications/mod_timezone/mod_timezone.c b/src/mod/applications/mod_timezone/mod_timezone.c
index cf0f00f872..b302d31725 100644
--- 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