From patchwork Tue Apr 26 14:45:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 614977 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3qvQsP2FZ9z9t6X for ; Wed, 27 Apr 2016 00:46:49 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=YFTDPONj; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=O5s5/ofI2TLwR++P5vC45yu+0mR6f bAzMZVUHAMCkLpbKNwV8I3BaCuQb3QZoaWpYfAjdsCicdtITKhRN9kOisuwHNLxI DOwBwBuxAFtD1DPn1z+4hH6tevahvqhwldidi7DscSSRHUgYLknTCvhGT/YlOUkh Dcymy3Jlz6nkc8= 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:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=sMo5YdrP2ZIbE7g6qDh+ytVvQG0=; b=YFT DPONjMAWqERxPeV5TmqCbqSss2/Gz0iNDrB5Rxi3lK4aDTWkII4SJgi+qKGHDZFP 4uP+NA7/3DzRR9tKc1aTjOOspTkdmZA3B4s3olcWRn7l0RanrI9iFn++c2ISwI2Z fjd8spWWNsglT0o6lsZug1JWmGdBX+DhBVg1sKns= Received: (qmail 42159 invoked by alias); 26 Apr 2016 14:46:43 -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 42142 invoked by uid 89); 26 Apr 2016 14:46:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=5837, fcntlh, UD:fcntl.h, fcntl.h X-HELO: relay1.mentorg.com Date: Tue, 26 Apr 2016 14:45:24 +0000 From: Joseph Myers To: Subject: Fix langinfo.h nl_langinfo_l namespace (bug 19996) Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 langinfo.h declares nl_langinfo_l if __USE_XOPEN2K. But this function was new in the 2008 edition of POSIX. This patch fixes the condition accordingly. Tested for x86_64 and x86 (testsuite, and that installed shared libraries are unchanged by the patch). 2016-04-26 Joseph Myers [BZ #19996] * locale/langinfo.h (nl_langinfo_l): Declare if [__USE_XOPEN2K8], not [__USE_XOPEN2K]. * conform/Makefile (test-xfail-XOPEN2K/langinfo.h/conform): Remove variable. diff --git a/conform/Makefile b/conform/Makefile index a1759c9..56a7dda 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -211,7 +211,6 @@ test-xfail-UNIX98/unistd.h/conform = yes test-xfail-UNIX98/utmpx.h/conform = yes test-xfail-XOPEN2K/aio.h/conform = yes test-xfail-XOPEN2K/fcntl.h/conform = yes -test-xfail-XOPEN2K/langinfo.h/conform = yes test-xfail-XOPEN2K/mqueue.h/conform = yes test-xfail-XOPEN2K/semaphore.h/conform = yes test-xfail-XOPEN2K/signal.h/conform = yes diff --git a/locale/langinfo.h b/locale/langinfo.h index 481e226..04347eb 100644 --- a/locale/langinfo.h +++ b/locale/langinfo.h @@ -583,7 +583,7 @@ enum extern char *nl_langinfo (nl_item __item) __THROW; -#ifdef __USE_XOPEN2K +#ifdef __USE_XOPEN2K8 /* This interface is for the extended locale model. See for more information. */