From: drepper Date: Mon, 6 Oct 1997 02:26:46 +0000 (+0000) Subject: Pretty print. X-Git-Tag: libc-ud-971011~121 X-Git-Url: http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu%2Fglibc.git;a=commitdiff_plain;h=990867d1fb90deba2fdcd6bf7e7989f325b4b6e0 Pretty print. --- diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h index 8d152566fc..c7ab509448 100644 --- a/wcsmbs/wchar.h +++ b/wcsmbs/wchar.h @@ -43,7 +43,7 @@ __BEGIN_DECLS hold any value corresponding to members of the extended character set, as well as at least one value that does not correspond to any member of the extended character set. */ -#define _WINT_T +# define _WINT_T typedef unsigned int wint_t; #endif @@ -212,7 +212,7 @@ extern size_t __mbrlen __P ((__const char *__restrict __s, size_t __n, extern size_t mbrlen __P ((__const char *__restrict __s, size_t __n, mbstate_t *__restrict __ps)); -#if defined (__OPTIMIZE__) \ +#if defined __OPTIMIZE__ \ && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)) /* Define inline function as optimization. */ extern __inline size_t mbrlen (__const char *__restrict __s, size_t __n, @@ -410,7 +410,7 @@ extern unsigned long long int __wcstoull_internal __P ((__const wchar_t * #endif /* GCC and use GNU. */ -#if defined (__OPTIMIZE__) && __GNUC__ >= 2 +#if defined __OPTIMIZE__ && __GNUC__ >= 2 /* Define inline functions which call the internal entry points. */ extern __inline double wcstod (__const wchar_t *__restrict __nptr, @@ -424,7 +424,7 @@ extern __inline unsigned long int wcstoul (__const wchar_t *__restrict __nptr, int __base) { return __wcstoul_internal (__nptr, __endptr, __base, 0); } -#ifdef __USE_GNU +# ifdef __USE_GNU extern __inline float wcstof (__const wchar_t *__restrict __nptr, wchar_t **__restrict __endptr) { return __wcstof_internal (__nptr, __endptr, 0); } @@ -442,7 +442,7 @@ extern __inline unsigned long long int wcstouq (__const wchar_t * wchar_t **__restrict __endptr, int __base) { return __wcstoull_internal (__nptr, __endptr, __base, 0); } -#endif /* Use GNU. */ +# endif /* Use GNU. */ #endif /* Optimizing GCC >=2. */ diff --git a/wctype/wctype.h b/wctype/wctype.h index 1862c6ca8f..91a1678192 100644 --- a/wctype/wctype.h +++ b/wctype/wctype.h @@ -38,7 +38,7 @@ __BEGIN_DECLS hold any value corresponding to members of the extended character set, as well as at least one value that does not correspond to any member of the extended character set. */ -#define _WINT_T +# define _WINT_T typedef unsigned int wint_t; #endif @@ -53,7 +53,7 @@ typedef unsigned long int wctype_t; /* Constant expression of type `wint_t' whose value does not correspond to any member of the extended character set. */ #ifndef WEOF -#define WEOF (0xffffffffu) +# define WEOF (0xffffffffu) #endif #ifndef _ISbit @@ -65,12 +65,12 @@ typedef unsigned long int wctype_t; endian). We define the bit value interpretations here dependent on the machine's byte order. */ -#include -#if __BYTE_ORDER == __BIG_ENDIAN -#define _ISbit(bit) (1 << bit) -#else /* __BYTE_ORDER == __LITTLE_ENDIAN */ -#define _ISbit(bit) (bit < 8 ? ((1 << bit) << 8) : ((1 << bit) >> 8)) -#endif +# include +# if __BYTE_ORDER == __BIG_ENDIAN +# define _ISbit(bit) (1 << bit) +# else /* __BYTE_ORDER == __LITTLE_ENDIAN */ +# define _ISbit(bit) (bit < 8 ? ((1 << bit) << 8) : ((1 << bit) >> 8)) +# endif enum { @@ -181,28 +181,28 @@ extern wint_t towctrans __P ((wint_t __wc, wctrans_t __desc)); #ifndef __NO_WCTYPE -#define iswalnum(wc) __iswctype ((wc), _ISalnum) -#define iswalpha(wc) __iswctype ((wc), _ISalpha) -#define iswcntrl(wc) __iswctype ((wc), _IScntrl) -#define iswdigit(wc) __iswctype ((wc), _ISdigit) -#define iswlower(wc) __iswctype ((wc), _ISlower) -#define iswgraph(wc) __iswctype ((wc), _ISgraph) -#define iswprint(wc) __iswctype ((wc), _ISprint) -#define iswpunct(wc) __iswctype ((wc), _ISpunct) -#define iswspace(wc) __iswctype ((wc), _ISspace) -#define iswupper(wc) __iswctype ((wc), _ISupper) -#define iswxdigit(wc) __iswctype ((wc), _ISxdigit) - -#ifdef __USE_GNU -#define iswblank(wc) __iswctype ((wc), _ISblank) -#endif +# define iswalnum(wc) __iswctype ((wc), _ISalnum) +# define iswalpha(wc) __iswctype ((wc), _ISalpha) +# define iswcntrl(wc) __iswctype ((wc), _IScntrl) +# define iswdigit(wc) __iswctype ((wc), _ISdigit) +# define iswlower(wc) __iswctype ((wc), _ISlower) +# define iswgraph(wc) __iswctype ((wc), _ISgraph) +# define iswprint(wc) __iswctype ((wc), _ISprint) +# define iswpunct(wc) __iswctype ((wc), _ISpunct) +# define iswspace(wc) __iswctype ((wc), _ISspace) +# define iswupper(wc) __iswctype ((wc), _ISupper) +# define iswxdigit(wc) __iswctype ((wc), _ISxdigit) + +# ifdef __USE_GNU +# define iswblank(wc) __iswctype ((wc), _ISblank) +# endif /* Pointer to conversion tables. */ extern __const __int32_t *__ctype_tolower; /* Case conversions. */ extern __const __int32_t *__ctype_toupper; /* Case conversions. */ -#define towlower(wc) towctrans ((wc), __ctype_tolower) -#define towupper(wc) towctrans ((wc), __ctype_toupper) +# define towlower(wc) towctrans ((wc), __ctype_tolower) +# define towupper(wc) towctrans ((wc), __ctype_toupper) #endif /* Not __NO_WCTYPE. */ @@ -281,27 +281,27 @@ extern wint_t __towctrans_l __P ((wint_t __wc, wctrans_t __desc, __locale_t locale)); -#ifndef __NO_WCTYPE -#define __iswalnum_l(wc, loc) __iswctype_l ((wc), _ISalnum, (loc)) -#define __iswalpha_l(wc, loc) __iswctype_l ((wc), _ISalpha, (loc)) -#define __iswcntrl_l(wc, loc) __iswctype_l ((wc), _IScntrl, (loc)) -#define __iswdigit_l(wc, loc) __iswctype_l ((wc), _ISdigit, (loc)) -#define __iswlower_l(wc, loc) __iswctype_l ((wc), _ISlower, (loc)) -#define __iswgraph_l(wc, loc) __iswctype_l ((wc), _ISgraph, (loc)) -#define __iswprint_l(wc, loc) __iswctype_l ((wc), _ISprint, (loc)) -#define __iswpunct_l(wc, loc) __iswctype_l ((wc), _ISpunct, (loc)) -#define __iswspace_l(wc, loc) __iswctype_l ((wc), _ISspace, (loc)) -#define __iswupper_l(wc, loc) __iswctype_l ((wc), _ISupper, (loc)) -#define __iswxdigit_l(wc, loc) __iswctype_l ((wc), _ISxdigit, (loc)) - -#define __iswblank_l(wc, loc) __iswctype_l ((wc), _ISblank, (loc)) - -#define __towlower_l(wc, loc) __towctrans_l ((wc), (loc)->__ctype_tolower, \ - (loc)) -#define __towupper_l(wc, loc) __towctrans_l ((wc), (loc)->__ctype_toupper, \ - (loc)) +# ifndef __NO_WCTYPE +# define __iswalnum_l(wc, loc) __iswctype_l ((wc), _ISalnum, (loc)) +# define __iswalpha_l(wc, loc) __iswctype_l ((wc), _ISalpha, (loc)) +# define __iswcntrl_l(wc, loc) __iswctype_l ((wc), _IScntrl, (loc)) +# define __iswdigit_l(wc, loc) __iswctype_l ((wc), _ISdigit, (loc)) +# define __iswlower_l(wc, loc) __iswctype_l ((wc), _ISlower, (loc)) +# define __iswgraph_l(wc, loc) __iswctype_l ((wc), _ISgraph, (loc)) +# define __iswprint_l(wc, loc) __iswctype_l ((wc), _ISprint, (loc)) +# define __iswpunct_l(wc, loc) __iswctype_l ((wc), _ISpunct, (loc)) +# define __iswspace_l(wc, loc) __iswctype_l ((wc), _ISspace, (loc)) +# define __iswupper_l(wc, loc) __iswctype_l ((wc), _ISupper, (loc)) +# define __iswxdigit_l(wc, loc) __iswctype_l ((wc), _ISxdigit, (loc)) -#endif /* Not __NO_WCTYPE. */ +# define __iswblank_l(wc, loc) __iswctype_l ((wc), _ISblank, (loc)) + +# define __towlower_l(wc, loc) __towctrans_l ((wc), (loc)->__ctype_tolower, \ + (loc)) +# define __towupper_l(wc, loc) __towctrans_l ((wc), (loc)->__ctype_toupper, \ + (loc)) + +# endif /* Not __NO_WCTYPE. */ #endif /* Use GNU. */