From 3dd4296de7b989e547f7077c586ac9110a1a310f Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 20 Feb 2008 18:28:00 +0000
Subject: [PATCH] Merged revisions 103845 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r103845 | tilghman | 2008-02-20 11:53:00 -0600 (Wed, 20 Feb 2008) | 7 lines
Compat fix for Solaris
(closes issue #12022)
Reported by: asgaroth
Patches:
20080219__bug12022.diff.txt uploaded by Corydon76 (license 14)
Tested by: asgaroth
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103846 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/stdtime/localtime.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index 2d60beefd4..445f93a55f 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -1128,7 +1128,9 @@ static struct ast_tm *localsub(const struct timeval *timep, const long offset, s
*/
result = timesub(&t, ttisp->tt_gmtoff, sp, tmp);
tmp->tm_isdst = ttisp->tt_isdst;
+#ifndef SOLARIS /* Solaris doesn't have this element */
tmp->tm_gmtoff = ttisp->tt_gmtoff;
+#endif
#ifdef TM_ZONE
tmp->TM_ZONE = &sp->chars[ttisp->tt_abbrind];
#endif /* defined TM_ZONE */
--
GitLab