aboutsummaryrefslogtreecommitdiffstats
path: root/main/stdtime
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-12-22 22:34:31 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-12-22 22:34:31 +0000
commit821a7077dbcac2f9bebbeb048bf72a8d67539d05 (patch)
tree35d522653453fd8d435e0a684456288a068d88d3 /main/stdtime
parentdc680933343e35e38fef47a216372137f8511fc5 (diff)
Merged revisions 48906 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r48906 | qwell | 2006-12-22 16:33:46 -0600 (Fri, 22 Dec 2006) | 2 lines Minor fixes for Solaris. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48907 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/stdtime')
-rw-r--r--main/stdtime/localtime.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index 491b3df95..effb987cb 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -1216,11 +1216,7 @@ 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
}
/*