Merged revisions 48906 via svnmerge from
authorJason Parker <jparker@digium.com>
Fri, 22 Dec 2006 22:34:31 +0000 (22:34 +0000)
committerJason Parker <jparker@digium.com>
Fri, 22 Dec 2006 22:34:31 +0000 (22:34 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@48907 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile
main/stdtime/localtime.c

index 46cce10..b4d3ddf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,7 @@ export PROC
 export SOLINK
 export STRIP
 export DOWNLOAD
+export OSARCH
 
 # even though we could use '-include makeopts' here, use a wildcard
 # lookup anyway, so that make won't try to build makeopts if it doesn't
index 491b3df..effb987 100644 (file)
@@ -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
 }
 
 /*