37c37
< * $FreeBSD: head/include/runetype.h 102998 2002-09-06 04:22:54Z mike $
---
> * $FreeBSD: head/include/runetype.h 130961 2004-06-23 07:01:44Z tjr $
53,56c53,56
< __rune_t min; /* First rune of the range */
< __rune_t max; /* Last rune (inclusive) of the range */
< __rune_t map; /* What first maps to in maps */
< unsigned long *types; /* Array of types in range */
---
> __rune_t __min; /* First rune of the range */
> __rune_t __max; /* Last rune (inclusive) of the range */
> __rune_t __map; /* What first maps to in maps */
> unsigned long *__types; /* Array of types in range */
60,61c60,61
< int nranges; /* Number of ranges stored */
< _RuneEntry *ranges; /* Pointer to the ranges */
---
> int __nranges; /* Number of ranges stored */
> _RuneEntry *__ranges; /* Pointer to the ranges */
65,66c65,66
< char magic[8]; /* Magic saying what version we are */
< char encoding[32]; /* ASCII name of this encoding */
---
> char __magic[8]; /* Magic saying what version we are */
> char __encoding[32]; /* ASCII name of this encoding */
68,70c68,70
< __rune_t (*sgetrune)(const char *, __size_t, char const **);
< int (*sputrune)(__rune_t, char *, __size_t, char **);
< __rune_t invalid_rune;
---
> __rune_t (*__sgetrune)(const char *, __size_t, char const **);
> int (*__sputrune)(__rune_t, char *, __size_t, char **);
> __rune_t __invalid_rune;
72,74c72,74
< unsigned long runetype[_CACHED_RUNES];
< __rune_t maplower[_CACHED_RUNES];
< __rune_t mapupper[_CACHED_RUNES];
---
> unsigned long __runetype[_CACHED_RUNES];
> __rune_t __maplower[_CACHED_RUNES];
> __rune_t __mapupper[_CACHED_RUNES];
81,83c81,83
< _RuneRange runetype_ext;
< _RuneRange maplower_ext;
< _RuneRange mapupper_ext;
---
> _RuneRange __runetype_ext;
> _RuneRange __maplower_ext;
> _RuneRange __mapupper_ext;
85,86c85,86
< void *variable; /* Data which depends on the encoding */
< int variable_len; /* how long that data is */
---
> void *__variable; /* Data which depends on the encoding */
> int __variable_len; /* how long that data is */