generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am d4ae59dc: Merge "Reserve space in mbstate to allow for proper wchar support"

Browse Source 
* commit 'd4ae59dcf228cf602189c6d5e69fb65640b353e3':
  Reserve space in mbstate to allow for proper wchar support
This commit is contained in:
Calin Juravle 2014-04-30 15:12:52 +00:00 committed by Android Git Automerger
commit fb15c73f3c
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/include/limits.h
View File

@ -112,7 +112,7 @@
#define SSIZE_MAX LONG_MAX #define SSIZE_MAX LONG_MAX
#define MB_LEN_MAX 1 /* No multibyte characters. */ #define MB_LEN_MAX 6
/* New code should use sysconf(_SC_PAGE_SIZE) instead. */ /* New code should use sysconf(_SC_PAGE_SIZE) instead. */
#ifndef PAGE_SIZE #ifndef PAGE_SIZE

11
libc/include/wchar.h
View File

@ -39,8 +39,15 @@
__BEGIN_DECLS __BEGIN_DECLS
typedef __WINT_TYPE__ wint_t; typedef __WINT_TYPE__ wint_t;
typedef struct { int dummy; } mbstate_t; typedef struct {
#ifdef __LP32__
int dummy;
#else
// 8 bytes should be enough to support at least UTF-8
char __reserved[8];
#endif
} mbstate_t;
typedef enum { typedef enum {
WC_TYPE_INVALID = 0, WC_TYPE_INVALID = 0,