Fix float128 uses of xlocale.h [committed]

Message ID alpine.DEB.2.20.1706222235070.18518@digraph.polyomino.org.uk
State Committed
Headers

Commit Message

Joseph Myers June 22, 2017, 10:35 p.m. UTC
  Three float128 files still include xlocale.h after it was removed.  I
don't know why this didn't cause problems for powerpc64le float128
testing; it did cause problems for my x86_64 float128 testing.  This
patch changes the includes to use bits/types/locale_t.h.

Tested for x86_64 (in conjunction with float128 patches).  Committed.

2017-06-22  Joseph Myers  <joseph@codesourcery.com>

	* sysdeps/ieee754/float128/strtof128_l.c: Include
	<bits/types/locale_t.h> instead of <xlocale.h>.
	* sysdeps/ieee754/float128/wcstof128.c: Likewise.
	* sysdeps/ieee754/float128/wcstof128_l.c: Likewise.
  

Comments

Gabriel F T Gomes June 23, 2017, 1 p.m. UTC | #1
On Thu, 22 Jun 2017 22:35:25 +0000
Joseph Myers <joseph@codesourcery.com> wrote:

> Three float128 files still include xlocale.h after it was removed.  I
> don't know why this didn't cause problems for powerpc64le float128
> testing; it did cause problems for my x86_64 float128 testing.  This
> patch changes the includes to use bits/types/locale_t.h.

It caused problems for powerpc64le testing, indeed.  But, my rebasing was
a little outdated.  Thanks for doing this.
  
Zack Weinberg June 23, 2017, 2:31 p.m. UTC | #2
On Fri, Jun 23, 2017 at 9:00 AM, Gabriel F. T. Gomes
<gftg@linux.vnet.ibm.com> wrote:
> On Thu, 22 Jun 2017 22:35:25 +0000
> Joseph Myers <joseph@codesourcery.com> wrote:
>
>> Three float128 files still include xlocale.h after it was removed.  I
>> don't know why this didn't cause problems for powerpc64le float128
>> testing; it did cause problems for my x86_64 float128 testing.  This
>> patch changes the includes to use bits/types/locale_t.h.
>
> It caused problems for powerpc64le testing, indeed.  But, my rebasing was
> a little outdated.  Thanks for doing this.

It's not a big deal, but .c files should probably be using <locale.h>
instead (on the usual "don't directly include bits headers without a
compelling reason" principles).

zw
  

Patch

diff --git a/sysdeps/ieee754/float128/strtof128_l.c b/sysdeps/ieee754/float128/strtof128_l.c
index d3d55ea..a541d60 100644
--- a/sysdeps/ieee754/float128/strtof128_l.c
+++ b/sysdeps/ieee754/float128/strtof128_l.c
@@ -16,7 +16,7 @@ 
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#include <xlocale.h>
+#include <bits/types/locale_t.h>
 
 /* Bring in potential typedef for _Float128 early for declaration below.  */
 #include <bits/floatn.h>
diff --git a/sysdeps/ieee754/float128/wcstof128.c b/sysdeps/ieee754/float128/wcstof128.c
index 1d6326d..49aa4d6 100644
--- a/sysdeps/ieee754/float128/wcstof128.c
+++ b/sysdeps/ieee754/float128/wcstof128.c
@@ -17,7 +17,7 @@ 
    <http://www.gnu.org/licenses/>.  */
 
 #include <stddef.h>
-#include <xlocale.h>
+#include <bits/types/locale_t.h>
 
 #define	USE_WIDE_CHAR	1
 
diff --git a/sysdeps/ieee754/float128/wcstof128_l.c b/sysdeps/ieee754/float128/wcstof128_l.c
index 2df7184..b295087 100644
--- a/sysdeps/ieee754/float128/wcstof128_l.c
+++ b/sysdeps/ieee754/float128/wcstof128_l.c
@@ -17,7 +17,7 @@ 
    <http://www.gnu.org/licenses/>.  */
 
 #include <stddef.h>
-#include <xlocale.h>
+#include <bits/types/locale_t.h>
 
 
 #define	USE_WIDE_CHAR	1