[svn-commits] qwell: trunk r48907 - in /trunk: ./ Makefile main/stdtime/localtime.c

[svn-commits at lists.digium.com]

Author: qwell
Date: Fri Dec 22 16:34:31 2006
New Revision: 48907

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48907
Log:
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.

........

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/main/stdtime/localtime.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?view=diff&rev=48907&r1=48906&r2=48907
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Dec 22 16:34:31 2006
@@ -58,6 +58,7 @@
 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

Modified: trunk/main/stdtime/localtime.c
URL: http://svn.digium.com/view/asterisk/trunk/main/stdtime/localtime.c?view=diff&rev=48907&r1=48906&r2=48907
==============================================================================
--- trunk/main/stdtime/localtime.c (original)
+++ trunk/main/stdtime/localtime.c Fri Dec 22 16:34:31 2006
@@ -1216,11 +1216,7 @@
 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
 }
 
 /*