From 358e114888afa9dda2b9d849fb73d07f81748ea0 Mon Sep 17 00:00:00 2001 From: qwell Date: Fri, 22 Dec 2006 22:33:46 +0000 Subject: Minor fixes for Solaris. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@48906 f38db490-d61c-443f-a65b-d21fe96a405b --- Makefile | 1 + main/stdtime/localtime.c | 4 ---- 2 files changed, 1 insertion(+), 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 } /* -- cgit v1.2.3