From patchwork Thu Apr 19 22:17:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 901544 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-91745-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="jKAUmbbv"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Rtdt2WDfz9s3F for ; Fri, 20 Apr 2018 08:17:38 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=rk/MHuYpqOZLsMgrsrye+0exHen/Oq4pJjN6LQMAF7pewdYXjiei4 5HMpTsls8POhsiJ4Y69/tLwn/jKIYj6e6tExuZjIHjGB6LdMs8PogrCdaVYUVBv4 IWZqfR1PbJVEWyKs8rtmWQWZl4vdb3Bj/dYPfA7LxJAqy07Kbzm2B0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; s=default; bh=RkNw4YHKvAUEmbbD/G1CUMRTHMk=; b=jKAUmbbv4bqHQvx9bof4cwtXnSIR D8hXcvBxibOLQWdjpvvu9+3yWiD31YGrqklHFSEf6XLh5qdS41JYoVPKeaSwTD9j nEXm2+VAhewvRkK8l0NXKpBsN/MdIV23yvgEY5OoLVt1uOkKkrYnekzSTDXrbpfX O/4TXwBKWvjWTNo= Received: (qmail 110360 invoked by alias); 19 Apr 2018 22:17:32 -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 110351 invoked by uid 89); 19 Apr 2018 22:17:32 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL, URIBL_RED autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited] hurd: Fix hurd installed headers test Date: Fri, 20 Apr 2018 00:17:26 +0200 Message-Id: <20180419221726.13560-1-samuel.thibault@ens-lyon.org> * sysdeps/hurd/include/hurd.h [!_ISOMAC]: Do not declare libc hidden prototypes. * sysdeps/hurd/include/hurd/fd.h [!_ISOMAC]: Likewise. * sysdeps/hurd/include/hurd/signal.h [!_ISOMAC]: Likewise. --- ChangeLog | 4 ++++ sysdeps/hurd/include/hurd.h | 2 ++ sysdeps/hurd/include/hurd/fd.h | 4 +++- sysdeps/hurd/include/hurd/signal.h | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 253f98332b..e2ccfc91fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,10 @@ [__USE_XOPEN] (OFDEL): New macro. [__USE_XOPEN && !__USE_XOPEN2K] (XCASE): New macro. * bits/resource.h (RLIM_SAVED_MAX, RLIM_SAVED_CUR): New macros. + * sysdeps/hurd/include/hurd.h [!_ISOMAC]: Do not declare libc hidden + prototypes. + * sysdeps/hurd/include/hurd/fd.h [!_ISOMAC]: Likewise. + * sysdeps/hurd/include/hurd/signal.h [!_ISOMAC]: Likewise. 2018-04-18 Joseph Myers diff --git a/sysdeps/hurd/include/hurd.h b/sysdeps/hurd/include/hurd.h index f740e9de0f..d29f580d5b 100644 --- a/sysdeps/hurd/include/hurd.h +++ b/sysdeps/hurd/include/hurd.h @@ -1,5 +1,7 @@ #ifndef _HURD_H #include_next +#ifndef _ISOMAC libc_hidden_proto (_hurd_exec_paths) libc_hidden_proto (_hurd_init) #endif +#endif diff --git a/sysdeps/hurd/include/hurd/fd.h b/sysdeps/hurd/include/hurd/fd.h index 643454f3f8..1f3ac380a0 100644 --- a/sysdeps/hurd/include/hurd/fd.h +++ b/sysdeps/hurd/include/hurd/fd.h @@ -1,10 +1,12 @@ #ifndef _HURD_FD_H #include_next +#ifndef _ISOMAC libc_hidden_proto (_hurd_intern_fd) libc_hidden_proto (_hurd_fd_error) libc_hidden_proto (_hurd_fd_error_signal) -#ifdef _HURD_FD_H_HIDDEN_DEF +# ifdef _HURD_FD_H_HIDDEN_DEF libc_hidden_def (_hurd_fd_error) libc_hidden_def (_hurd_fd_error_signal) +# endif #endif #endif diff --git a/sysdeps/hurd/include/hurd/signal.h b/sysdeps/hurd/include/hurd/signal.h index f3185f97db..1cb0adaa55 100644 --- a/sysdeps/hurd/include/hurd/signal.h +++ b/sysdeps/hurd/include/hurd/signal.h @@ -1,7 +1,9 @@ #ifndef _HURD_SIGNAL_H #include_next +#ifndef _ISOMAC libc_hidden_proto (_hurd_exception2signal) libc_hidden_proto (_hurd_intr_rpc_mach_msg) libc_hidden_proto (_hurd_thread_sigstate) libc_hidden_proto (_hurd_raise_signal) #endif +#endif