From patchwork Mon Jun 5 21:18:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 20808 Received: (qmail 78462 invoked by alias); 5 Jun 2017 21:19:04 -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 78445 invoked by uid 89); 5 Jun 2017 21:19:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=Hx-languages-length:1024 X-HELO: relay1.mentorg.com Date: Mon, 5 Jun 2017 21:18:54 +0000 From: Joseph Myers To: Subject: Fix XPG4 bsd_signal namespace (bug 21552) Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To SVR-ORW-MBX-06.mgc.mentorg.com (147.34.90.206) bsd_signal was added in XPG4.2, so should be declared for __USE_XOPEN_EXTENDED, instead of the present __USE_XOPEN condition. This patch fixes the condition accordingly. Tested for x86_64. Because of other namespace problems this does not allow any conform/ XFAILs to be removed. 2017-06-05 Joseph Myers [BZ #21552] * signal/signal.h (bsd_signal): Declare if [__USE_XOPEN_EXTENDED], not [__USE_XOPEN]. diff --git a/signal/signal.h b/signal/signal.h index b311473..8a140d4 100644 --- a/signal/signal.h +++ b/signal/signal.h @@ -94,7 +94,7 @@ extern __sighandler_t __REDIRECT_NTH (signal, # endif #endif -#if defined __USE_XOPEN && !defined __USE_XOPEN2K8 +#if defined __USE_XOPEN_EXTENDED && !defined __USE_XOPEN2K8 /* The X/Open definition of `signal' conflicts with the BSD version. So they defined another function `bsd_signal'. */ extern __sighandler_t bsd_signal (int __sig, __sighandler_t __handler)