diff options
Diffstat (limited to 'newlib/libc/stdlib')
67 files changed, 309 insertions, 309 deletions
diff --git a/newlib/libc/stdlib/__adjust.c b/newlib/libc/stdlib/__adjust.c index d5c7075..7627cc7 100644 --- a/newlib/libc/stdlib/__adjust.c +++ b/newlib/libc/stdlib/__adjust.c @@ -10,9 +10,9 @@ double _DEFUN (__adjust, (ptr, acc, dexp, sign), - struct _reent *ptr _AND - double *acc _AND - int dexp _AND + struct _reent *ptr, + double *acc, + int dexp, int sign) /* *acc the 64 bit accumulator */ /* dexp decimal exponent */ diff --git a/newlib/libc/stdlib/__atexit.c b/newlib/libc/stdlib/__atexit.c index 0f4aeb8..cb4a268 100644 --- a/newlib/libc/stdlib/__atexit.c +++ b/newlib/libc/stdlib/__atexit.c @@ -65,9 +65,9 @@ static struct _atexit _global_atexit0 = _ATEXIT_INIT; int _DEFUN (__register_exitproc, (type, fn, arg, d), - int type _AND - void (*fn) (void) _AND - void *arg _AND + int type, + void (*fn) (void), + void *arg, void *d) { struct _on_exit_args * args; diff --git a/newlib/libc/stdlib/__call_atexit.c b/newlib/libc/stdlib/__call_atexit.c index 6a809cc..e6c1ee6 100644 --- a/newlib/libc/stdlib/__call_atexit.c +++ b/newlib/libc/stdlib/__call_atexit.c @@ -66,7 +66,7 @@ register_fini(void) void _DEFUN (__call_exitprocs, (code, d), - int code _AND _PTR d) + int code, _PTR d) { register struct _atexit *p; struct _atexit **lastp; diff --git a/newlib/libc/stdlib/__ten_mu.c b/newlib/libc/stdlib/__ten_mu.c index 637197b..a7fe70c 100644 --- a/newlib/libc/stdlib/__ten_mu.c +++ b/newlib/libc/stdlib/__ten_mu.c @@ -10,7 +10,7 @@ int _DEFUN (__ten_mul, (acc, digit), - double *acc _AND + double *acc, int digit) { /* diff --git a/newlib/libc/stdlib/assert.c b/newlib/libc/stdlib/assert.c index a621874..ba5b461 100644 --- a/newlib/libc/stdlib/assert.c +++ b/newlib/libc/stdlib/assert.c @@ -51,9 +51,9 @@ Supporting OS subroutines required (only if enabled): <<close>>, <<fstat>>, /* func can be NULL, in which case no function information is given. */ void _DEFUN (__assert_func, (file, line, func, failedexpr), - const char *file _AND - int line _AND - const char *func _AND + const char *file, + int line, + const char *func, const char *failedexpr) { fiprintf(stderr, @@ -67,8 +67,8 @@ _DEFUN (__assert_func, (file, line, func, failedexpr), void _DEFUN (__assert, (file, line, failedexpr), - const char *file _AND - int line _AND + const char *file, + int line, const char *failedexpr) { __assert_func (file, line, NULL, failedexpr); diff --git a/newlib/libc/stdlib/atoi.c b/newlib/libc/stdlib/atoi.c index ac3b39a..936b381 100644 --- a/newlib/libc/stdlib/atoi.c +++ b/newlib/libc/stdlib/atoi.c @@ -56,7 +56,7 @@ _DEFUN (atoi, (s), int _DEFUN (_atoi_r, (s), - struct _reent *ptr _AND + struct _reent *ptr, _CONST char *s) { return (int) _strtol_r (ptr, s, NULL, 10); diff --git a/newlib/libc/stdlib/atol.c b/newlib/libc/stdlib/atol.c index 8d0e5cd..8c2f556 100644 --- a/newlib/libc/stdlib/atol.c +++ b/newlib/libc/stdlib/atol.c @@ -14,7 +14,7 @@ _DEFUN (atol, (s), _CONST char *s) #endif /* !_REENT_ONLY */ long -_DEFUN (_atol_r, (ptr, s), struct _reent *ptr _AND _CONST char *s) +_DEFUN (_atol_r, (ptr, s), struct _reent *ptr, _CONST char *s) { return _strtol_r (ptr, s, NULL, 10); } diff --git a/newlib/libc/stdlib/atoll.c b/newlib/libc/stdlib/atoll.c index 9d8a64a..d0d4983 100644 --- a/newlib/libc/stdlib/atoll.c +++ b/newlib/libc/stdlib/atoll.c @@ -78,7 +78,7 @@ _DEFUN(atoll, (str), long long _DEFUN(_atoll_r, (ptr, str), - struct _reent *ptr _AND + struct _reent *ptr, _CONST char *str) { return _strtoll_r(ptr, str, (char **)NULL, 10); diff --git a/newlib/libc/stdlib/calloc.c b/newlib/libc/stdlib/calloc.c index 3a72378..dfdb7f5 100644 --- a/newlib/libc/stdlib/calloc.c +++ b/newlib/libc/stdlib/calloc.c @@ -47,7 +47,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>, _PTR _DEFUN (calloc, (n, size), - size_t n _AND + size_t n, size_t size) { return _calloc_r (_REENT, n, size); diff --git a/newlib/libc/stdlib/cxa_atexit.c b/newlib/libc/stdlib/cxa_atexit.c index 39a59d5..c66b28e 100644 --- a/newlib/libc/stdlib/cxa_atexit.c +++ b/newlib/libc/stdlib/cxa_atexit.c @@ -24,8 +24,8 @@ const void * const __cxa_atexit_dummy = &__on_exit_args; int _DEFUN (__cxa_atexit, (fn, arg, d), - void (*fn) (void *) _AND - void *arg _AND + void (*fn) (void *), + void *arg, void *d) { #ifdef _LITE_EXIT diff --git a/newlib/libc/stdlib/div.c b/newlib/libc/stdlib/div.c index a780a2d..4d2ffee 100644 --- a/newlib/libc/stdlib/div.c +++ b/newlib/libc/stdlib/div.c @@ -82,7 +82,7 @@ No supporting OS subroutines are required. div_t _DEFUN (div, (num, denom), - int num _AND + int num, int denom) { div_t r; diff --git a/newlib/libc/stdlib/dtoa.c b/newlib/libc/stdlib/dtoa.c index c72ffac..3b89764 100644 --- a/newlib/libc/stdlib/dtoa.c +++ b/newlib/libc/stdlib/dtoa.c @@ -35,7 +35,7 @@ static int _DEFUN (quorem, (b, S), - _Bigint * b _AND _Bigint * S) + _Bigint * b, _Bigint * S) { int n; __Long borrow, y; @@ -179,12 +179,12 @@ _DEFUN (quorem, char * _DEFUN (_dtoa_r, (ptr, _d, mode, ndigits, decpt, sign, rve), - struct _reent *ptr _AND - double _d _AND - int mode _AND - int ndigits _AND - int *decpt _AND - int *sign _AND + struct _reent *ptr, + double _d, + int mode, + int ndigits, + int *decpt, + int *sign, char **rve) { /* Arguments ndigits, decpt, sign are similar to those diff --git a/newlib/libc/stdlib/dtoastub.c b/newlib/libc/stdlib/dtoastub.c index f4929f2..a857c24 100644 --- a/newlib/libc/stdlib/dtoastub.c +++ b/newlib/libc/stdlib/dtoastub.c @@ -10,11 +10,11 @@ char * _DEFUN (__dtoa, (d, mode, ndigits, decpt, sign, rve), - double d _AND - int mode _AND - int ndigits _AND - int *decpt _AND - int *sign _AND + double d, + int mode, + int ndigits, + int *decpt, + int *sign, char **rve) { return _dtoa_r (_REENT, d, mode, ndigits, decpt, sign, rve); diff --git a/newlib/libc/stdlib/ecvtbuf.c b/newlib/libc/stdlib/ecvtbuf.c index ee58c9a..2326f55 100644 --- a/newlib/libc/stdlib/ecvtbuf.c +++ b/newlib/libc/stdlib/ecvtbuf.c @@ -59,12 +59,12 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>, static void _DEFUN (print_f, (ptr, buf, invalue, ndigit, type, dot, mode), - struct _reent *ptr _AND - char *buf _AND - double invalue _AND - int ndigit _AND - char type _AND - int dot _AND + struct _reent *ptr, + char *buf, + double invalue, + int ndigit, + char type, + int dot, int mode) { int decpt; @@ -127,11 +127,11 @@ _DEFUN (print_f, (ptr, buf, invalue, ndigit, type, dot, mode), static void _DEFUN (print_e, (ptr, buf, invalue, width, type, dot), - struct _reent *ptr _AND - char *buf _AND - double invalue _AND - int width _AND - char type _AND + struct _reent *ptr, + char *buf, + double invalue, + int width, + char type, int dot) { int sign; @@ -210,10 +210,10 @@ _DEFUN (print_e, (ptr, buf, invalue, width, type, dot), char * _DEFUN (fcvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf), - double invalue _AND - int ndigit _AND - int *decpt _AND - int *sign _AND + double invalue, + int ndigit, + int *decpt, + int *sign, char *fcvt_buf) { struct _reent *reent = _REENT; @@ -267,10 +267,10 @@ _DEFUN (fcvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf), char * _DEFUN (ecvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf), - double invalue _AND - int ndigit _AND - int *decpt _AND - int *sign _AND + double invalue, + int ndigit, + int *decpt, + int *sign, char *fcvt_buf) { struct _reent *reent = _REENT; @@ -318,11 +318,11 @@ _DEFUN (ecvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf), char * _DEFUN (_gcvt, (ptr, invalue, ndigit, buf, type, dot), - struct _reent *ptr _AND - double invalue _AND - int ndigit _AND - char *buf _AND - char type _AND + struct _reent *ptr, + double invalue, + int ndigit, + char *buf, + char type, int dot) { char *save = buf; @@ -426,12 +426,12 @@ _DEFUN (_gcvt, (ptr, invalue, ndigit, buf, type, dot), char * _DEFUN (_dcvt, (ptr, buffer, invalue, precision, width, type, dot), - struct _reent *ptr _AND - char *buffer _AND - double invalue _AND - int precision _AND - int width _AND - char type _AND + struct _reent *ptr, + char *buffer, + double invalue, + int precision, + int width, + char type, int dot) { switch (type) diff --git a/newlib/libc/stdlib/efgcvt.c b/newlib/libc/stdlib/efgcvt.c index ae64245..e354bb1 100644 --- a/newlib/libc/stdlib/efgcvt.c +++ b/newlib/libc/stdlib/efgcvt.c @@ -104,9 +104,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>, char * _DEFUN (fcvt, (d, ndigit, decpt, sign), - double d _AND - int ndigit _AND - int *decpt _AND + double d, + int ndigit, + int *decpt, int *sign) { return fcvtbuf (d, ndigit, decpt, sign, NULL); @@ -114,9 +114,9 @@ _DEFUN (fcvt, (d, ndigit, decpt, sign), char * _DEFUN (fcvtf, (d, ndigit, decpt, sign), - float d _AND - int ndigit _AND - int *decpt _AND + float d, + int ndigit, + int *decpt, int *sign) { return fcvt ((float) d, ndigit, decpt, sign); @@ -125,8 +125,8 @@ _DEFUN (fcvtf, (d, ndigit, decpt, sign), char * _DEFUN (gcvtf, (d, ndigit, buf), - float d _AND - int ndigit _AND + float d, + int ndigit, char *buf) { double asd = d; @@ -136,9 +136,9 @@ _DEFUN (gcvtf, (d, ndigit, buf), char * _DEFUN (ecvt, (d, ndigit, decpt, sign), - double d _AND - int ndigit _AND - int *decpt _AND + double d, + int ndigit, + int *decpt, int *sign) { return ecvtbuf (d, ndigit, decpt, sign, NULL); @@ -146,9 +146,9 @@ _DEFUN (ecvt, (d, ndigit, decpt, sign), char * _DEFUN (ecvtf, (d, ndigit, decpt, sign), - float d _AND - int ndigit _AND - int *decpt _AND + float d, + int ndigit, + int *decpt, int *sign) { return ecvt ((double) d, ndigit, decpt, sign); @@ -157,8 +157,8 @@ _DEFUN (ecvtf, (d, ndigit, decpt, sign), char * _DEFUN (gcvt, (d, ndigit, buf), - double d _AND - int ndigit _AND + double d, + int ndigit, char *buf) { char *tbuf = buf; diff --git a/newlib/libc/stdlib/erand48.c b/newlib/libc/stdlib/erand48.c index 26b39fb..a62ff34 100644 --- a/newlib/libc/stdlib/erand48.c +++ b/newlib/libc/stdlib/erand48.c @@ -15,7 +15,7 @@ double _DEFUN (_erand48_r, (r, xseed), - struct _reent *r _AND + struct _reent *r, unsigned short xseed[3]) { __dorand48(r, xseed); diff --git a/newlib/libc/stdlib/gdtoa-gethex.c b/newlib/libc/stdlib/gdtoa-gethex.c index fd3903c..931ced3 100644 --- a/newlib/libc/stdlib/gdtoa-gethex.c +++ b/newlib/libc/stdlib/gdtoa-gethex.c @@ -71,7 +71,7 @@ _DEFUN (__hexdig_fun, (c), static void _DEFUN(rshift, (b, k), - _Bigint *b _AND + _Bigint *b, int k) { __ULong *x, *x1, *xe, y; @@ -102,7 +102,7 @@ _DEFUN(rshift, (b, k), static _Bigint * _DEFUN (increment, (ptr, b), - struct _reent *ptr _AND + struct _reent *ptr, _Bigint *b) { __ULong *x, *xe; diff --git a/newlib/libc/stdlib/gdtoa-hexnan.c b/newlib/libc/stdlib/gdtoa-hexnan.c index 24e3783..22033d9 100644 --- a/newlib/libc/stdlib/gdtoa-hexnan.c +++ b/newlib/libc/stdlib/gdtoa-hexnan.c @@ -46,7 +46,7 @@ THIS SOFTWARE. #ifdef INFNAN_CHECK int _DEFUN (match, (sp, t), - _CONST char **sp _AND + _CONST char **sp, char *t) { int c, d; @@ -64,8 +64,8 @@ _DEFUN (match, (sp, t), static void _DEFUN (L_shift, (x, x1, i), - __ULong *x _AND - __ULong *x1 _AND + __ULong *x, + __ULong *x1, int i) { int j; @@ -81,8 +81,8 @@ _DEFUN (L_shift, (x, x1, i), int _DEFUN (hexnan, (sp, fpi, x0), - _CONST char **sp _AND - _CONST FPI *fpi _AND + _CONST char **sp, + _CONST FPI *fpi, __ULong *x0) { __ULong c, h, *x, *x1, *xe; diff --git a/newlib/libc/stdlib/getenv.c b/newlib/libc/stdlib/getenv.c index c64241e..2d394e2 100644 --- a/newlib/libc/stdlib/getenv.c +++ b/newlib/libc/stdlib/getenv.c @@ -65,7 +65,7 @@ variables vary from one system to another. char * _DEFUN (_findenv, (name, offset), - register _CONST char *name _AND + register _CONST char *name, int *offset) { return _findenv_r (_REENT, name, offset); diff --git a/newlib/libc/stdlib/getenv_r.c b/newlib/libc/stdlib/getenv_r.c index 7376f74..b34c2a9 100644 --- a/newlib/libc/stdlib/getenv_r.c +++ b/newlib/libc/stdlib/getenv_r.c @@ -75,8 +75,8 @@ static char ***p_environ = &environ; char * _DEFUN (_findenv_r, (reent_ptr, name, offset), - struct _reent *reent_ptr _AND - register _CONST char *name _AND + struct _reent *reent_ptr, + register _CONST char *name, int *offset) { register int len; @@ -120,7 +120,7 @@ _DEFUN (_findenv_r, (reent_ptr, name, offset), char * _DEFUN (_getenv_r, (reent_ptr, name), - struct _reent *reent_ptr _AND + struct _reent *reent_ptr, _CONST char *name) { int offset; diff --git a/newlib/libc/stdlib/itoa.c b/newlib/libc/stdlib/itoa.c index 3178cd4..25e6c35 100644 --- a/newlib/libc/stdlib/itoa.c +++ b/newlib/libc/stdlib/itoa.c @@ -31,8 +31,8 @@ No supporting OS subroutine calls are required. char * _DEFUN (__itoa, (value, str, base), - int value _AND - char *str _AND + int value, + char *str, int base) { unsigned uvalue; @@ -61,8 +61,8 @@ _DEFUN (__itoa, (value, str, base), char * _DEFUN (itoa, (value, str, base), - int value _AND - char *str _AND + int value, + char *str, int base) { return __itoa (value, str, base); diff --git a/newlib/libc/stdlib/jrand48.c b/newlib/libc/stdlib/jrand48.c index 9e2f92c..4f8c12b 100644 --- a/newlib/libc/stdlib/jrand48.c +++ b/newlib/libc/stdlib/jrand48.c @@ -15,7 +15,7 @@ long _DEFUN (_jrand48_r, (r, xseed), - struct _reent *r _AND + struct _reent *r, unsigned short xseed[3]) { __dorand48(r, xseed); diff --git a/newlib/libc/stdlib/l64a.c b/newlib/libc/stdlib/l64a.c index d415d04..6078427 100644 --- a/newlib/libc/stdlib/l64a.c +++ b/newlib/libc/stdlib/l64a.c @@ -35,7 +35,7 @@ _DEFUN (l64a, (value), char * _DEFUN (_l64a_r, (rptr, value), - struct _reent *rptr _AND + struct _reent *rptr, long value) { char *ptr; diff --git a/newlib/libc/stdlib/lcong48.c b/newlib/libc/stdlib/lcong48.c index 548f327..f40dede 100644 --- a/newlib/libc/stdlib/lcong48.c +++ b/newlib/libc/stdlib/lcong48.c @@ -15,7 +15,7 @@ _VOID _DEFUN (_lcong48_r, (r, p), - struct _reent *r _AND + struct _reent *r, unsigned short p[7]) { _REENT_CHECK_RAND48(r); diff --git a/newlib/libc/stdlib/ldiv.c b/newlib/libc/stdlib/ldiv.c index 242b6bd..00bca62 100644 --- a/newlib/libc/stdlib/ldiv.c +++ b/newlib/libc/stdlib/ldiv.c @@ -83,7 +83,7 @@ No supporting OS subroutines are required. ldiv_t _DEFUN (ldiv, (num, denom), - long num _AND + long num, long denom) { ldiv_t r; diff --git a/newlib/libc/stdlib/lldiv.c b/newlib/libc/stdlib/lldiv.c index 61a9b50..8433e76 100644 --- a/newlib/libc/stdlib/lldiv.c +++ b/newlib/libc/stdlib/lldiv.c @@ -95,7 +95,7 @@ No supporting OS subroutines are required. */ lldiv_t _DEFUN (lldiv, (number, denom), - long long numer _AND long long denom) + long long numer, long long denom) { lldiv_t retval; diff --git a/newlib/libc/stdlib/malign.c b/newlib/libc/stdlib/malign.c index 1eded30..d36846f 100644 --- a/newlib/libc/stdlib/malign.c +++ b/newlib/libc/stdlib/malign.c @@ -10,7 +10,7 @@ _PTR _DEFUN (memalign, (align, nbytes), - size_t align _AND + size_t align, size_t nbytes) { return _memalign_r (_REENT, align, nbytes); diff --git a/newlib/libc/stdlib/mblen.c b/newlib/libc/stdlib/mblen.c index 30d759b..3ea91f4 100644 --- a/newlib/libc/stdlib/mblen.c +++ b/newlib/libc/stdlib/mblen.c @@ -44,7 +44,7 @@ effects vary with the locale. int _DEFUN (mblen, (s, n), - const char *s _AND + const char *s, size_t n) { #ifdef _MB_CAPABLE diff --git a/newlib/libc/stdlib/mblen_r.c b/newlib/libc/stdlib/mblen_r.c index 5e58e1e..1456cea 100644 --- a/newlib/libc/stdlib/mblen_r.c +++ b/newlib/libc/stdlib/mblen_r.c @@ -42,9 +42,9 @@ effects vary with the locale. int _DEFUN (_mblen_r, (r, s, n, state), - struct _reent *r _AND - const char *s _AND - size_t n _AND + struct _reent *r, + const char *s, + size_t n, mbstate_t *state) { #ifdef _MB_CAPABLE diff --git a/newlib/libc/stdlib/mbrtowc.c b/newlib/libc/stdlib/mbrtowc.c index 69e3acb..4ca2143 100644 --- a/newlib/libc/stdlib/mbrtowc.c +++ b/newlib/libc/stdlib/mbrtowc.c @@ -9,10 +9,10 @@ size_t _DEFUN (_mbrtowc_r, (ptr, pwc, s, n, ps), - struct _reent *ptr _AND - wchar_t *pwc _AND - const char *s _AND - size_t n _AND + struct _reent *ptr, + wchar_t *pwc, + const char *s, + size_t n, mbstate_t *ps) { int retval = 0; @@ -43,9 +43,9 @@ _DEFUN (_mbrtowc_r, (ptr, pwc, s, n, ps), #ifndef _REENT_ONLY size_t _DEFUN (mbrtowc, (pwc, s, n, ps), - wchar_t *__restrict pwc _AND - const char *__restrict s _AND - size_t n _AND + wchar_t *__restrict pwc, + const char *__restrict s, + size_t n, mbstate_t *__restrict ps) { #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) diff --git a/newlib/libc/stdlib/mbsnrtowcs.c b/newlib/libc/stdlib/mbsnrtowcs.c index 018f075..206a062 100644 --- a/newlib/libc/stdlib/mbsnrtowcs.c +++ b/newlib/libc/stdlib/mbsnrtowcs.c @@ -72,11 +72,11 @@ PORTABILITY size_t _DEFUN (_mbsnrtowcs_r, (r, dst, src, nms, len, ps), - struct _reent *r _AND - wchar_t *dst _AND - const char **src _AND - size_t nms _AND - size_t len _AND + struct _reent *r, + wchar_t *dst, + const char **src, + size_t nms, + size_t len, mbstate_t *ps) { wchar_t *ptr = dst; @@ -138,10 +138,10 @@ _DEFUN (_mbsnrtowcs_r, (r, dst, src, nms, len, ps), #ifndef _REENT_ONLY size_t _DEFUN (mbsnrtowcs, (dst, src, nms, len, ps), - wchar_t *__restrict dst _AND - const char **__restrict src _AND - size_t nms _AND - size_t len _AND + wchar_t *__restrict dst, + const char **__restrict src, + size_t nms, + size_t len, mbstate_t *__restrict ps) { return _mbsnrtowcs_r (_REENT, dst, src, nms, len, ps); diff --git a/newlib/libc/stdlib/mbsrtowcs.c b/newlib/libc/stdlib/mbsrtowcs.c index 65e46d3..48d36d0 100644 --- a/newlib/libc/stdlib/mbsrtowcs.c +++ b/newlib/libc/stdlib/mbsrtowcs.c @@ -9,10 +9,10 @@ size_t _DEFUN (_mbsrtowcs_r, (r, dst, src, len, ps), - struct _reent *r _AND - wchar_t *dst _AND - const char **src _AND - size_t len _AND + struct _reent *r, + wchar_t *dst, + const char **src, + size_t len, mbstate_t *ps) { return _mbsnrtowcs_r (r, dst, src, (size_t) -1, len, ps); @@ -21,9 +21,9 @@ _DEFUN (_mbsrtowcs_r, (r, dst, src, len, ps), #ifndef _REENT_ONLY size_t _DEFUN (mbsrtowcs, (dst, src, len, ps), - wchar_t *__restrict dst _AND - const char **__restrict src _AND - size_t len _AND + wchar_t *__restrict dst, + const char **__restrict src, + size_t len, mbstate_t *__restrict ps) { return _mbsnrtowcs_r (_REENT, dst, src, (size_t) -1, len, ps); diff --git a/newlib/libc/stdlib/mbstowcs.c b/newlib/libc/stdlib/mbstowcs.c index 70ed9ed..41ad7b6 100644 --- a/newlib/libc/stdlib/mbstowcs.c +++ b/newlib/libc/stdlib/mbstowcs.c @@ -48,8 +48,8 @@ effects vary with the locale. size_t _DEFUN (mbstowcs, (pwcs, s, n), - wchar_t *__restrict pwcs _AND - const char *__restrict s _AND + wchar_t *__restrict pwcs, + const char *__restrict s, size_t n) { #ifdef _MB_CAPABLE diff --git a/newlib/libc/stdlib/mbstowcs_r.c b/newlib/libc/stdlib/mbstowcs_r.c index 4950499..7c95e4a 100644 --- a/newlib/libc/stdlib/mbstowcs_r.c +++ b/newlib/libc/stdlib/mbstowcs_r.c @@ -4,10 +4,10 @@ size_t _DEFUN (_mbstowcs_r, (reent, pwcs, s, n, state), - struct _reent *r _AND - wchar_t *__restrict pwcs _AND - const char *__restrict s _AND - size_t n _AND + struct _reent *r, + wchar_t *__restrict pwcs, + const char *__restrict s, + size_t n, mbstate_t *state) { size_t ret = 0; diff --git a/newlib/libc/stdlib/mbtowc.c b/newlib/libc/stdlib/mbtowc.c index 0c29cf3..182884a 100644 --- a/newlib/libc/stdlib/mbtowc.c +++ b/newlib/libc/stdlib/mbtowc.c @@ -51,8 +51,8 @@ effects vary with the locale. int _DEFUN (mbtowc, (pwc, s, n), - wchar_t *__restrict pwc _AND - const char *__restrict s _AND + wchar_t *__restrict pwc, + const char *__restrict s, size_t n) { #ifdef _MB_CAPABLE diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c index 9d78256..cbc534a 100644 --- a/newlib/libc/stdlib/mbtowc_r.c +++ b/newlib/libc/stdlib/mbtowc_r.c @@ -9,10 +9,10 @@ int _DEFUN (_mbtowc_r, (r, pwc, s, n, state), - struct _reent *r _AND - wchar_t *__restrict pwc _AND - const char *__restrict s _AND - size_t n _AND + struct _reent *r, + wchar_t *__restrict pwc, + const char *__restrict s, + size_t n, mbstate_t *state) { return __MBTOWC (r, pwc, s, n, state); @@ -20,10 +20,10 @@ _DEFUN (_mbtowc_r, (r, pwc, s, n, state), int _DEFUN (__ascii_mbtowc, (r, pwc, s, n, state), - struct _reent *r _AND - wchar_t *pwc _AND - const char *s _AND - size_t n _AND + struct _reent *r, + wchar_t *pwc, + const char *s, + size_t n, mbstate_t *state) { wchar_t dummy; @@ -529,10 +529,10 @@ __cp_mbtowc (int val) int _DEFUN (__utf8_mbtowc, (r, pwc, s, n, state), - struct _reent *r _AND - wchar_t *pwc _AND - const char *s _AND - size_t n _AND + struct _reent *r, + wchar_t *pwc, + const char *s, + size_t n, mbstate_t *state) { wchar_t dummy; @@ -731,10 +731,10 @@ _DEFUN (__utf8_mbtowc, (r, pwc, s, n, state), #ifndef __CYGWIN__ int _DEFUN (__sjis_mbtowc, (r, pwc, s, n, state), - struct _reent *r _AND - wchar_t *pwc _AND - const char *s _AND - size_t n _AND + struct _reent *r, + wchar_t *pwc, + const char *s, + size_t n, mbstate_t *state) { wchar_t dummy; @@ -788,10 +788,10 @@ _DEFUN (__sjis_mbtowc, (r, pwc, s, n, state), int _DEFUN (__eucjp_mbtowc, (r, pwc, s, n, state), - struct _reent *r _AND - wchar_t *pwc _AND - const char *s _AND - size_t n _AND + struct _reent *r, + wchar_t *pwc, + const char *s, + size_t n, mbstate_t *state) { wchar_t dummy; @@ -871,10 +871,10 @@ _DEFUN (__eucjp_mbtowc, (r, pwc, s, n, state), int _DEFUN (__jis_mbtowc, (r, pwc, s, n, state), - struct _reent *r _AND - wchar_t *pwc _AND - const char *s _AND - size_t n _AND + struct _reent *r, + wchar_t *pwc, + const char *s, + size_t n, mbstate_t *state) { wchar_t dummy; diff --git a/newlib/libc/stdlib/mprec.c b/newlib/libc/stdlib/mprec.c index 2b982ef..cb6866d 100644 --- a/newlib/libc/stdlib/mprec.c +++ b/newlib/libc/stdlib/mprec.c @@ -94,7 +94,7 @@ */ _Bigint * -_DEFUN (Balloc, (ptr, k), struct _reent *ptr _AND int k) +_DEFUN (Balloc, (ptr, k), struct _reent *ptr, int k) { int x; _Bigint *rv ; @@ -133,7 +133,7 @@ _DEFUN (Balloc, (ptr, k), struct _reent *ptr _AND int k) } void -_DEFUN (Bfree, (ptr, v), struct _reent *ptr _AND _Bigint * v) +_DEFUN (Bfree, (ptr, v), struct _reent *ptr, _Bigint * v) { _REENT_CHECK_MP(ptr); if (v) @@ -145,9 +145,9 @@ _DEFUN (Bfree, (ptr, v), struct _reent *ptr _AND _Bigint * v) _Bigint * _DEFUN (multadd, (ptr, b, m, a), - struct _reent *ptr _AND - _Bigint * b _AND - int m _AND + struct _reent *ptr, + _Bigint * b, + int m, int a) { int i, wds; @@ -192,10 +192,10 @@ _DEFUN (multadd, (ptr, b, m, a), _Bigint * _DEFUN (s2b, (ptr, s, nd0, nd, y9), - struct _reent * ptr _AND - _CONST char *s _AND - int nd0 _AND - int nd _AND + struct _reent * ptr, + _CONST char *s, + int nd0, + int nd, __ULong y9) { _Bigint *b; @@ -316,7 +316,7 @@ _DEFUN (lo0bits, (y), __ULong *y) } _Bigint * -_DEFUN (i2b, (ptr, i), struct _reent * ptr _AND int i) +_DEFUN (i2b, (ptr, i), struct _reent * ptr, int i) { _Bigint *b; @@ -327,7 +327,7 @@ _DEFUN (i2b, (ptr, i), struct _reent * ptr _AND int i) } _Bigint * -_DEFUN (mult, (ptr, a, b), struct _reent * ptr _AND _Bigint * a _AND _Bigint * b) +_DEFUN (mult, (ptr, a, b), struct _reent * ptr, _Bigint * a, _Bigint * b) { _Bigint *c; int k, wa, wb, wc; @@ -420,7 +420,7 @@ _DEFUN (mult, (ptr, a, b), struct _reent * ptr _AND _Bigint * a _AND _Bigint * b _Bigint * _DEFUN (pow5mult, - (ptr, b, k), struct _reent * ptr _AND _Bigint * b _AND int k) + (ptr, b, k), struct _reent * ptr, _Bigint * b, int k) { _Bigint *b1, *p5, *p51; int i; @@ -459,7 +459,7 @@ _DEFUN (pow5mult, } _Bigint * -_DEFUN (lshift, (ptr, b, k), struct _reent * ptr _AND _Bigint * b _AND int k) +_DEFUN (lshift, (ptr, b, k), struct _reent * ptr, _Bigint * b, int k) { int i, k1, n, n1; _Bigint *b1; @@ -519,7 +519,7 @@ _DEFUN (lshift, (ptr, b, k), struct _reent * ptr _AND _Bigint * b _AND int k) } int -_DEFUN (cmp, (a, b), _Bigint * a _AND _Bigint * b) +_DEFUN (cmp, (a, b), _Bigint * a, _Bigint * b) { __ULong *xa, *xa0, *xb, *xb0; int i, j; @@ -549,8 +549,8 @@ _DEFUN (cmp, (a, b), _Bigint * a _AND _Bigint * b) } _Bigint * -_DEFUN (diff, (ptr, a, b), struct _reent * ptr _AND - _Bigint * a _AND _Bigint * b) +_DEFUN (diff, (ptr, a, b), struct _reent * ptr, + _Bigint * a, _Bigint * b) { _Bigint *c; int i, wa, wb; @@ -680,7 +680,7 @@ _DEFUN (ulp, (_x), double _x) double _DEFUN (b2d, (a, e), - _Bigint * a _AND int *e) + _Bigint * a, int *e) { __ULong *xa, *xa0, w, y, z; int k; @@ -758,9 +758,9 @@ ret_d: _Bigint * _DEFUN (d2b, (ptr, _d, e, bits), - struct _reent * ptr _AND - double _d _AND - int *e _AND + struct _reent * ptr, + double _d, + int *e, int *bits) { @@ -911,7 +911,7 @@ _DEFUN (d2b, #undef d1 double -_DEFUN (ratio, (a, b), _Bigint * a _AND _Bigint * b) +_DEFUN (ratio, (a, b), _Bigint * a, _Bigint * b) { union double_union da, db; @@ -992,8 +992,8 @@ _DEFUN (_mprec_log10, (dig), void _DEFUN (copybits, (c, n, b), - __ULong *c _AND - int n _AND + __ULong *c, + int n, _Bigint *b) { __ULong *ce, *x, *xe; @@ -1021,7 +1021,7 @@ _DEFUN (copybits, (c, n, b), __ULong _DEFUN (any_on, (b, k), - _Bigint *b _AND + _Bigint *b, int k) { int n, nwds; diff --git a/newlib/libc/stdlib/mstats.c b/newlib/libc/stdlib/mstats.c index 88cb54c..b7aa93b 100644 --- a/newlib/libc/stdlib/mstats.c +++ b/newlib/libc/stdlib/mstats.c @@ -98,7 +98,7 @@ _DEFUN_VOID (malloc_stats) int _DEFUN (mallopt, (p, v), - int p _AND + int p, int v) { return _mallopt_r (_REENT, p, v); @@ -116,7 +116,7 @@ _DEFUN (mallopt, (p, v), void _DEFUN (_mstats_r, (ptr, s), - struct _reent *ptr _AND + struct _reent *ptr, char *s) { _REENT_SMALL_CHECK_INIT(ptr); diff --git a/newlib/libc/stdlib/nrand48.c b/newlib/libc/stdlib/nrand48.c index 39e9fb1..43a6d0c 100644 --- a/newlib/libc/stdlib/nrand48.c +++ b/newlib/libc/stdlib/nrand48.c @@ -15,7 +15,7 @@ long _DEFUN (_nrand48_r, (r, xseed), - struct _reent *r _AND + struct _reent *r, unsigned short xseed[3]) { __dorand48 (r, xseed); diff --git a/newlib/libc/stdlib/on_exit.c b/newlib/libc/stdlib/on_exit.c index d22fc37..b21cf0c 100644 --- a/newlib/libc/stdlib/on_exit.c +++ b/newlib/libc/stdlib/on_exit.c @@ -68,7 +68,7 @@ const void * const __on_exit_dummy = &__on_exit_args; int _DEFUN (on_exit, (fn, arg), - _VOID _EXFNPTR(fn, (int, _PTR)) _AND + _VOID _EXFNPTR(fn, (int, _PTR)), _PTR arg) { return __register_exitproc (__et_onexit, (void (*)(void)) fn, arg, NULL); diff --git a/newlib/libc/stdlib/putenv_r.c b/newlib/libc/stdlib/putenv_r.c index a0f4767..a780a14 100644 --- a/newlib/libc/stdlib/putenv_r.c +++ b/newlib/libc/stdlib/putenv_r.c @@ -32,7 +32,7 @@ with "value" which is specified by str as "name=value". */ int _DEFUN (_putenv_r, (reent_ptr, str), - struct _reent *reent_ptr _AND + struct _reent *reent_ptr, char *str) { register char *p, *equal; diff --git a/newlib/libc/stdlib/rand48.c b/newlib/libc/stdlib/rand48.c index b9bf320..0fc5cc0 100644 --- a/newlib/libc/stdlib/rand48.c +++ b/newlib/libc/stdlib/rand48.c @@ -131,7 +131,7 @@ No supporting OS subroutines are required. void _DEFUN (__dorand48, (r, xseed), - struct _reent *r _AND + struct _reent *r, unsigned short xseed[3]) { unsigned long accu; diff --git a/newlib/libc/stdlib/realloc.c b/newlib/libc/stdlib/realloc.c index 0cdbdb6..8258e21 100644 --- a/newlib/libc/stdlib/realloc.c +++ b/newlib/libc/stdlib/realloc.c @@ -12,7 +12,7 @@ int _dummy_realloc = 1; _PTR _DEFUN (realloc, (ap, nbytes), - _PTR ap _AND + _PTR ap, size_t nbytes) { return _realloc_r (_REENT, ap, nbytes); diff --git a/newlib/libc/stdlib/reallocf.c b/newlib/libc/stdlib/reallocf.c index a9d3293..b3f1b2a 100644 --- a/newlib/libc/stdlib/reallocf.c +++ b/newlib/libc/stdlib/reallocf.c @@ -32,8 +32,8 @@ _PTR _DEFUN (_reallocf_r, (reentptr, ptr, size), - struct _reent *reentptr _AND - _PTR ptr _AND + struct _reent *reentptr, + _PTR ptr, size_t size) { void *nptr; @@ -47,7 +47,7 @@ _DEFUN (_reallocf_r, (reentptr, ptr, size), #ifndef _REENT_ONLY _PTR _DEFUN (reallocf, (ptr, size), - _PTR ptr _AND + _PTR ptr, size_t size) { return _reallocf_r(_REENT, ptr, size); diff --git a/newlib/libc/stdlib/seed48.c b/newlib/libc/stdlib/seed48.c index 43629cc..5f3ae2e 100644 --- a/newlib/libc/stdlib/seed48.c +++ b/newlib/libc/stdlib/seed48.c @@ -15,7 +15,7 @@ unsigned short * _DEFUN (_seed48_r, (r, xseed), - struct _reent *r _AND + struct _reent *r, unsigned short xseed[3]) { static unsigned short sseed[3]; diff --git a/newlib/libc/stdlib/setenv.c b/newlib/libc/stdlib/setenv.c index d423678..7e89494 100644 --- a/newlib/libc/stdlib/setenv.c +++ b/newlib/libc/stdlib/setenv.c @@ -33,8 +33,8 @@ extern int _unsetenv_r _PARAMS ((struct _reent *, const char *)); int _DEFUN (setenv, (name, value, rewrite), - _CONST char *name _AND - _CONST char *value _AND + _CONST char *name, + _CONST char *value, int rewrite) { return _setenv_r (_REENT, name, value, rewrite); diff --git a/newlib/libc/stdlib/setenv_r.c b/newlib/libc/stdlib/setenv_r.c index c32c6ac..75f2173 100644 --- a/newlib/libc/stdlib/setenv_r.c +++ b/newlib/libc/stdlib/setenv_r.c @@ -50,9 +50,9 @@ extern char *_findenv_r _PARAMS ((struct _reent *, const char *, int *)); int _DEFUN (_setenv_r, (reent_ptr, name, value, rewrite), - struct _reent *reent_ptr _AND - _CONST char *name _AND - _CONST char *value _AND + struct _reent *reent_ptr, + _CONST char *name, + _CONST char *value, int rewrite) { static int alloced; /* if allocated space before */ @@ -134,7 +134,7 @@ _DEFUN (_setenv_r, (reent_ptr, name, value, rewrite), */ int _DEFUN (_unsetenv_r, (reent_ptr, name), - struct _reent *reent_ptr _AND + struct _reent *reent_ptr, _CONST char *name) { register char **P; diff --git a/newlib/libc/stdlib/srand48.c b/newlib/libc/stdlib/srand48.c index 69bdbfc..7042e83 100644 --- a/newlib/libc/stdlib/srand48.c +++ b/newlib/libc/stdlib/srand48.c @@ -15,7 +15,7 @@ _VOID _DEFUN (_srand48_r, (r, seed), - struct _reent *r _AND + struct _reent *r, long seed) { _REENT_CHECK_RAND48(r); diff --git a/newlib/libc/stdlib/strtod.c b/newlib/libc/stdlib/strtod.c index 236daa5..e3c9b7f 100644 --- a/newlib/libc/stdlib/strtod.c +++ b/newlib/libc/stdlib/strtod.c @@ -175,7 +175,7 @@ static _CONST double tinytens[] = { 1e-16, 1e-32, #ifdef Avoid_Underflow /*{*/ static double _DEFUN (sulp, (x, scale), - U x _AND + U x, int scale) { U u; @@ -198,9 +198,9 @@ _DEFUN (sulp, (x, scale), static void _DEFUN (ULtod, (L, bits, exp, k), - __ULong *L _AND - __ULong *bits _AND - Long exp _AND + __ULong *L, + __ULong *bits, + Long exp, int k) { switch(k & STRTOG_Retmask) { @@ -1253,8 +1253,8 @@ _strtod_l (struct _reent *ptr, const char *__restrict s00, char **__restrict se, double _DEFUN (_strtod_r, (ptr, s00, se), - struct _reent *ptr _AND - _CONST char *__restrict s00 _AND + struct _reent *ptr, + _CONST char *__restrict s00, char **__restrict se) { return _strtod_l (ptr, s00, se, __get_current_locale ()); @@ -1270,7 +1270,7 @@ strtod_l (const char *__restrict s00, char **__restrict se, locale_t loc) double _DEFUN (strtod, (s00, se), - _CONST char *__restrict s00 _AND char **__restrict se) + _CONST char *__restrict s00, char **__restrict se) { return _strtod_l (_REENT, s00, se, __get_current_locale ()); } @@ -1291,7 +1291,7 @@ strtof_l (const char *__restrict s00, char **__restrict se, locale_t loc) float _DEFUN (strtof, (s00, se), - _CONST char *__restrict s00 _AND + _CONST char *__restrict s00, char **__restrict se) { double val = _strtod_l (_REENT, s00, se, __get_current_locale ()); diff --git a/newlib/libc/stdlib/strtol.c b/newlib/libc/stdlib/strtol.c index ba58b6e..7ffa6a9 100644 --- a/newlib/libc/stdlib/strtol.c +++ b/newlib/libc/stdlib/strtol.c @@ -213,9 +213,9 @@ _strtol_l (struct _reent *rptr, const char *__restrict nptr, long _DEFUN (_strtol_r, (rptr, nptr, endptr, base), - struct _reent *rptr _AND - _CONST char *__restrict nptr _AND - char **__restrict endptr _AND + struct _reent *rptr, + _CONST char *__restrict nptr, + char **__restrict endptr, int base) { return _strtol_l (rptr, nptr, endptr, base, __get_current_locale ()); @@ -232,8 +232,8 @@ strtol_l (const char *__restrict s, char **__restrict ptr, int base, long _DEFUN (strtol, (s, ptr, base), - _CONST char *__restrict s _AND - char **__restrict ptr _AND + _CONST char *__restrict s, + char **__restrict ptr, int base) { return _strtol_l (_REENT, s, ptr, base, __get_current_locale ()); diff --git a/newlib/libc/stdlib/strtoll.c b/newlib/libc/stdlib/strtoll.c index 2922452..5175265 100644 --- a/newlib/libc/stdlib/strtoll.c +++ b/newlib/libc/stdlib/strtoll.c @@ -215,9 +215,9 @@ _strtoll_l (struct _reent *rptr, _CONST char *__restrict nptr, long long _DEFUN (_strtoll_r, (rptr, nptr, endptr, base), - struct _reent *rptr _AND - _CONST char *__restrict nptr _AND - char **__restrict endptr _AND + struct _reent *rptr, + _CONST char *__restrict nptr, + char **__restrict endptr, int base) { return _strtoll_l (rptr, nptr, endptr, base, __get_current_locale ()); @@ -234,8 +234,8 @@ strtoll_l (const char *__restrict s, char **__restrict ptr, int base, long long _DEFUN (strtoll, (s, ptr, base), - _CONST char *__restrict s _AND - char **__restrict ptr _AND + _CONST char *__restrict s, + char **__restrict ptr, int base) { return _strtoll_l (_REENT, s, ptr, base, __get_current_locale ()); diff --git a/newlib/libc/stdlib/strtoul.c b/newlib/libc/stdlib/strtoul.c index 9414661..e184722 100644 --- a/newlib/libc/stdlib/strtoul.c +++ b/newlib/libc/stdlib/strtoul.c @@ -192,9 +192,9 @@ _strtoul_l (struct _reent *rptr, const char *__restrict nptr, unsigned long _DEFUN (_strtoul_r, (rptr, nptr, endptr, base), - struct _reent *rptr _AND - _CONST char *__restrict nptr _AND - char **__restrict endptr _AND + struct _reent *rptr, + _CONST char *__restrict nptr, + char **__restrict endptr, int base) { return _strtoul_l (rptr, nptr, endptr, base, __get_current_locale ()); @@ -211,8 +211,8 @@ strtoul_l (const char *__restrict s, char **__restrict ptr, int base, unsigned long _DEFUN (strtoul, (s, ptr, base), - _CONST char *__restrict s _AND - char **__restrict ptr _AND + _CONST char *__restrict s, + char **__restrict ptr, int base) { return _strtoul_l (_REENT, s, ptr, base, __get_current_locale ()); diff --git a/newlib/libc/stdlib/strtoull.c b/newlib/libc/stdlib/strtoull.c index aff1fc7..4dfb28f 100644 --- a/newlib/libc/stdlib/strtoull.c +++ b/newlib/libc/stdlib/strtoull.c @@ -190,9 +190,9 @@ _strtoull_l (struct _reent *rptr, const char *__restrict nptr, unsigned long long _DEFUN (_strtoull_r, (rptr, nptr, endptr, base), - struct _reent *rptr _AND - _CONST char *__restrict nptr _AND - char **__restrict endptr _AND + struct _reent *rptr, + _CONST char *__restrict nptr, + char **__restrict endptr, int base) { return _strtoull_l (rptr, nptr, endptr, base, __get_current_locale ()); @@ -209,8 +209,8 @@ strtoull_l (const char *__restrict s, char **__restrict ptr, int base, unsigned long long _DEFUN (strtoull, (s, ptr, base), - _CONST char *__restrict s _AND - char **__restrict ptr _AND + _CONST char *__restrict s, + char **__restrict ptr, int base) { return _strtoull_l (_REENT, s, ptr, base, __get_current_locale ()); diff --git a/newlib/libc/stdlib/system.c b/newlib/libc/stdlib/system.c index 6cacfa5..f172e5d 100644 --- a/newlib/libc/stdlib/system.c +++ b/newlib/libc/stdlib/system.c @@ -53,12 +53,12 @@ Supporting OS subroutines required: <<_exit>>, <<_execve>>, <<_fork_r>>, #include <reent.h> #if defined (unix) || defined (__CYGWIN__) -static int _EXFUN(do_system, (struct _reent *ptr _AND _CONST char *s)); +static int _EXFUN(do_system, (struct _reent *ptr, _CONST char *s)); #endif int _DEFUN(_system_r, (ptr, s), - struct _reent *ptr _AND + struct _reent *ptr, _CONST char *s) { #if defined(HAVE_SYSTEM) @@ -111,7 +111,7 @@ static char ***p_environ = &environ; static int _DEFUN(do_system, (ptr, s), - struct _reent *ptr _AND + struct _reent *ptr, _CONST char *s) { char *argv[4]; @@ -143,7 +143,7 @@ _DEFUN(do_system, (ptr, s), #if defined (__CYGWIN__) static int _DEFUN(do_system, (ptr, s), - struct _reent *ptr _AND + struct _reent *ptr, _CONST char *s) { char *argv[4]; diff --git a/newlib/libc/stdlib/utoa.c b/newlib/libc/stdlib/utoa.c index 75e8616..cc54407 100644 --- a/newlib/libc/stdlib/utoa.c +++ b/newlib/libc/stdlib/utoa.c @@ -29,8 +29,8 @@ No supporting OS subroutine calls are required. char * _DEFUN (__utoa, (value, str, base), - unsigned value _AND - char *str _AND + unsigned value, + char *str, int base) { const char digits[] = "0123456789abcdefghijklmnopqrstuvwxyz"; @@ -68,8 +68,8 @@ _DEFUN (__utoa, (value, str, base), char * _DEFUN (utoa, (value, str, base), - unsigned value _AND - char *str _AND + unsigned value, + char *str, int base) { return __utoa (value, str, base); diff --git a/newlib/libc/stdlib/wcrtomb.c b/newlib/libc/stdlib/wcrtomb.c index df7741a..3b6cbd6 100644 --- a/newlib/libc/stdlib/wcrtomb.c +++ b/newlib/libc/stdlib/wcrtomb.c @@ -8,9 +8,9 @@ size_t _DEFUN (_wcrtomb_r, (ptr, s, wc, ps), - struct _reent *ptr _AND - char *s _AND - wchar_t wc _AND + struct _reent *ptr, + char *s, + wchar_t wc, mbstate_t *ps) { int retval = 0; @@ -42,8 +42,8 @@ _DEFUN (_wcrtomb_r, (ptr, s, wc, ps), #ifndef _REENT_ONLY size_t _DEFUN (wcrtomb, (s, wc, ps), - char *__restrict s _AND - wchar_t wc _AND + char *__restrict s, + wchar_t wc, mbstate_t *__restrict ps) { #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) diff --git a/newlib/libc/stdlib/wcsnrtombs.c b/newlib/libc/stdlib/wcsnrtombs.c index ed5f369..3561257 100644 --- a/newlib/libc/stdlib/wcsnrtombs.c +++ b/newlib/libc/stdlib/wcsnrtombs.c @@ -139,11 +139,11 @@ _wcsnrtombs_l (struct _reent *r, char *dst, const wchar_t **src, size_t nwc, size_t _DEFUN (_wcsnrtombs_r, (r, dst, src, nwc, len, ps), - struct _reent *r _AND - char *dst _AND - const wchar_t **src _AND - size_t nwc _AND - size_t len _AND + struct _reent *r, + char *dst, + const wchar_t **src, + size_t nwc, + size_t len, mbstate_t *ps) { return _wcsnrtombs_l (_REENT, dst, src, nwc, len, ps, @@ -153,10 +153,10 @@ _DEFUN (_wcsnrtombs_r, (r, dst, src, nwc, len, ps), #ifndef _REENT_ONLY size_t _DEFUN (wcsnrtombs, (dst, src, nwc, len, ps), - char *__restrict dst _AND - const wchar_t **__restrict src _AND - size_t nwc _AND - size_t len _AND + char *__restrict dst, + const wchar_t **__restrict src, + size_t nwc, + size_t len, mbstate_t *__restrict ps) { return _wcsnrtombs_l (_REENT, dst, src, nwc, len, ps, diff --git a/newlib/libc/stdlib/wcsrtombs.c b/newlib/libc/stdlib/wcsrtombs.c index 2b6777c..ac0c9de 100644 --- a/newlib/libc/stdlib/wcsrtombs.c +++ b/newlib/libc/stdlib/wcsrtombs.c @@ -6,10 +6,10 @@ size_t _DEFUN (_wcsrtombs_r, (r, dst, src, len, ps), - struct _reent *r _AND - char *dst _AND - const wchar_t **src _AND - size_t len _AND + struct _reent *r, + char *dst, + const wchar_t **src, + size_t len, mbstate_t *ps) { return _wcsnrtombs_r (r, dst, src, (size_t) -1, len, ps); @@ -18,9 +18,9 @@ _DEFUN (_wcsrtombs_r, (r, dst, src, len, ps), #ifndef _REENT_ONLY size_t _DEFUN (wcsrtombs, (dst, src, len, ps), - char *__restrict dst _AND - const wchar_t **__restrict src _AND - size_t len _AND + char *__restrict dst, + const wchar_t **__restrict src, + size_t len, mbstate_t *__restrict ps) { return _wcsnrtombs_r (_REENT, dst, src, (size_t) -1, len, ps); diff --git a/newlib/libc/stdlib/wcstod.c b/newlib/libc/stdlib/wcstod.c index 201a2c3..239f8d2 100644 --- a/newlib/libc/stdlib/wcstod.c +++ b/newlib/libc/stdlib/wcstod.c @@ -215,8 +215,8 @@ _wcstod_l (struct _reent *ptr, const wchar_t *nptr, wchar_t **endptr, double _DEFUN (_wcstod_r, (ptr, nptr, endptr), - struct _reent *ptr _AND - _CONST wchar_t *nptr _AND + struct _reent *ptr, + _CONST wchar_t *nptr, wchar_t **endptr) { return _wcstod_l (ptr, nptr, endptr, __get_current_locale ()); @@ -224,8 +224,8 @@ _DEFUN (_wcstod_r, (ptr, nptr, endptr), float _DEFUN (_wcstof_r, (ptr, nptr, endptr), - struct _reent *ptr _AND - _CONST wchar_t *nptr _AND + struct _reent *ptr, + _CONST wchar_t *nptr, wchar_t **endptr) { double retval = _wcstod_l (ptr, nptr, endptr, __get_current_locale ()); @@ -245,7 +245,7 @@ wcstod_l (const wchar_t *__restrict nptr, wchar_t **__restrict endptr, double _DEFUN (wcstod, (nptr, endptr), - _CONST wchar_t *__restrict nptr _AND wchar_t **__restrict endptr) + _CONST wchar_t *__restrict nptr, wchar_t **__restrict endptr) { return _wcstod_l (_REENT, nptr, endptr, __get_current_locale ()); } @@ -267,7 +267,7 @@ wcstof_l (const wchar_t *__restrict nptr, wchar_t **__restrict endptr, float _DEFUN (wcstof, (nptr, endptr), - _CONST wchar_t *__restrict nptr _AND + _CONST wchar_t *__restrict nptr, wchar_t **__restrict endptr) { double val = _wcstod_l (_REENT, nptr, endptr, __get_current_locale ()); diff --git a/newlib/libc/stdlib/wcstol.c b/newlib/libc/stdlib/wcstol.c index 417a46d..1f5fd4b 100644 --- a/newlib/libc/stdlib/wcstol.c +++ b/newlib/libc/stdlib/wcstol.c @@ -214,9 +214,9 @@ _wcstol_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr, long _DEFUN (_wcstol_r, (rptr, nptr, endptr, base), - struct _reent *rptr _AND - _CONST wchar_t *nptr _AND - wchar_t **endptr _AND + struct _reent *rptr, + _CONST wchar_t *nptr, + wchar_t **endptr, int base) { return _wcstol_l (rptr, nptr, endptr, base, __get_current_locale ()); @@ -233,8 +233,8 @@ wcstol_l (const wchar_t *__restrict s, wchar_t **__restrict ptr, int base, long _DEFUN (wcstol, (s, ptr, base), - _CONST wchar_t *__restrict s _AND - wchar_t **__restrict ptr _AND + _CONST wchar_t *__restrict s, + wchar_t **__restrict ptr, int base) { return _wcstol_l (_REENT, s, ptr, base, __get_current_locale ()); diff --git a/newlib/libc/stdlib/wcstoll.c b/newlib/libc/stdlib/wcstoll.c index 3a7a0e2..be95000 100644 --- a/newlib/libc/stdlib/wcstoll.c +++ b/newlib/libc/stdlib/wcstoll.c @@ -214,9 +214,9 @@ _wcstoll_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr, long long _DEFUN (_wcstoll_r, (rptr, nptr, endptr, base), - struct _reent *rptr _AND - _CONST wchar_t *nptr _AND - wchar_t **endptr _AND + struct _reent *rptr, + _CONST wchar_t *nptr, + wchar_t **endptr, int base) { return _wcstoll_l (rptr, nptr, endptr, base, __get_current_locale ()); @@ -233,8 +233,8 @@ wcstoll_l (const wchar_t *__restrict s, wchar_t **__restrict ptr, int base, long long _DEFUN (wcstoll, (s, ptr, base), - _CONST wchar_t *__restrict s _AND - wchar_t **__restrict ptr _AND + _CONST wchar_t *__restrict s, + wchar_t **__restrict ptr, int base) { return _wcstoll_l (_REENT, s, ptr, base, __get_current_locale ()); diff --git a/newlib/libc/stdlib/wcstombs.c b/newlib/libc/stdlib/wcstombs.c index 9e19378..6df2dac 100644 --- a/newlib/libc/stdlib/wcstombs.c +++ b/newlib/libc/stdlib/wcstombs.c @@ -49,8 +49,8 @@ effects vary with the locale. size_t _DEFUN (wcstombs, (s, pwcs, n), - char *__restrict s _AND - const wchar_t *__restrict pwcs _AND + char *__restrict s, + const wchar_t *__restrict pwcs, size_t n) { #ifdef _MB_CAPABLE diff --git a/newlib/libc/stdlib/wcstombs_r.c b/newlib/libc/stdlib/wcstombs_r.c index 0680cd7..d965dc2 100644 --- a/newlib/libc/stdlib/wcstombs_r.c +++ b/newlib/libc/stdlib/wcstombs_r.c @@ -4,10 +4,10 @@ size_t _DEFUN (_wcstombs_r, (reent, s, pwcs, n, state), - struct _reent *r _AND - char *__restrict s _AND - const wchar_t *__restrict pwcs _AND - size_t n _AND + struct _reent *r, + char *__restrict s, + const wchar_t *__restrict pwcs, + size_t n, mbstate_t *state) { char *ptr = s; diff --git a/newlib/libc/stdlib/wcstoul.c b/newlib/libc/stdlib/wcstoul.c index d649810..2470bfa 100644 --- a/newlib/libc/stdlib/wcstoul.c +++ b/newlib/libc/stdlib/wcstoul.c @@ -193,9 +193,9 @@ _wcstoul_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr, unsigned long _DEFUN (_wcstoul_r, (rptr, nptr, endptr, base), - struct _reent *rptr _AND - _CONST wchar_t *nptr _AND - wchar_t **endptr _AND + struct _reent *rptr, + _CONST wchar_t *nptr, + wchar_t **endptr, int base) { return _wcstoul_l (rptr, nptr, endptr, base, __get_current_locale ()); @@ -212,8 +212,8 @@ wcstoul_l (const wchar_t *__restrict s, wchar_t **__restrict ptr, int base, unsigned long _DEFUN (wcstoul, (s, ptr, base), - _CONST wchar_t *__restrict s _AND - wchar_t **__restrict ptr _AND + _CONST wchar_t *__restrict s, + wchar_t **__restrict ptr, int base) { return _wcstoul_l (_REENT, s, ptr, base, __get_current_locale ()); diff --git a/newlib/libc/stdlib/wcstoull.c b/newlib/libc/stdlib/wcstoull.c index 4bb0cd7..55ab3ca 100644 --- a/newlib/libc/stdlib/wcstoull.c +++ b/newlib/libc/stdlib/wcstoull.c @@ -209,9 +209,9 @@ _wcstoull_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr, unsigned long long _DEFUN (_wcstoull_r, (rptr, nptr, endptr, base), - struct _reent *rptr _AND - _CONST wchar_t *nptr _AND - wchar_t **endptr _AND + struct _reent *rptr, + _CONST wchar_t *nptr, + wchar_t **endptr, int base) { return _wcstoull_l (rptr, nptr, endptr, base, __get_current_locale ()); @@ -228,8 +228,8 @@ wcstoull_l (const wchar_t *__restrict s, wchar_t **__restrict ptr, int base, unsigned long long _DEFUN (wcstoull, (s, ptr, base), - _CONST wchar_t *__restrict s _AND - wchar_t **__restrict ptr _AND + _CONST wchar_t *__restrict s, + wchar_t **__restrict ptr, int base) { return _wcstoull_l (_REENT, s, ptr, base, __get_current_locale ()); diff --git a/newlib/libc/stdlib/wctomb.c b/newlib/libc/stdlib/wctomb.c index 8b267a3..b68a43b 100644 --- a/newlib/libc/stdlib/wctomb.c +++ b/newlib/libc/stdlib/wctomb.c @@ -47,7 +47,7 @@ effects vary with the locale. int _DEFUN (wctomb, (s, wchar), - char *s _AND + char *s, wchar_t wchar) { #ifdef _MB_CAPABLE diff --git a/newlib/libc/stdlib/wctomb_r.c b/newlib/libc/stdlib/wctomb_r.c index 2c018f9..7c4fac1 100644 --- a/newlib/libc/stdlib/wctomb_r.c +++ b/newlib/libc/stdlib/wctomb_r.c @@ -8,9 +8,9 @@ int _DEFUN (_wctomb_r, (r, s, wchar, state), - struct _reent *r _AND - char *s _AND - wchar_t _wchar _AND + struct _reent *r, + char *s, + wchar_t _wchar, mbstate_t *state) { return __WCTOMB (r, s, _wchar, state); @@ -18,9 +18,9 @@ _DEFUN (_wctomb_r, (r, s, wchar, state), int _DEFUN (__ascii_wctomb, (r, s, wchar, state), - struct _reent *r _AND - char *s _AND - wchar_t _wchar _AND + struct _reent *r, + char *s, + wchar_t _wchar, mbstate_t *state) { /* Avoids compiler warnings about comparisons that are always false @@ -51,9 +51,9 @@ _DEFUN (__ascii_wctomb, (r, s, wchar, state), int _DEFUN (__utf8_wctomb, (r, s, wchar, state), - struct _reent *r _AND - char *s _AND - wchar_t _wchar _AND + struct _reent *r, + char *s, + wchar_t _wchar, mbstate_t *state) { wint_t wchar = _wchar; @@ -145,9 +145,9 @@ _DEFUN (__utf8_wctomb, (r, s, wchar, state), #ifndef __CYGWIN__ int _DEFUN (__sjis_wctomb, (r, s, wchar, state), - struct _reent *r _AND - char *s _AND - wchar_t _wchar _AND + struct _reent *r, + char *s, + wchar_t _wchar, mbstate_t *state) { wint_t wchar = _wchar; @@ -179,9 +179,9 @@ _DEFUN (__sjis_wctomb, (r, s, wchar, state), int _DEFUN (__eucjp_wctomb, (r, s, wchar, state), - struct _reent *r _AND - char *s _AND - wchar_t _wchar _AND + struct _reent *r, + char *s, + wchar_t _wchar, mbstate_t *state) { wint_t wchar = _wchar; @@ -219,9 +219,9 @@ _DEFUN (__eucjp_wctomb, (r, s, wchar, state), int _DEFUN (__jis_wctomb, (r, s, wchar, state), - struct _reent *r _AND - char *s _AND - wchar_t _wchar _AND + struct _reent *r, + char *s, + wchar_t _wchar, mbstate_t *state) { wint_t wchar = _wchar; |