aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-12-22 22:33:46 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-12-22 22:33:46 +0000
commit358e114888afa9dda2b9d849fb73d07f81748ea0 (patch)
treedb76a5fcc2c5f7001dbd89f687b0d8ad7a89aa9e
parent637520c9aeeb16cbc6dc481d0a70d05b85b5ba1c (diff)
Minor fixes for Solaris.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@48906 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--Makefile1
-rw-r--r--main/stdtime/localtime.c4
2 files changed, 1 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index d0f84a350..c4a058a78 100644
--- 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 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
}
/*