[svn-commits] qwell: branch 1.4 r48906 - in /branches/1.4: Makefile main/stdtime/localtime.c

[svn-commits at lists.digium.com]

Author: qwell
Date: Fri Dec 22 16:33:46 2006
New Revision: 48906

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48906
Log:
Minor fixes for Solaris.

Modified:
    branches/1.4/Makefile
    branches/1.4/main/stdtime/localtime.c

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/Makefile?view=diff&rev=48906&r1=48905&r2=48906
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Fri Dec 22 16:33:46 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: branches/1.4/main/stdtime/localtime.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/stdtime/localtime.c?view=diff&rev=48906&r1=48905&r2=48906
==============================================================================
--- branches/1.4/main/stdtime/localtime.c (original)
+++ branches/1.4/main/stdtime/localtime.c Fri Dec 22 16:33:46 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
 }
 
 /*