Skip to contentSkip to conversation

package/uclibc: restore __isctype_l definition

PATCH New Max Filippov 3 participants 3 messages Feb 9, 2020 – Mar 10, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/uclibc: restore __isctype_l definition

Recent is*_l fix broke uclibc build because removed __isctype_l definition was used in libc/misc/ctype/ctype.c. Restore it.

Fixes 8723c5e7a6db ("package/uclibc: fix ctype.h is*_l definitions")
---
 .../0001-include-ctype.h-drop-is-_l-macro-definitions.patch   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch +2 -2
index 5557a9c1e730..41c9d3d2bd81 100644
@@ -20,7 +20,7 @@ diff --git a/include/ctype.h b/include/ctype.h
 index ecd5e730886a..e934cf3321a6 100644
 --- a/include/ctype.h
 +++ b/include/ctype.h
-@@ -350,46 +350,13 @@ libc_hidden_proto(tolower_l)
+@@ -350,46 +350,14 @@ libc_hidden_proto(tolower_l)
  /* Return the uppercase version of C.  */
  extern int toupper_l (int __c, __locale_t __l) __THROW;
  
@@ -30,7 +30,7 @@ index ecd5e730886a..e934cf3321a6 100644
 -# endif	/* Optimizing gcc */
 -
 -
--# define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type)
+ # define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type)
  # ifndef __NO_CTYPE
 -#  define __isalnum_l(c,l)	__isctype_l((c), _ISalnum, (l))
 -#  define __isalpha_l(c,l)	__isctype_l((c), _ISalpha, (l))
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/uclibc: restore __isctype_l definition

Max, All,

On 2020-02-09 12:09 -0800, Max Filippov spake thusly:

Quoted 5 lines

Recent is*_l fix broke uclibc build because removed __isctype_l definition was used in libc/misc/ctype/ctype.c. Restore it.

Fixes 8723c5e7a6db ("package/uclibc: fix ctype.h is*_l definitions")

Thanks for the quick fix! :-)

I've applied to master, with the folowing changes:

- add new patch, don't fix existing one
- add URL to upstream ML post

Regards,
Yann E. MORIN.

Quoted 29 lines
---
 .../0001-include-ctype.h-drop-is-_l-macro-definitions.patch   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch +2 -2
index 5557a9c1e730..41c9d3d2bd81 100644
@@ -20,7 +20,7 @@ diff --git a/include/ctype.h b/include/ctype.h
 index ecd5e730886a..e934cf3321a6 100644
 --- a/include/ctype.h
 +++ b/include/ctype.h
-@@ -350,46 +350,13 @@ libc_hidden_proto(tolower_l)
+@@ -350,46 +350,14 @@ libc_hidden_proto(tolower_l)
  /* Return the uppercase version of C.  */
  extern int toupper_l (int __c, __locale_t __l) __THROW;
 
@@ -30,7 +30,7 @@ index ecd5e730886a..e934cf3321a6 100644
 -# endif	/* Optimizing gcc */
 -
 -
--# define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type)
+ # define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type)
  # ifndef __NO_CTYPE
 -#  define __isalnum_l(c,l)	__isctype_l((c), _ISalnum, (l))
 -#  define __isalpha_l(c,l)	__isctype_l((c), _ISalpha, (l))
Signature · 1 line
2.20.1
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/uclibc: restore __isctype_l definition

In reply to Max Filippov
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Max" == Max Filippov <[email protected]> writes:

Recent is*_l fix broke uclibc build because removed __isctype_l definition was used in libc/misc/ctype/ctype.c. Restore it.

Fixes 8723c5e7a6db ("package/uclibc: fix ctype.h is*_l definitions")

Committed to 2019.11.x, thanks.

Quoted 28 lines
---
 .../0001-include-ctype.h-drop-is-_l-macro-definitions.patch   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/uclibc/0001-include-ctype.h-drop-is-_l-macro-definitions.patch +2 -2
index 5557a9c1e730..41c9d3d2bd81 100644
@@ -20,7 +20,7 @@ diff --git a/include/ctype.h b/include/ctype.h
 index ecd5e730886a..e934cf3321a6 100644
 --- a/include/ctype.h
 +++ b/include/ctype.h
-@@ -350,46 +350,13 @@ libc_hidden_proto(tolower_l)
+@@ -350,46 +350,14 @@ libc_hidden_proto(tolower_l)
  /* Return the uppercase version of C.  */
  extern int toupper_l (int __c, __locale_t __l) __THROW;
 
@@ -30,7 +30,7 @@ index ecd5e730886a..e934cf3321a6 100644
 -# endif	/* Optimizing gcc */
 -
 -
--# define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type)
+ # define __isctype_l(c, type, locale) ((locale)->__ctype_b[(int) (c)] & (__ctype_mask_t) type)
  # ifndef __NO_CTYPE
 -#  define __isalnum_l(c,l)	__isctype_l((c), _ISalnum, (l))
 -#  define __isalpha_l(c,l)	__isctype_l((c), _ISalpha, (l))
Signature · 1 line
2.20.1
Signature · 1 line
Bye, Peter Korsgaard