diff --git a/Makefile b/Makefile index 46cce109a0ac8314e51527b030d86de953932f4d..b4d3ddf64d616103fed30d3bf2ccd9c07b44e3cc 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 491b3df95e10de585f981f2b4e7a59a0a045ab00..effb987cbeba87a01dc9788b1ed60f2d2e65be69 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 } /*