diff options
| author | dim <dim@FreeBSD.org> | 2014-02-25 07:40:37 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-02-25 07:40:37 +0000 |
| commit | b6b1de44bac83664c1e0c7328bbaf6a9916d1e81 (patch) | |
| tree | e70ea06f2cc047626d0114a399c6830d35427390 /lib/libc | |
| parent | 4d6ab5a180da9145c9f83969f100917669704d88 (diff) | |
| parent | 2dffd7c97edf7096030837706fb17e59b1b63cf4 (diff) | |
| download | FreeBSD-src-b6b1de44bac83664c1e0c7328bbaf6a9916d1e81.zip FreeBSD-src-b6b1de44bac83664c1e0c7328bbaf6a9916d1e81.tar.gz | |
Merge from head up to r262472.
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/iconv/citrus_prop.c | 5 | ||||
| -rw-r--r-- | lib/libc/iconv/citrus_prop.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/libc/iconv/citrus_prop.c b/lib/libc/iconv/citrus_prop.c index c2d4829..0e6d34a 100644 --- a/lib/libc/iconv/citrus_prop.c +++ b/lib/libc/iconv/citrus_prop.c @@ -339,7 +339,7 @@ name_found: static int _citrus_prop_parse_element(struct _memstream * __restrict ms, - const _citrus_prop_hint_t * __restrict hints, void ** __restrict context) + const _citrus_prop_hint_t * __restrict hints, void * __restrict context) { int ch, errnum; #define _CITRUS_PROP_HINT_NAME_LEN_MAX 255 @@ -435,8 +435,7 @@ _citrus_prop_parse_variable(const _citrus_prop_hint_t * __restrict hints, if (ch == EOF || ch == '\0') break; _memstream_ungetc(&ms, ch); - errnum = _citrus_prop_parse_element( - &ms, hints, (void ** __restrict)context); + errnum = _citrus_prop_parse_element(&ms, hints, context); if (errnum != 0) return (errnum); } diff --git a/lib/libc/iconv/citrus_prop.h b/lib/libc/iconv/citrus_prop.h index db087a4..2962154 100644 --- a/lib/libc/iconv/citrus_prop.h +++ b/lib/libc/iconv/citrus_prop.h @@ -42,7 +42,7 @@ typedef struct _citrus_prop_hint_t _citrus_prop_hint_t; #define _CITRUS_PROP_CB0_T(_func_, _type_) \ typedef int (*_citrus_prop_##_func_##_cb_func_t) \ - (void ** __restrict, const char *, _type_); \ + (void * __restrict, const char *, _type_); \ typedef struct { \ _citrus_prop_##_func_##_cb_func_t func; \ } _citrus_prop_##_func_##_cb_t; @@ -52,7 +52,7 @@ _CITRUS_PROP_CB0_T(str, const char *) #define _CITRUS_PROP_CB1_T(_func_, _type_) \ typedef int (*_citrus_prop_##_func_##_cb_func_t) \ - (void ** __restrict, const char *, _type_, _type_); \ + (void * __restrict, const char *, _type_, _type_); \ typedef struct { \ _citrus_prop_##_func_##_cb_func_t func; \ } _citrus_prop_##_func_##_cb_t; |
