mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-04 03:50:31 +00:00
Merge slimey's Solaris compatibility (with small mods) (bug #2740)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -113,6 +113,12 @@ struct lsinfo { /* leap second information */
|
||||
#define MY_TZNAME_MAX 255
|
||||
#endif /* !defined TZNAME_MAX */
|
||||
|
||||
#ifdef SOLARIS
|
||||
#undef TM_ZONE
|
||||
#undef TM_GMTOFF
|
||||
#endif
|
||||
|
||||
|
||||
struct state {
|
||||
char name[TZ_STRLEN_MAX + 1];
|
||||
int leapcnt;
|
||||
@@ -1208,7 +1214,11 @@ const time_t * const timep;
|
||||
char *buf;
|
||||
{
|
||||
struct tm tm;
|
||||
#ifdef SOLARIS
|
||||
return asctime_r(localtime_r(timep, &tm), buf, 256);
|
||||
#else
|
||||
return asctime_r(localtime_r(timep, &tm), buf);
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user