Move inline args out of user namespace.
Obtained from: 1.x
This commit is contained in:
parent
5a5755a556
commit
ead39f6e45
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=7654
@ -104,41 +104,41 @@ __END_DECLS
|
|||||||
|
|
||||||
#if defined(_USE_CTYPE_INLINE_)
|
#if defined(_USE_CTYPE_INLINE_)
|
||||||
static __inline int
|
static __inline int
|
||||||
__istype(_BSD_RUNE_T_ c, unsigned long f)
|
__istype(_BSD_RUNE_T_ __c, unsigned long __f)
|
||||||
{
|
{
|
||||||
if (c < 0)
|
if (__c < 0)
|
||||||
c = (unsigned char) c;
|
__c = (unsigned char) __c;
|
||||||
return((((c & _CRMASK) ? ___runetype(c) :
|
return((((__c & _CRMASK) ? ___runetype(__c) :
|
||||||
_CurrentRuneLocale->runetype[c]) & f) ? 1 : 0);
|
_CurrentRuneLocale->runetype[__c]) & __f) ? 1 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static __inline int
|
static __inline int
|
||||||
__isctype(_BSD_RUNE_T_ c, unsigned long f)
|
__isctype(_BSD_RUNE_T_ __c, unsigned long __f)
|
||||||
{
|
{
|
||||||
if (c < 0)
|
if (__c < 0)
|
||||||
c = (unsigned char) c;
|
__c = (unsigned char) __c;
|
||||||
return((((c & _CRMASK) ? 0 :
|
return((((__c & _CRMASK) ? 0 :
|
||||||
_DefaultRuneLocale.runetype[c]) & f) ? 1 : 0);
|
_DefaultRuneLocale.runetype[__c]) & __f) ? 1 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* _ANSI_LIBRARY is defined by lib/libc/gen/isctype.c. */
|
/* _ANSI_LIBRARY is defined by lib/libc/gen/isctype.c. */
|
||||||
#if !defined(_ANSI_LIBRARY)
|
#if !defined(_ANSI_LIBRARY)
|
||||||
static __inline _BSD_RUNE_T_
|
static __inline _BSD_RUNE_T_
|
||||||
toupper(_BSD_RUNE_T_ c)
|
toupper(_BSD_RUNE_T_ __c)
|
||||||
{
|
{
|
||||||
if (c < 0)
|
if (__c < 0)
|
||||||
c = (unsigned char) c;
|
__c = (unsigned char) __c;
|
||||||
return((c & _CRMASK) ?
|
return((__c & _CRMASK) ?
|
||||||
___toupper(c) : _CurrentRuneLocale->mapupper[c]);
|
___toupper(__c) : _CurrentRuneLocale->mapupper[__c]);
|
||||||
}
|
}
|
||||||
|
|
||||||
static __inline _BSD_RUNE_T_
|
static __inline _BSD_RUNE_T_
|
||||||
tolower(_BSD_RUNE_T_ c)
|
tolower(_BSD_RUNE_T_ __c)
|
||||||
{
|
{
|
||||||
if (c < 0)
|
if (__c < 0)
|
||||||
c = (unsigned char) c;
|
__c = (unsigned char) __c;
|
||||||
return((c & _CRMASK) ?
|
return((__c & _CRMASK) ?
|
||||||
___tolower(c) : _CurrentRuneLocale->maplower[c]);
|
___tolower(__c) : _CurrentRuneLocale->maplower[__c]);
|
||||||
}
|
}
|
||||||
#endif /* !_ANSI_LIBRARY */
|
#endif /* !_ANSI_LIBRARY */
|
||||||
|
|
||||||
|
@ -104,41 +104,41 @@ __END_DECLS
|
|||||||
|
|
||||||
#if defined(_USE_CTYPE_INLINE_)
|
#if defined(_USE_CTYPE_INLINE_)
|
||||||
static __inline int
|
static __inline int
|
||||||
__istype(_BSD_RUNE_T_ c, unsigned long f)
|
__istype(_BSD_RUNE_T_ __c, unsigned long __f)
|
||||||
{
|
{
|
||||||
if (c < 0)
|
if (__c < 0)
|
||||||
c = (unsigned char) c;
|
__c = (unsigned char) __c;
|
||||||
return((((c & _CRMASK) ? ___runetype(c) :
|
return((((__c & _CRMASK) ? ___runetype(__c) :
|
||||||
_CurrentRuneLocale->runetype[c]) & f) ? 1 : 0);
|
_CurrentRuneLocale->runetype[__c]) & __f) ? 1 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static __inline int
|
static __inline int
|
||||||
__isctype(_BSD_RUNE_T_ c, unsigned long f)
|
__isctype(_BSD_RUNE_T_ __c, unsigned long __f)
|
||||||
{
|
{
|
||||||
if (c < 0)
|
if (__c < 0)
|
||||||
c = (unsigned char) c;
|
__c = (unsigned char) __c;
|
||||||
return((((c & _CRMASK) ? 0 :
|
return((((__c & _CRMASK) ? 0 :
|
||||||
_DefaultRuneLocale.runetype[c]) & f) ? 1 : 0);
|
_DefaultRuneLocale.runetype[__c]) & __f) ? 1 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* _ANSI_LIBRARY is defined by lib/libc/gen/isctype.c. */
|
/* _ANSI_LIBRARY is defined by lib/libc/gen/isctype.c. */
|
||||||
#if !defined(_ANSI_LIBRARY)
|
#if !defined(_ANSI_LIBRARY)
|
||||||
static __inline _BSD_RUNE_T_
|
static __inline _BSD_RUNE_T_
|
||||||
toupper(_BSD_RUNE_T_ c)
|
toupper(_BSD_RUNE_T_ __c)
|
||||||
{
|
{
|
||||||
if (c < 0)
|
if (__c < 0)
|
||||||
c = (unsigned char) c;
|
__c = (unsigned char) __c;
|
||||||
return((c & _CRMASK) ?
|
return((__c & _CRMASK) ?
|
||||||
___toupper(c) : _CurrentRuneLocale->mapupper[c]);
|
___toupper(__c) : _CurrentRuneLocale->mapupper[__c]);
|
||||||
}
|
}
|
||||||
|
|
||||||
static __inline _BSD_RUNE_T_
|
static __inline _BSD_RUNE_T_
|
||||||
tolower(_BSD_RUNE_T_ c)
|
tolower(_BSD_RUNE_T_ __c)
|
||||||
{
|
{
|
||||||
if (c < 0)
|
if (__c < 0)
|
||||||
c = (unsigned char) c;
|
__c = (unsigned char) __c;
|
||||||
return((c & _CRMASK) ?
|
return((__c & _CRMASK) ?
|
||||||
___tolower(c) : _CurrentRuneLocale->maplower[c]);
|
___tolower(__c) : _CurrentRuneLocale->maplower[__c]);
|
||||||
}
|
}
|
||||||
#endif /* !_ANSI_LIBRARY */
|
#endif /* !_ANSI_LIBRARY */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user