From 29bcce7ce456a9fe098793784b97c7e2cd446aca Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 1 Jun 2012 11:16:15 -0700 Subject: Use i386 bits/wchar.h for i386 and x86-64 --- ChangeLog | 6 ++++++ sysdeps/unix/sysv/linux/i386/bits/wchar.h | 32 ------------------------------- sysdeps/unix/sysv/linux/x86/bits/wchar.h | 32 +++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 32 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/i386/bits/wchar.h create mode 100644 sysdeps/unix/sysv/linux/x86/bits/wchar.h diff --git a/ChangeLog b/ChangeLog index 009e75ed17..8cc25ef497 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-06-01 H.J. Lu + + [BZ #14117] + * sysdeps/unix/sysv/linux/i386/bits/wchar.h: Renamed to ... + * sysdeps/unix/sysv/linux/x86/bits/wchar.h: This. + 2012-06-01 Adhemerval Zanella * sysdeps/powerpc/fpu/k_cosf.c: Fix underflow generation. diff --git a/sysdeps/unix/sysv/linux/i386/bits/wchar.h b/sysdeps/unix/sysv/linux/i386/bits/wchar.h deleted file mode 100644 index ec0f34a476..0000000000 --- a/sysdeps/unix/sysv/linux/i386/bits/wchar.h +++ /dev/null @@ -1,32 +0,0 @@ -/* wchar_t type related definitions. i386/x86-64 version. - Copyright (C) 2000-2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _BITS_WCHAR_H -#define _BITS_WCHAR_H 1 - -#include - -#if __WORDSIZE == 64 -# define __WCHAR_MIN (-2147483647 - 1) -# define __WCHAR_MAX (2147483647) -#else -# define __WCHAR_MIN (-2147483647l - 1l) -# define __WCHAR_MAX (2147483647l) -#endif - -#endif /* bits/wchar.h */ diff --git a/sysdeps/unix/sysv/linux/x86/bits/wchar.h b/sysdeps/unix/sysv/linux/x86/bits/wchar.h new file mode 100644 index 0000000000..ec0f34a476 --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86/bits/wchar.h @@ -0,0 +1,32 @@ +/* wchar_t type related definitions. i386/x86-64 version. + Copyright (C) 2000-2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _BITS_WCHAR_H +#define _BITS_WCHAR_H 1 + +#include + +#if __WORDSIZE == 64 +# define __WCHAR_MIN (-2147483647 - 1) +# define __WCHAR_MAX (2147483647) +#else +# define __WCHAR_MIN (-2147483647l - 1l) +# define __WCHAR_MAX (2147483647l) +#endif + +#endif /* bits/wchar.h */ -- cgit v1.2.3