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: https://origsvn.digium.com/svn/asterisk/trunk@48907 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 46cce109a0ac8314e51527b030d86de953932f4d..b4d3ddf64d616103fed30d3bf2ccd9c07b44e3cc 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

diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index 491b3df95e10de585f981f2b4e7a59a0a045ab00..effb987cbeba87a01dc9788b1ed60f2d2e65be69 100644 (file)
--- 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
 }
 
 /*