From d017436015c96ebf1d673096d9ea036ff8c402da Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Fri, 22 Dec 2006 22:33:46 +0000 Subject: [PATCH] Minor fixes for Solaris. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@48906 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 1 + main/stdtime/localtime.c | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d0f84a3502..c4a058a78e 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 491b3df95e..effb987cbe 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 } /*