From patchwork Tue Mar 21 20:21:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yaakov Selkowitz X-Patchwork-Id: 95674 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp1619851qgd; Tue, 21 Mar 2017 13:21:52 -0700 (PDT) X-Received: by 10.98.141.138 with SMTP id p10mr41207257pfk.111.1490127712846; Tue, 21 Mar 2017 13:21:52 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id d23si7864021pgn.60.2017.03.21.13.21.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Mar 2017 13:21:52 -0700 (PDT) Received-SPF: pass (google.com: domain of newlib-return-14446-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org; spf=pass (google.com: domain of newlib-return-14446-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=newlib-return-14446-patch=linaro.org@sourceware.org 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:subject:date:message-id; q=dns; s= default; b=CL29kHrsxCfLNzWL77+UvO487ZhnzGWINTsOGDzUempvDo3glRE1k p2e7xzk9HOyIbeDCrSuvyA6Gf7JklexON8fvRi4bKmksVIjGxi7kpb47brnxoS5w F0DnZbrPzCusm4iOTWPaJNA1cCfEFtmhfmmIRZWT1JEBL8DFeoFCcg= 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:subject:date:message-id; s=default; bh=l+tyFwN/AD/y7ncGuQV+rYhvHro=; b=ZRuzgh34CtX0g5Ofp+9i8opCDeZL Ln4P0Co+TS5BlsTmh4ua+F/RwC1ZtGBWNKj3iJZMZfB8XLY31WH0m2cY8/TiAJHL sWj8QeNBlH/bJKWOViGrUjL4YKLg4VK2qfNnrVpzS+EShOzCeKi9rh/r5WRAAt3x QtE2GOIl7PMihYg= Received: (qmail 4421 invoked by alias); 21 Mar 2017 20:21:42 -0000 Mailing-List: contact newlib-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-owner@sourceware.org Delivered-To: mailing list newlib@sourceware.org Received: (qmail 4407 invoked by uid 89); 21 Mar 2017 20:21:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=realworld, real-world, presumed, 3011 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 21 Mar 2017 20:21:40 +0000 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9BA0A80F95 for ; Tue, 21 Mar 2017 20:21:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9BA0A80F95 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=yselkowi@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9BA0A80F95 Received: from localhost.localdomain (ovpn-120-20.rdu2.redhat.com [10.10.120.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 361935C546 for ; Tue, 21 Mar 2017 20:21:41 +0000 (UTC) From: Yaakov Selkowitz To: newlib@sourceware.org Subject: [PATCH] Rename to Date: Tue, 21 Mar 2017 15:21:30 -0500 Message-Id: <20170321202130.20020-1-yselkowi@redhat.com> The locale_t type is provided by on Linux, FreeBSD, and Darwin. While, like on some of those systems, it is automatically included by with the proper feature test macros, its presence under this particular name is still presumed in real-world software. Signed-off-by: Yaakov Selkowitz --- newlib/libc/include/ctype.h | 2 +- newlib/libc/include/langinfo.h | 2 +- newlib/libc/include/locale.h | 2 +- newlib/libc/include/stdlib.h | 2 +- newlib/libc/include/string.h | 2 +- newlib/libc/include/strings.h | 2 +- newlib/libc/include/sys/_locale.h | 12 ------------ newlib/libc/include/time.h | 2 +- newlib/libc/include/wchar.h | 2 +- newlib/libc/include/wctype.h | 2 +- newlib/libc/include/xlocale.h | 12 ++++++++++++ winsup/cygwin/include/monetary.h | 2 +- winsup/doc/new-features.xml | 5 +++++ 13 files changed, 27 insertions(+), 22 deletions(-) delete mode 100644 newlib/libc/include/sys/_locale.h create mode 100644 newlib/libc/include/xlocale.h -- 2.8.3 diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h index 31577d1..06458cb 100644 --- a/newlib/libc/include/ctype.h +++ b/newlib/libc/include/ctype.h @@ -5,7 +5,7 @@ #include #if __POSIX_VISIBLE >= 200809 || __MISC_VISIBLE || defined (_COMPILING_NEWLIB) -#include +#include #endif _BEGIN_STD_C diff --git a/newlib/libc/include/langinfo.h b/newlib/libc/include/langinfo.h index 193cce3..59381d6 100644 --- a/newlib/libc/include/langinfo.h +++ b/newlib/libc/include/langinfo.h @@ -33,7 +33,7 @@ #include #include #if __POSIX_VISIBLE >= 200809 -#include +#include #endif typedef int nl_item; diff --git a/newlib/libc/include/locale.h b/newlib/libc/include/locale.h index 7feb881..8ba88a9 100644 --- a/newlib/libc/include/locale.h +++ b/newlib/libc/include/locale.h @@ -23,7 +23,7 @@ #if __POSIX_VISIBLE >= 200809 || defined (_COMPILING_NEWLIB) -#include +#include #define LC_ALL_MASK (1 << LC_ALL) #define LC_COLLATE_MASK (1 << LC_COLLATE) diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h index 7b62e00..9ee32ac 100644 --- a/newlib/libc/include/stdlib.h +++ b/newlib/libc/include/stdlib.h @@ -27,7 +27,7 @@ #endif #if __GNU_VISIBLE -#include +#include #endif _BEGIN_STD_C diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h index ba5e51e..4e0e151 100644 --- a/newlib/libc/include/string.h +++ b/newlib/libc/include/string.h @@ -17,7 +17,7 @@ #include #if __POSIX_VISIBLE >= 200809 -#include +#include #endif _BEGIN_STD_C diff --git a/newlib/libc/include/strings.h b/newlib/libc/include/strings.h index be01958..3331611 100644 --- a/newlib/libc/include/strings.h +++ b/newlib/libc/include/strings.h @@ -16,7 +16,7 @@ #include /* for size_t */ #if __POSIX_VISIBLE >= 200809 -#include +#include #endif _BEGIN_STD_C diff --git a/newlib/libc/include/sys/_locale.h b/newlib/libc/include/sys/_locale.h deleted file mode 100644 index ce6f995..0000000 --- a/newlib/libc/include/sys/_locale.h +++ /dev/null @@ -1,12 +0,0 @@ -/* Definition of opaque POSIX-1.2008 type locale_t for userspace. */ - -#ifndef _SYS__LOCALE_H -#define _SYS__LOCALE_H - -#include -#include - -struct __locale_t; -typedef struct __locale_t *locale_t; - -#endif /* _SYS__LOCALE_H */ diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h index ec67cb2..8806b98 100644 --- a/newlib/libc/include/time.h +++ b/newlib/libc/include/time.h @@ -29,7 +29,7 @@ #include #if __POSIX_VISIBLE >= 200809 -#include +#include #endif _BEGIN_STD_C diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h index 4766ca9..25ee9a8 100644 --- a/newlib/libc/include/wchar.h +++ b/newlib/libc/include/wchar.h @@ -64,7 +64,7 @@ typedef __gnuc_va_list va_list; #endif #if __POSIX_VISIBLE >= 200809 -#include +#include #endif _BEGIN_STD_C diff --git a/newlib/libc/include/wctype.h b/newlib/libc/include/wctype.h index d085374..3d36d5a 100644 --- a/newlib/libc/include/wctype.h +++ b/newlib/libc/include/wctype.h @@ -8,7 +8,7 @@ #include #if __POSIX_VISIBLE >= 200809 -#include +#include #endif #ifndef WEOF diff --git a/newlib/libc/include/xlocale.h b/newlib/libc/include/xlocale.h new file mode 100644 index 0000000..f955426 --- /dev/null +++ b/newlib/libc/include/xlocale.h @@ -0,0 +1,12 @@ +/* Definition of opaque POSIX-1.2008 type locale_t for userspace. */ + +#ifndef _XLOCALE_H +#define _XLOCALE_H + +#include +#include + +struct __locale_t; +typedef struct __locale_t *locale_t; + +#endif /* _XLOCALE_H */ diff --git a/winsup/cygwin/include/monetary.h b/winsup/cygwin/include/monetary.h index 1c3479b..82a6312 100644 --- a/winsup/cygwin/include/monetary.h +++ b/winsup/cygwin/include/monetary.h @@ -32,7 +32,7 @@ #include #include #if __POSIX_VISIBLE >= 200809 -#include +#include #endif __BEGIN_DECLS diff --git a/winsup/doc/new-features.xml b/winsup/doc/new-features.xml index 185c97e..324d99d 100644 --- a/winsup/doc/new-features.xml +++ b/winsup/doc/new-features.xml @@ -30,6 +30,11 @@ Pthread_cond_wait now acts like Linux and BSD: Resume waiting for the condition variable as if it was not interrupted, rather than returning 0. + +The internal <sys/_locale.h> header was renamed to <xlocale.h> for +source compatibility with other systems. + +