Patchwork readline: rlmbutil.h: Declare wcwidth() when HANDLE_MULTIBYTE enabled.

login
register
mail settings
Submitter Andreas Schwab
Date April 19, 2015, 3:44 p.m.
Message ID <87a8y4ktr7.fsf@igel.home>
Download mbox | patch
Permalink /patch/6323/
State New
Headers show

Comments

Andreas Schwab - April 19, 2015, 3:44 p.m.
Chen Gang <xili_gchen_5257@hotmail.com> writes:

> On fedora 20 x86_64, it has wcwidth() in libc.so.6, but does not declare
> it if __USE_XOPEN disabled. readline uses libc library, but does not use
> XOPEN,

It does, but config.h.in fails to provide the necessary template.

Andreas.

	* readline/config.h.in: Add missing templates.
---
 readline/config.h.in | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)
Chen Gang - April 19, 2015, 6:47 p.m.
On 4/19/15 23:44, Andreas Schwab wrote:
> Chen Gang <xili_gchen_5257@hotmail.com> writes:
> 
>> On fedora 20 x86_64, it has wcwidth() in libc.so.6, but does not declare
>> it if __USE_XOPEN disabled. readline uses libc library, but does not use
>> XOPEN,
> 
> It does, but config.h.in fails to provide the necessary template.
> 
> Andreas.
> 
> 	* readline/config.h.in: Add missing templates.

OK, thanks. It sounds reasonable to me (in this case, it is about
_GNU_SOURCE).

> ---
>  readline/config.h.in | 23 +++++++++++++++++++++--
>  1 file changed, 21 insertions(+), 2 deletions(-)
> 
> diff --git a/readline/config.h.in b/readline/config.h.in
> index 8560c4b..f50956e 100644
> --- a/readline/config.h.in
> +++ b/readline/config.h.in
> @@ -6,6 +6,14 @@
>  
>  #undef _FILE_OFFSET_BITS
>  
> +#undef __EXTENSIONS__
> +#undef _ALL_SOURCE
> +#undef _GNU_SOURCE
> +#undef _POSIX_SOURCE
> +#undef _POSIX_1_SOURCE
> +#undef _POSIX_PTHREAD_SEMANTICS
> +#undef _TANDEM_SOURCE
> +
>  /* Define if on MINIX.  */
>  #undef _MINIX
>  
> @@ -27,6 +35,8 @@
>  
>  #undef PROTOTYPES
>  
> +#undef __PROTOTYPES
> +
>  #undef __CHAR_UNSIGNED__
>  
>  /* Define if the `S_IS*' macros in <sys/stat.h> do not work properly.  */
> @@ -71,6 +81,12 @@
>  /* Define if you have the mbrtowc function. */
>  #undef HAVE_MBRTOWC
>  
> +/* Define if you have the mbscmp function. */
> +#undef HAVE_MBSCMP
> +
> +/* Define if you have the mbsnrtowcs function. */
> +#undef HAVE_MBSNRTOWCS
> +
>  /* Define if you have the mbsrtowcs function. */
>  #undef HAVE_MBSRTOWCS
>  
> @@ -118,6 +134,9 @@
>  /* Define if you have the wcscoll function.  */
>  #undef HAVE_WCSCOLL
>  
> +/* Define if you have the wcsdup function.  */
> +#undef HAVE_WCSDUP
> +
>  /* Define if you have the wctype function.  */
>  #undef HAVE_WCTYPE
>  
> @@ -235,9 +254,9 @@
>  
>  #undef HAVE_GETPW_DECLS
>  
> -#undef STRUCT_DIRENT_HAS_D_INO
> +#undef HAVE_STRUCT_DIRENT_D_INO
>  
> -#undef STRUCT_DIRENT_HAS_D_FILENO
> +#undef HAVE_STRUCT_DIRENT_D_FILENO
>  
>  #undef HAVE_BSD_SIGNALS
>  
>

Patch

diff --git a/readline/config.h.in b/readline/config.h.in
index 8560c4b..f50956e 100644
--- a/readline/config.h.in
+++ b/readline/config.h.in
@@ -6,6 +6,14 @@ 
 
 #undef _FILE_OFFSET_BITS
 
+#undef __EXTENSIONS__
+#undef _ALL_SOURCE
+#undef _GNU_SOURCE
+#undef _POSIX_SOURCE
+#undef _POSIX_1_SOURCE
+#undef _POSIX_PTHREAD_SEMANTICS
+#undef _TANDEM_SOURCE
+
 /* Define if on MINIX.  */
 #undef _MINIX
 
@@ -27,6 +35,8 @@ 
 
 #undef PROTOTYPES
 
+#undef __PROTOTYPES
+
 #undef __CHAR_UNSIGNED__
 
 /* Define if the `S_IS*' macros in <sys/stat.h> do not work properly.  */
@@ -71,6 +81,12 @@ 
 /* Define if you have the mbrtowc function. */
 #undef HAVE_MBRTOWC
 
+/* Define if you have the mbscmp function. */
+#undef HAVE_MBSCMP
+
+/* Define if you have the mbsnrtowcs function. */
+#undef HAVE_MBSNRTOWCS
+
 /* Define if you have the mbsrtowcs function. */
 #undef HAVE_MBSRTOWCS
 
@@ -118,6 +134,9 @@ 
 /* Define if you have the wcscoll function.  */
 #undef HAVE_WCSCOLL
 
+/* Define if you have the wcsdup function.  */
+#undef HAVE_WCSDUP
+
 /* Define if you have the wctype function.  */
 #undef HAVE_WCTYPE
 
@@ -235,9 +254,9 @@ 
 
 #undef HAVE_GETPW_DECLS
 
-#undef STRUCT_DIRENT_HAS_D_INO
+#undef HAVE_STRUCT_DIRENT_D_INO
 
-#undef STRUCT_DIRENT_HAS_D_FILENO
+#undef HAVE_STRUCT_DIRENT_D_FILENO
 
 #undef HAVE_BSD_SIGNALS