diff options
| author | Garrett D'Amore <garrett@nexenta.com> | 2010-07-30 07:06:32 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@nexenta.com> | 2010-07-30 07:06:32 -0700 |
| commit | 4297a3b0d0a35d80f86fff155e288e885a100e6d (patch) | |
| tree | bba873e6335d31404bbac128ffa6ebe126b43900 /usr/src/lib/libc/inc | |
| parent | 969bc941052c29943dfb40d55089dc56fa46be57 (diff) | |
| download | illumos-joyent-4297a3b0d0a35d80f86fff155e288e885a100e6d.tar.gz | |
2 We need a fully open libc (no libc_i18n)
Reviewd by: garrett@nexenta.com
Approved by: garrett@nexenta.com
Diffstat (limited to 'usr/src/lib/libc/inc')
| -rw-r--r-- | usr/src/lib/libc/inc/mbstatet.h | 19 | ||||
| -rw-r--r-- | usr/src/lib/libc/inc/mse.h | 35 |
2 files changed, 17 insertions, 37 deletions
diff --git a/usr/src/lib/libc/inc/mbstatet.h b/usr/src/lib/libc/inc/mbstatet.h index c27bd0125b..baacffc00e 100644 --- a/usr/src/lib/libc/inc/mbstatet.h +++ b/usr/src/lib/libc/inc/mbstatet.h @@ -24,17 +24,22 @@ * Use is subject to license terms. */ +/* + * Copyright 2010 Nexenta Systems, Inc. All rights reserved. + * Use is subject to license terms. + */ #ifndef _MBSTATET_H #define _MBSTATET_H -#pragma ident "%Z%%M% %I% %E% SMI" - +/* + * This structure is totally opaque. The value mirrors wchar_impl.h. + */ typedef struct __mbstate_t { - void *__lc_locale; /* pointer to _LC_locale_t */ - void *__state; /* currently unused state flag */ - char __consumed[8]; /* 8 bytes */ - char __nconsumed; - char __fill[7]; +#if defined(_LP64) + long __filler[4]; +#else + int __filler[6]; +#endif } __mbstate_t; #endif /* _MBSTATET_H */ diff --git a/usr/src/lib/libc/inc/mse.h b/usr/src/lib/libc/inc/mse.h index 7644c200dc..836407dce1 100644 --- a/usr/src/lib/libc/inc/mse.h +++ b/usr/src/lib/libc/inc/mse.h @@ -23,12 +23,15 @@ * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ +/* + * Copyright 2010 Nexenta Systems, Inc. All rights reserved. + * Use is subject to license terms. + */ #ifndef _MSE_H #define _MSE_H -#pragma ident "%Z%%M% %I% %E% SMI" - +#include "lint.h" #include <stdio.h> #include <wchar.h> #include <string.h> @@ -89,38 +92,10 @@ extern void _setorientation(FILE *, _IOP_orientation_t); * otherwise alter the orientation of a stream. */ -/* - * libc_i18n provides the following functions: - */ -extern int _set_orientation_wide(FILE *, void **, void (*(*))(void), int); -extern void *__mbst_get_lc_and_fp(const mbstate_t *, - void (*(*))(void), int); -/* - * Above two functions take either FP_WCTOMB or FP_FGETWC for the integer - * argument. - */ -#define FP_WCTOMB 0 -#define FP_FGETWC 1 - #define _SET_ORIENTATION_BYTE(iop) \ { \ if (GET_NO_MODE(iop)) \ _setorientation(iop, _BYTE_MODE); \ } -/* The following is specified in the argument of _get_internal_mbstate() */ -#define _MBRLEN 0 -#define _MBRTOWC 1 -#define _WCRTOMB 2 -#define _MBSRTOWCS 3 -#define _WCSRTOMBS 4 -#define _MAX_MB_FUNC _WCSRTOMBS - -extern void _clear_internal_mbstate(void); -extern mbstate_t *_get_internal_mbstate(int); - -#define MBSTATE_INITIAL(ps) MBSTATE_RESTART(ps) -#define MBSTATE_RESTART(ps) \ - (void) memset((void *)ps, 0, sizeof (mbstate_t)) - #endif /* _MSE_H */ |