From patchwork Wed Feb 27 11:20:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 31621 Received: (qmail 61723 invoked by alias); 27 Feb 2019 11:21:05 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 61709 invoked by uid 89); 27 Feb 2019 11:21:05 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=H*r:192.168.8, H*Ad:D*edu X-HELO: mail-out.m-online.net From: Lukasz Majewski To: libc-alpha@sourceware.org Cc: Paul Eggert , Joseph Myers Subject: [PATCH v2 2/2] Fix time/mktime.c and time/gmtime.c for gnulib compatibility Date: Wed, 27 Feb 2019 12:20:42 +0100 Message-Id: <20190227112042.1794-2-lukma@denx.de> In-Reply-To: <20190227112042.1794-1-lukma@denx.de> References: <20190227112042.1794-1-lukma@denx.de> From: Paul Eggert Tested with 'make check' on x86_64-linux-gnu and i686-linux.gnu. * time/mktime.c (__mktime64): Guard weak_alias with #ifdef (__mktime64): Guard libc_hidden_def with #if _LIBC (__mktime64): Guard libc_hidden_weak with #if _LIBC (mktime): Only build when _LIBC is defined * time/timegm.c: (timegm): Only build when _LIBC is defined --- time/mktime.c | 15 +++------------ time/timegm.c | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/time/mktime.c b/time/mktime.c index 5d3644e213..89293a76fb 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -549,18 +549,14 @@ __mktime64 (struct tm *tp) return mktime (tp); # endif } -#endif /* _LIBC || NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS */ -#ifdef weak_alias weak_alias (__mktime64, __timelocal64) -#endif - -#ifdef _LIBC libc_hidden_def (__mktime64) libc_hidden_weak (__timelocal64) -#endif -#if __TIMESIZE != 64 +#endif /* _LIBC || NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS */ + +#if defined _LIBC && __TIMESIZE != 64 /* The 32-bit-time wrapper. */ time_t @@ -573,13 +569,8 @@ mktime (struct tm *tp) return -1; } -#ifdef weak_alias weak_alias (mktime, timelocal) -#endif - -#ifdef _LIBC libc_hidden_def (mktime) libc_hidden_weak (timelocal) -#endif #endif diff --git a/time/timegm.c b/time/timegm.c index 0cbe60a7fe..f04428d032 100644 --- a/time/timegm.c +++ b/time/timegm.c @@ -35,7 +35,7 @@ __timegm64 (struct tm *tmp) return __mktime_internal (tmp, __gmtime64_r, &gmtime_offset); } -#if __TIMESIZE != 64 +#if defined _LIBC && __TIMESIZE != 64 time_t timegm (struct tm *tmp)