* [PATCH v2 00/17] Newlib ANSI-fication
@ 2017-12-07 18:19 Yaakov Selkowitz
2017-12-07 18:19 ` [PATCH v2 04/17] ansification: remove _NOARGS Yaakov Selkowitz
` (17 more replies)
0 siblings, 18 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:19 UTC (permalink / raw)
To: newlib
Yaakov Selkowitz (17):
ansification: remove _AND
ansification: remove _CONST
ansification: remove _DOTS
ansification: remove _NOARGS
ansification: remove _PARAMS
ansification: remove _VOID_PTR
ansification: remove _PTR
ansification: remove _CAST_VOID
ansification: remove _DEFUN_VOID
ansification: remove _VOID
ansification: remove _VOLATILE, _SIGNED
ansification: remove _DEFUN
ansification: remove _EXFNPTR, _EXPARM
ansification: remove _EXFUN, _EXFUN_NOTHROW
ansification: remove _HAVE_STDC
ansification: fix makedoc for ANSI C
ansification: remove ansidecl.h from makedoc
libgloss/aarch64/_exit.c | 2 +-
libgloss/aarch64/_kill.c | 2 +-
libgloss/aarch64/svc.h | 6 +-
libgloss/aarch64/syscalls.c | 64 +--
libgloss/arm/_exit.c | 4 +-
libgloss/arm/_kill.c | 2 +-
libgloss/arm/swi.h | 6 +-
libgloss/arm/syscalls.c | 64 +--
libgloss/bfin/_exit.c | 5 +-
libgloss/close.c | 3 +-
libgloss/cr16/fstat.c | 3 +-
libgloss/cr16/getpid.c | 3 +-
libgloss/cr16/isatty.c | 5 +-
libgloss/cr16/kill.c | 3 +-
libgloss/cr16/putnum.c | 3 +-
libgloss/cr16/stat.c | 3 +-
libgloss/crx/fstat.c | 3 +-
libgloss/crx/getpid.c | 3 +-
libgloss/crx/isatty.c | 5 +-
libgloss/crx/kill.c | 3 +-
libgloss/crx/putnum.c | 3 +-
libgloss/crx/stat.c | 3 +-
libgloss/epiphany/_isatty.c | 2 +-
libgloss/frv/fstat.c | 3 +-
libgloss/frv/getpid.c | 3 +-
libgloss/frv/isatty.c | 5 +-
libgloss/frv/kill.c | 3 +-
libgloss/frv/print.c | 3 +-
libgloss/frv/putnum.c | 3 +-
libgloss/frv/sim-time.c | 9 +-
libgloss/frv/stat.c | 3 +-
libgloss/fstat.c | 3 +-
libgloss/ft32/fstat.c | 3 +-
libgloss/ft32/getpid.c | 3 +-
libgloss/ft32/isatty.c | 5 +-
libgloss/ft32/kill.c | 3 +-
libgloss/ft32/sim-lseek.S | 5 +-
libgloss/ft32/sim-lseek.c | 5 +-
libgloss/ft32/sim-time.c | 6 +-
libgloss/ft32/stat.c | 3 +-
libgloss/getpid.c | 3 +-
libgloss/isatty.c | 5 +-
libgloss/kill.c | 3 +-
libgloss/libnosys/_exit.c | 5 +-
libgloss/libnosys/chown.c | 5 +-
libgloss/libnosys/close.c | 3 +-
libgloss/libnosys/execve.c | 5 +-
libgloss/libnosys/fork.c | 3 +-
libgloss/libnosys/fstat.c | 3 +-
libgloss/libnosys/getpid.c | 3 +-
libgloss/libnosys/gettod.c | 3 +-
libgloss/libnosys/isatty.c | 3 +-
libgloss/libnosys/kill.c | 3 +-
libgloss/libnosys/link.c | 3 +-
libgloss/libnosys/lseek.c | 5 +-
libgloss/libnosys/open.c | 5 +-
libgloss/libnosys/read.c | 5 +-
libgloss/libnosys/readlink.c | 5 +-
libgloss/libnosys/stat.c | 3 +-
libgloss/libnosys/symlink.c | 3 +-
libgloss/libnosys/times.c | 3 +-
libgloss/libnosys/unlink.c | 3 +-
libgloss/libnosys/wait.c | 3 +-
libgloss/libnosys/write.c | 5 +-
libgloss/lm32/isatty.c | 3 +-
libgloss/lseek.c | 5 +-
libgloss/m68k/idp-inbyte.c | 2 +-
libgloss/m68k/idp-outbyte.c | 6 +-
libgloss/m68k/mc68ec.c | 6 +-
libgloss/m68k/mvme-stub.c | 8 +-
libgloss/mcore/close.c | 3 +-
libgloss/mcore/cmb-exit.c | 3 +-
libgloss/mcore/cmb-inbyte.c | 3 +-
libgloss/mcore/cmb-outbyte.c | 3 +-
libgloss/mcore/fstat.c | 3 +-
libgloss/mcore/getpid.c | 3 +-
libgloss/mcore/kill.c | 3 +-
libgloss/mcore/lseek.c | 5 +-
libgloss/mcore/open.c | 5 +-
libgloss/mcore/print.c | 3 +-
libgloss/mcore/putnum.c | 3 +-
libgloss/mcore/raise.c | 3 +-
libgloss/mcore/read.c | 7 +-
libgloss/mcore/stat.c | 3 +-
libgloss/mcore/unlink.c | 3 +-
libgloss/mcore/write.c | 7 +-
libgloss/moxie/fstat.c | 3 +-
libgloss/moxie/getpid.c | 3 +-
libgloss/moxie/isatty.c | 5 +-
libgloss/moxie/kill.c | 3 +-
libgloss/moxie/print.c | 3 +-
libgloss/moxie/putnum.c | 3 +-
libgloss/moxie/qemu-time.c | 9 +-
libgloss/moxie/sim-lseek.S | 5 +-
libgloss/moxie/sim-lseek.c | 5 +-
libgloss/moxie/sim-time.c | 9 +-
libgloss/moxie/stat.c | 3 +-
libgloss/open.c | 5 +-
libgloss/print.c | 3 +-
libgloss/putnum.c | 3 +-
libgloss/read.c | 7 +-
libgloss/sparc_leon/asm-leon/clock.h | 4 +-
libgloss/sparc_leon/console_dbg.c | 4 -
libgloss/spu/getpid.c | 2 +-
libgloss/stat.c | 3 +-
libgloss/tic6x/getpid.c | 3 +-
libgloss/tic6x/kill.c | 3 +-
libgloss/unlink.c | 3 +-
libgloss/write.c | 7 +-
libgloss/xc16x/misc.c | 8 +-
libgloss/xstormy16/close.c | 3 +-
libgloss/xstormy16/fstat.c | 3 +-
libgloss/xstormy16/getpid.c | 3 +-
libgloss/xstormy16/isatty.c | 5 +-
libgloss/xstormy16/kill.c | 3 +-
libgloss/xstormy16/lseek.c | 5 +-
libgloss/xstormy16/open.c | 5 +-
libgloss/xstormy16/stat.c | 3 +-
libgloss/xstormy16/unlink.c | 3 +-
newlib/doc/ansidecl.h | 116 -----
newlib/doc/makedoc.c | 136 +++---
newlib/libc/argz/argz_add.c | 5 +-
newlib/libc/argz/argz_add_sep.c | 7 +-
newlib/libc/argz/argz_append.c | 7 +-
newlib/libc/argz/argz_count.c | 3 +-
newlib/libc/argz/argz_create.c | 5 +-
newlib/libc/argz/argz_create_sep.c | 7 +-
newlib/libc/argz/argz_delete.c | 5 +-
newlib/libc/argz/argz_extract.c | 5 +-
newlib/libc/argz/argz_insert.c | 7 +-
newlib/libc/argz/argz_next.c | 5 +-
newlib/libc/argz/argz_replace.c | 9 +-
newlib/libc/argz/argz_stringify.c | 5 +-
newlib/libc/argz/envz_add.c | 7 +-
newlib/libc/argz/envz_entry.c | 5 +-
newlib/libc/argz/envz_get.c | 5 +-
newlib/libc/argz/envz_merge.c | 9 +-
newlib/libc/argz/envz_remove.c | 5 +-
newlib/libc/argz/envz_strip.c | 3 +-
newlib/libc/ctype/ctype_.c | 6 +-
newlib/libc/ctype/ctype_.h | 2 +-
newlib/libc/ctype/ctype_cp.h | 4 +-
newlib/libc/ctype/ctype_iso.h | 4 +-
newlib/libc/ctype/isalnum.c | 2 +-
newlib/libc/ctype/isalpha.c | 2 +-
newlib/libc/ctype/isascii.c | 2 +-
newlib/libc/ctype/isblank.c | 2 +-
newlib/libc/ctype/iscntrl.c | 2 +-
newlib/libc/ctype/isdigit.c | 2 +-
newlib/libc/ctype/islower.c | 2 +-
newlib/libc/ctype/isprint.c | 4 +-
newlib/libc/ctype/ispunct.c | 2 +-
newlib/libc/ctype/isspace.c | 2 +-
newlib/libc/ctype/isupper.c | 2 +-
newlib/libc/ctype/iswalnum.c | 2 +-
newlib/libc/ctype/iswalpha.c | 2 +-
newlib/libc/ctype/iswblank.c | 2 +-
newlib/libc/ctype/iswcntrl.c | 2 +-
newlib/libc/ctype/iswctype.c | 2 +-
newlib/libc/ctype/iswdigit.c | 2 +-
newlib/libc/ctype/iswgraph.c | 2 +-
newlib/libc/ctype/iswlower.c | 2 +-
newlib/libc/ctype/iswprint.c | 2 +-
newlib/libc/ctype/iswpunct.c | 2 +-
newlib/libc/ctype/iswspace.c | 2 +-
newlib/libc/ctype/iswupper.c | 2 +-
newlib/libc/ctype/iswxdigit.c | 2 +-
newlib/libc/ctype/isxdigit.c | 2 +-
newlib/libc/ctype/jp2uc.c | 4 +-
newlib/libc/ctype/local.h | 2 +-
newlib/libc/ctype/toascii.c | 2 +-
newlib/libc/ctype/tolower.c | 2 +-
newlib/libc/ctype/toupper.c | 2 +-
newlib/libc/ctype/towctrans.c | 8 +-
newlib/libc/ctype/towlower.c | 2 +-
newlib/libc/ctype/towupper.c | 2 +-
newlib/libc/ctype/wctrans.c | 6 +-
newlib/libc/ctype/wctype.c | 6 +-
newlib/libc/iconv/ccs/big5.c | 10 +-
newlib/libc/iconv/ccs/ccs.h | 10 +-
newlib/libc/iconv/ccs/ccsbi.c | 2 +-
newlib/libc/iconv/ccs/ccsbi.h | 82 ++--
newlib/libc/iconv/ccs/cns11643_plane1.c | 10 +-
newlib/libc/iconv/ccs/cns11643_plane14.c | 10 +-
newlib/libc/iconv/ccs/cns11643_plane2.c | 10 +-
newlib/libc/iconv/ccs/cp775.c | 6 +-
newlib/libc/iconv/ccs/cp850.c | 6 +-
newlib/libc/iconv/ccs/cp852.c | 6 +-
newlib/libc/iconv/ccs/cp855.c | 6 +-
newlib/libc/iconv/ccs/cp866.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_1.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_10.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_11.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_13.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_14.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_15.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_2.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_3.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_4.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_5.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_6.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_7.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_8.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_9.c | 6 +-
newlib/libc/iconv/ccs/iso_ir_111.c | 6 +-
newlib/libc/iconv/ccs/jis_x0201_1976.c | 6 +-
newlib/libc/iconv/ccs/jis_x0208_1990.c | 10 +-
newlib/libc/iconv/ccs/jis_x0212_1990.c | 10 +-
newlib/libc/iconv/ccs/koi8_r.c | 6 +-
newlib/libc/iconv/ccs/koi8_ru.c | 6 +-
newlib/libc/iconv/ccs/koi8_u.c | 6 +-
newlib/libc/iconv/ccs/koi8_uni.c | 6 +-
newlib/libc/iconv/ccs/ksx1001.c | 10 +-
newlib/libc/iconv/ccs/mktbl.pl | 14 +-
newlib/libc/iconv/ccs/win_1250.c | 6 +-
newlib/libc/iconv/ccs/win_1251.c | 6 +-
newlib/libc/iconv/ccs/win_1252.c | 6 +-
newlib/libc/iconv/ccs/win_1253.c | 6 +-
newlib/libc/iconv/ccs/win_1254.c | 6 +-
newlib/libc/iconv/ccs/win_1255.c | 6 +-
newlib/libc/iconv/ccs/win_1256.c | 6 +-
newlib/libc/iconv/ccs/win_1257.c | 6 +-
newlib/libc/iconv/ccs/win_1258.c | 6 +-
newlib/libc/iconv/ces/cesbi.c | 68 +--
newlib/libc/iconv/ces/cesbi.h | 40 +-
newlib/libc/iconv/ces/euc.c | 57 +--
newlib/libc/iconv/ces/mkdeps.pl | 24 +-
newlib/libc/iconv/ces/table-pcs.c | 46 +-
newlib/libc/iconv/ces/table.c | 124 +++--
newlib/libc/iconv/ces/ucs-2-internal.c | 19 +-
newlib/libc/iconv/ces/ucs-2.c | 35 +-
newlib/libc/iconv/ces/ucs-4-internal.c | 19 +-
newlib/libc/iconv/ces/ucs-4.c | 35 +-
newlib/libc/iconv/ces/us-ascii.c | 19 +-
newlib/libc/iconv/ces/utf-16.c | 46 +-
newlib/libc/iconv/ces/utf-8.c | 21 +-
newlib/libc/iconv/lib/aliasesbi.c | 2 +-
newlib/libc/iconv/lib/aliasesi.c | 41 +-
newlib/libc/iconv/lib/conv.h | 60 +--
newlib/libc/iconv/lib/iconv.c | 63 ++-
newlib/libc/iconv/lib/iconvnls.c | 78 ++--
newlib/libc/iconv/lib/local.h | 5 +-
newlib/libc/iconv/lib/nullconv.c | 50 +-
newlib/libc/iconv/lib/ucsconv.c | 73 ++-
newlib/libc/iconv/lib/ucsconv.h | 88 ++--
newlib/libc/include/_ansi.h | 60 +--
newlib/libc/include/alloca.h | 2 +-
newlib/libc/include/assert.h | 8 +-
newlib/libc/include/ctype.h | 34 +-
newlib/libc/include/envlock.h | 4 +-
newlib/libc/include/getopt.h | 28 +-
newlib/libc/include/iconv.h | 16 +-
newlib/libc/include/ieeefp.h | 16 +-
newlib/libc/include/libgen.h | 4 +-
newlib/libc/include/locale.h | 8 +-
newlib/libc/include/machine/fastmath.h | 2 -
newlib/libc/include/malloc.h | 54 +--
newlib/libc/include/math.h | 448 +++++++++---------
newlib/libc/include/pthread.h | 352 +++++++-------
newlib/libc/include/reent.h | 50 +-
newlib/libc/include/rpc/xdr.h | 128 +++---
newlib/libc/include/setjmp.h | 6 +-
newlib/libc/include/signal.h | 10 +-
newlib/libc/include/spawn.h | 81 ++--
newlib/libc/include/stdio.h | 662 +++++++++++++--------------
newlib/libc/include/stdio_ext.h | 18 +-
newlib/libc/include/stdlib.h | 276 +++++------
newlib/libc/include/string.h | 104 ++---
newlib/libc/include/sys/_default_fcntl.h | 18 +-
newlib/libc/include/sys/errno.h | 4 +-
newlib/libc/include/sys/iconvnls.h | 28 +-
newlib/libc/include/sys/lock.h | 20 +-
newlib/libc/include/sys/reent.h | 42 +-
newlib/libc/include/sys/resource.h | 2 +-
newlib/libc/include/sys/signal.h | 47 +-
newlib/libc/include/sys/stat.h | 42 +-
newlib/libc/include/sys/stdio.h | 4 +-
newlib/libc/include/sys/time.h | 24 +-
newlib/libc/include/sys/timeb.h | 2 +-
newlib/libc/include/sys/times.h | 4 +-
newlib/libc/include/sys/unistd.h | 266 +++++------
newlib/libc/include/time.h | 85 ++--
newlib/libc/include/unctrl.h | 4 +-
newlib/libc/include/wchar.h | 326 ++++++-------
newlib/libc/include/wctype.h | 36 +-
newlib/libc/locale/locale.c | 14 +-
newlib/libc/locale/localeconv.c | 5 +-
newlib/libc/machine/cris/sys/errno.h | 4 +-
newlib/libc/machine/cris/sys/fcntl.h | 12 +-
newlib/libc/machine/microblaze/abort.c | 4 +-
newlib/libc/machine/microblaze/strcmp.c | 5 +-
newlib/libc/machine/microblaze/strcpy.c | 9 +-
newlib/libc/machine/microblaze/strlen.c | 7 +-
newlib/libc/machine/nds32/abort.c | 4 +-
newlib/libc/machine/powerpc/atosfix16.c | 8 +-
newlib/libc/machine/powerpc/atosfix32.c | 8 +-
newlib/libc/machine/powerpc/atosfix64.c | 8 +-
newlib/libc/machine/powerpc/atoufix16.c | 8 +-
newlib/libc/machine/powerpc/atoufix32.c | 8 +-
newlib/libc/machine/powerpc/atoufix64.c | 8 +-
newlib/libc/machine/powerpc/machine/malloc.h | 12 +-
newlib/libc/machine/powerpc/machine/stdlib.h | 78 ++--
newlib/libc/machine/powerpc/strtosfix16.c | 8 +-
newlib/libc/machine/powerpc/strtosfix32.c | 8 +-
newlib/libc/machine/powerpc/strtosfix64.c | 8 +-
newlib/libc/machine/powerpc/strtoufix16.c | 8 +-
newlib/libc/machine/powerpc/strtoufix32.c | 8 +-
newlib/libc/machine/powerpc/strtoufix64.c | 8 +-
newlib/libc/machine/powerpc/ufix64toa.c | 17 +-
newlib/libc/machine/powerpc/vec_calloc.c | 5 +-
newlib/libc/machine/powerpc/vec_free.c | 3 +-
newlib/libc/machine/powerpc/vec_malloc.c | 5 +-
newlib/libc/machine/powerpc/vec_realloc.c | 5 +-
newlib/libc/machine/powerpc/vfprintf.c | 42 +-
newlib/libc/machine/powerpc/vfscanf.c | 30 +-
newlib/libc/machine/spu/assert.c | 12 +-
newlib/libc/machine/spu/c99ppe.h | 4 +-
newlib/libc/machine/spu/clearerr.c | 5 +-
newlib/libc/machine/spu/creat.c | 3 +-
newlib/libc/machine/spu/fclose.c | 3 +-
newlib/libc/machine/spu/fdopen.c | 5 +-
newlib/libc/machine/spu/feof.c | 3 +-
newlib/libc/machine/spu/ferror.c | 3 +-
newlib/libc/machine/spu/fflush.c | 3 +-
newlib/libc/machine/spu/fgetc.c | 3 +-
newlib/libc/machine/spu/fgetpos.c | 3 +-
newlib/libc/machine/spu/fgets.c | 5 +-
newlib/libc/machine/spu/fileno.c | 3 +-
newlib/libc/machine/spu/fopen.c | 9 +-
newlib/libc/machine/spu/fputs.c | 5 +-
newlib/libc/machine/spu/fread.c | 7 +-
newlib/libc/machine/spu/freopen.c | 9 +-
newlib/libc/machine/spu/fseek.c | 5 +-
newlib/libc/machine/spu/fsetpos.c | 7 +-
newlib/libc/machine/spu/ftell.c | 3 +-
newlib/libc/machine/spu/fwrite.c | 9 +-
newlib/libc/machine/spu/impure.c | 2 +-
newlib/libc/machine/spu/perror.c | 5 +-
newlib/libc/machine/spu/puts.c | 3 +-
newlib/libc/machine/spu/remove.c | 2 +-
newlib/libc/machine/spu/rename.c | 8 +-
newlib/libc/machine/spu/rewind.c | 3 +-
newlib/libc/machine/spu/setbuf.c | 3 +-
newlib/libc/machine/spu/setvbuf.c | 7 +-
newlib/libc/machine/spu/stdio.c | 17 +-
newlib/libc/machine/spu/sys/errno.h | 2 +-
newlib/libc/machine/spu/tmpfile.c | 2 +-
newlib/libc/machine/spu/tmpnam.c | 3 +-
newlib/libc/machine/spu/vfprintf.c | 9 +-
newlib/libc/machine/spu/vfscanf.c | 9 +-
newlib/libc/machine/spu/vprintf.c | 9 +-
newlib/libc/machine/spu/vscanf.c | 7 +-
newlib/libc/machine/spu/vsnprintf.c | 13 +-
newlib/libc/machine/spu/vsprintf.c | 9 +-
newlib/libc/machine/spu/vsscanf.c | 13 +-
newlib/libc/machine/xscale/strlen.c | 2 +-
newlib/libc/machine/xstormy16/mallocr.c | 10 +-
newlib/libc/misc/__dprintf.c | 24 +-
newlib/libc/misc/unctrl.c | 4 +-
newlib/libc/posix/_isatty.c | 2 +-
newlib/libc/posix/closedir.c | 3 +-
newlib/libc/posix/creat.c | 3 +-
newlib/libc/posix/execl.c | 23 +-
newlib/libc/posix/execle.c | 27 +-
newlib/libc/posix/execlp.c | 23 +-
newlib/libc/posix/execv.c | 5 +-
newlib/libc/posix/execve.c | 5 +-
newlib/libc/posix/execvp.c | 10 +-
newlib/libc/posix/isatty.c | 2 +-
newlib/libc/posix/opendir.c | 3 +-
newlib/libc/posix/popen.c | 6 +-
newlib/libc/posix/posix_spawn.c | 109 ++---
newlib/libc/posix/readdir.c | 3 +-
newlib/libc/posix/readdir_r.c | 5 +-
newlib/libc/posix/rewinddir.c | 3 +-
newlib/libc/posix/scandir.c | 10 +-
newlib/libc/posix/seekdir.c | 3 +-
newlib/libc/posix/telldir.c | 9 +-
newlib/libc/reent/execr.c | 15 +-
newlib/libc/reent/fcntlr.c | 7 +-
newlib/libc/reent/fstat64r.c | 5 +-
newlib/libc/reent/getreent.c | 2 +-
newlib/libc/reent/gettimeofdayr.c | 5 +-
newlib/libc/reent/impure.c | 2 +-
newlib/libc/reent/linkr.c | 7 +-
newlib/libc/reent/lseek64r.c | 7 +-
newlib/libc/reent/lseekr.c | 7 +-
newlib/libc/reent/mkdirr.c | 5 +-
newlib/libc/reent/open64r.c | 2 +-
newlib/libc/reent/openr.c | 7 +-
newlib/libc/reent/readr.c | 7 +-
newlib/libc/reent/reent.c | 6 +-
newlib/libc/reent/renamer.c | 7 +-
newlib/libc/reent/sbrkr.c | 3 +-
newlib/libc/reent/signalr.c | 8 +-
newlib/libc/reent/signgam.c | 2 +-
newlib/libc/reent/stat64r.c | 5 +-
newlib/libc/reent/statr.c | 5 +-
newlib/libc/reent/timesr.c | 3 +-
newlib/libc/reent/unlinkr.c | 5 +-
newlib/libc/reent/writer.c | 7 +-
newlib/libc/search/bsearch.c | 17 +-
newlib/libc/search/hash.c | 9 +-
newlib/libc/search/hcreate.c | 7 +-
newlib/libc/search/qsort.c | 45 +-
newlib/libc/search/tdelete.c | 5 +-
newlib/libc/search/tdestroy.c | 3 +-
newlib/libc/search/tfind.c | 5 +-
newlib/libc/search/tsearch.c | 5 +-
newlib/libc/search/twalk.c | 3 +-
newlib/libc/signal/psignal.c | 7 +-
newlib/libc/signal/raise.c | 6 +-
newlib/libc/signal/signal.c | 24 +-
newlib/libc/stdio/asiprintf.c | 12 +-
newlib/libc/stdio/asniprintf.c | 16 +-
newlib/libc/stdio/asnprintf.c | 24 +-
newlib/libc/stdio/asprintf.c | 20 +-
newlib/libc/stdio/clearerr.c | 5 +-
newlib/libc/stdio/clearerr_u.c | 5 +-
newlib/libc/stdio/diprintf.c | 12 +-
newlib/libc/stdio/dprintf.c | 20 +-
newlib/libc/stdio/fclose.c | 6 +-
newlib/libc/stdio/fcloseall.c | 5 +-
newlib/libc/stdio/fdopen.c | 14 +-
newlib/libc/stdio/feof.c | 3 +-
newlib/libc/stdio/feof_u.c | 3 +-
newlib/libc/stdio/ferror.c | 3 +-
newlib/libc/stdio/ferror_u.c | 3 +-
newlib/libc/stdio/fflush.c | 12 +-
newlib/libc/stdio/fgetc.c | 6 +-
newlib/libc/stdio/fgetc_u.c | 6 +-
newlib/libc/stdio/fgetpos.c | 8 +-
newlib/libc/stdio/fgets.c | 18 +-
newlib/libc/stdio/fgetwc.c | 9 +-
newlib/libc/stdio/fgetwc_u.c | 6 +-
newlib/libc/stdio/fgetws.c | 12 +-
newlib/libc/stdio/fileno.c | 3 +-
newlib/libc/stdio/fileno_u.c | 3 +-
newlib/libc/stdio/findfp.c | 65 ++-
newlib/libc/stdio/fiprintf.c | 12 +-
newlib/libc/stdio/fiscanf.c | 31 +-
newlib/libc/stdio/flags.c | 5 +-
newlib/libc/stdio/fmemopen.c | 43 +-
newlib/libc/stdio/fopen.c | 14 +-
newlib/libc/stdio/fopencookie.c | 43 +-
newlib/libc/stdio/fprintf.c | 20 +-
newlib/libc/stdio/fpurge.c | 9 +-
newlib/libc/stdio/fputc.c | 8 +-
newlib/libc/stdio/fputc_u.c | 8 +-
newlib/libc/stdio/fputs.c | 10 +-
newlib/libc/stdio/fputwc.c | 13 +-
newlib/libc/stdio/fputwc_u.c | 8 +-
newlib/libc/stdio/fputws.c | 8 +-
newlib/libc/stdio/fread.c | 31 +-
newlib/libc/stdio/freopen.c | 14 +-
newlib/libc/stdio/fscanf.c | 39 +-
newlib/libc/stdio/fseek.c | 12 +-
newlib/libc/stdio/fseeko.c | 14 +-
newlib/libc/stdio/fsetlocking.c | 3 +-
newlib/libc/stdio/fsetpos.c | 12 +-
newlib/libc/stdio/ftell.c | 6 +-
newlib/libc/stdio/ftello.c | 6 +-
newlib/libc/stdio/funopen.c | 51 +--
newlib/libc/stdio/fvwrite.c | 11 +-
newlib/libc/stdio/fvwrite.h | 6 +-
newlib/libc/stdio/fwalk.c | 6 +-
newlib/libc/stdio/fwide.c | 8 +-
newlib/libc/stdio/fwprintf.c | 12 +-
newlib/libc/stdio/fwrite.c | 18 +-
newlib/libc/stdio/fwscanf.c | 4 +-
newlib/libc/stdio/getc.c | 6 +-
newlib/libc/stdio/getc_u.c | 6 +-
newlib/libc/stdio/getchar.c | 5 +-
newlib/libc/stdio/getchar_u.c | 5 +-
newlib/libc/stdio/getdelim.c | 7 +-
newlib/libc/stdio/getline.c | 7 +-
newlib/libc/stdio/gets.c | 6 +-
newlib/libc/stdio/getw.c | 3 +-
newlib/libc/stdio/getwc.c | 6 +-
newlib/libc/stdio/getwc_u.c | 6 +-
newlib/libc/stdio/getwchar.c | 5 +-
newlib/libc/stdio/getwchar_u.c | 5 +-
newlib/libc/stdio/iprintf.c | 8 +-
newlib/libc/stdio/iscanf.c | 29 +-
newlib/libc/stdio/local.h | 112 ++---
newlib/libc/stdio/makebuf.c | 14 +-
newlib/libc/stdio/mktemp.c | 57 +--
newlib/libc/stdio/nano-vfprintf.c | 63 ++-
newlib/libc/stdio/nano-vfprintf_float.c | 2 +-
newlib/libc/stdio/nano-vfprintf_i.c | 4 +-
newlib/libc/stdio/nano-vfprintf_local.h | 12 +-
newlib/libc/stdio/nano-vfscanf.c | 54 +--
newlib/libc/stdio/nano-vfscanf_i.c | 2 +-
newlib/libc/stdio/open_memstream.c | 47 +-
newlib/libc/stdio/perror.c | 12 +-
newlib/libc/stdio/printf.c | 16 +-
newlib/libc/stdio/putc.c | 8 +-
newlib/libc/stdio/putc_u.c | 8 +-
newlib/libc/stdio/putchar.c | 6 +-
newlib/libc/stdio/putchar_u.c | 6 +-
newlib/libc/stdio/puts.c | 8 +-
newlib/libc/stdio/putw.c | 5 +-
newlib/libc/stdio/putwc.c | 8 +-
newlib/libc/stdio/putwc_u.c | 8 +-
newlib/libc/stdio/putwchar.c | 6 +-
newlib/libc/stdio/putwchar_u.c | 6 +-
newlib/libc/stdio/refill.c | 8 +-
newlib/libc/stdio/remove.c | 8 +-
newlib/libc/stdio/rename.c | 5 +-
newlib/libc/stdio/rewind.c | 12 +-
newlib/libc/stdio/rget.c | 6 +-
newlib/libc/stdio/scanf.c | 37 +-
newlib/libc/stdio/sccl.c | 3 +-
newlib/libc/stdio/setbuf.c | 7 +-
newlib/libc/stdio/setbuffer.c | 9 +-
newlib/libc/stdio/setlinebuf.c | 3 +-
newlib/libc/stdio/setvbuf.c | 9 +-
newlib/libc/stdio/siprintf.c | 39 +-
newlib/libc/stdio/siscanf.c | 41 +-
newlib/libc/stdio/sniprintf.c | 45 +-
newlib/libc/stdio/snprintf.c | 53 +--
newlib/libc/stdio/sprintf.c | 47 +-
newlib/libc/stdio/sscanf.c | 49 +-
newlib/libc/stdio/stdio.c | 34 +-
newlib/libc/stdio/stdio_ext.c | 21 +-
newlib/libc/stdio/swprintf.c | 16 +-
newlib/libc/stdio/swscanf.c | 4 +-
newlib/libc/stdio/tmpfile.c | 7 +-
newlib/libc/stdio/tmpnam.c | 31 +-
newlib/libc/stdio/ungetc.c | 15 +-
newlib/libc/stdio/ungetwc.c | 8 +-
newlib/libc/stdio/vasiprintf.c | 12 +-
newlib/libc/stdio/vasniprintf.c | 16 +-
newlib/libc/stdio/vasnprintf.c | 24 +-
newlib/libc/stdio/vasprintf.c | 20 +-
newlib/libc/stdio/vdiprintf.c | 12 +-
newlib/libc/stdio/vdprintf.c | 20 +-
newlib/libc/stdio/vfprintf.c | 108 ++---
newlib/libc/stdio/vfscanf.c | 55 +--
newlib/libc/stdio/vfwprintf.c | 66 ++-
newlib/libc/stdio/vfwscanf.c | 46 +-
newlib/libc/stdio/viprintf.c | 12 +-
newlib/libc/stdio/viscanf.c | 12 +-
newlib/libc/stdio/vprintf.c | 18 +-
newlib/libc/stdio/vscanf.c | 18 +-
newlib/libc/stdio/vsiprintf.c | 12 +-
newlib/libc/stdio/vsiscanf.c | 16 +-
newlib/libc/stdio/vsniprintf.c | 16 +-
newlib/libc/stdio/vsnprintf.c | 24 +-
newlib/libc/stdio/vsprintf.c | 20 +-
newlib/libc/stdio/vsscanf.c | 24 +-
newlib/libc/stdio/vswprintf.c | 16 +-
newlib/libc/stdio/vswscanf.c | 8 +-
newlib/libc/stdio/vwprintf.c | 8 +-
newlib/libc/stdio/vwscanf.c | 8 +-
newlib/libc/stdio/wbuf.c | 8 +-
newlib/libc/stdio/wprintf.c | 8 +-
newlib/libc/stdio/wscanf.c | 4 +-
newlib/libc/stdio/wsetup.c | 3 +-
newlib/libc/stdio64/fdopen64.c | 14 +-
newlib/libc/stdio64/fgetpos64.c | 8 +-
newlib/libc/stdio64/fopen64.c | 14 +-
newlib/libc/stdio64/freopen64.c | 14 +-
newlib/libc/stdio64/fseeko64.c | 14 +-
newlib/libc/stdio64/fsetpos64.c | 12 +-
newlib/libc/stdio64/ftello64.c | 6 +-
newlib/libc/stdio64/stdio64.c | 14 +-
newlib/libc/stdio64/tmpfile64.c | 7 +-
newlib/libc/stdlib/_Exit.c | 3 +-
newlib/libc/stdlib/__adjust.c | 7 +-
newlib/libc/stdlib/__atexit.c | 8 +-
newlib/libc/stdlib/__call_atexit.c | 7 +-
newlib/libc/stdlib/__exp10.c | 5 +-
newlib/libc/stdlib/__ten_mu.c | 3 +-
newlib/libc/stdlib/a64l.c | 3 +-
newlib/libc/stdlib/abort.c | 4 +-
newlib/libc/stdlib/abs.c | 2 +-
newlib/libc/stdlib/assert.c | 12 +-
newlib/libc/stdlib/atexit.c | 4 +-
newlib/libc/stdlib/atexit.h | 4 +-
newlib/libc/stdlib/atof.c | 3 +-
newlib/libc/stdlib/atoff.c | 3 +-
newlib/libc/stdlib/atoi.c | 8 +-
newlib/libc/stdlib/atol.c | 4 +-
newlib/libc/stdlib/atoll.c | 8 +-
newlib/libc/stdlib/calloc.c | 5 +-
newlib/libc/stdlib/cxa_atexit.c | 8 +-
newlib/libc/stdlib/cxa_finalize.c | 3 +-
newlib/libc/stdlib/div.c | 3 +-
newlib/libc/stdlib/drand48.c | 5 +-
newlib/libc/stdlib/dtoa.c | 18 +-
newlib/libc/stdlib/dtoastub.c | 12 +-
newlib/libc/stdlib/ecvtbuf.c | 66 ++-
newlib/libc/stdlib/efgcvt.c | 38 +-
newlib/libc/stdlib/erand48.c | 6 +-
newlib/libc/stdlib/exit.c | 5 +-
newlib/libc/stdlib/gdtoa-gethex.c | 15 +-
newlib/libc/stdlib/gdtoa-hexnan.c | 19 +-
newlib/libc/stdlib/getenv.c | 6 +-
newlib/libc/stdlib/getenv_r.c | 12 +-
newlib/libc/stdlib/itoa.c | 10 +-
newlib/libc/stdlib/jrand48.c | 6 +-
newlib/libc/stdlib/l64a.c | 6 +-
newlib/libc/stdlib/labs.c | 3 +-
newlib/libc/stdlib/lcong48.c | 10 +-
newlib/libc/stdlib/ldiv.c | 3 +-
newlib/libc/stdlib/ldtoa.c | 108 ++---
newlib/libc/stdlib/llabs.c | 3 +-
newlib/libc/stdlib/lldiv.c | 3 +-
newlib/libc/stdlib/local.h | 2 +-
newlib/libc/stdlib/lrand48.c | 5 +-
newlib/libc/stdlib/malign.c | 5 +-
newlib/libc/stdlib/malloc.c | 8 +-
newlib/libc/stdlib/mbctype.h | 8 +-
newlib/libc/stdlib/mblen.c | 3 +-
newlib/libc/stdlib/mblen_r.c | 7 +-
newlib/libc/stdlib/mbrtowc.c | 16 +-
newlib/libc/stdlib/mbsnrtowcs.c | 20 +-
newlib/libc/stdlib/mbsrtowcs.c | 16 +-
newlib/libc/stdlib/mbstowcs.c | 5 +-
newlib/libc/stdlib/mbstowcs_r.c | 9 +-
newlib/libc/stdlib/mbtowc.c | 5 +-
newlib/libc/stdlib/mbtowc_r.c | 54 +--
newlib/libc/stdlib/mprec.c | 78 ++--
newlib/libc/stdlib/mprec.h | 54 +--
newlib/libc/stdlib/mrand48.c | 5 +-
newlib/libc/stdlib/msize.c | 3 +-
newlib/libc/stdlib/mstats.c | 13 +-
newlib/libc/stdlib/mtrim.c | 3 +-
newlib/libc/stdlib/nrand48.c | 6 +-
newlib/libc/stdlib/on_exit.c | 6 +-
newlib/libc/stdlib/putenv.c | 3 +-
newlib/libc/stdlib/putenv_r.c | 3 +-
newlib/libc/stdlib/rand.c | 4 +-
newlib/libc/stdlib/rand48.c | 3 +-
newlib/libc/stdlib/rand48.h | 2 +-
newlib/libc/stdlib/rand_r.c | 2 +-
newlib/libc/stdlib/random.c | 4 +-
newlib/libc/stdlib/realloc.c | 5 +-
newlib/libc/stdlib/reallocf.c | 12 +-
newlib/libc/stdlib/rpmatch.c | 3 +-
newlib/libc/stdlib/seed48.c | 6 +-
newlib/libc/stdlib/setenv.c | 10 +-
newlib/libc/stdlib/setenv_r.c | 14 +-
newlib/libc/stdlib/srand48.c | 10 +-
newlib/libc/stdlib/std.h | 6 -
newlib/libc/stdlib/strtod.c | 29 +-
newlib/libc/stdlib/strtol.c | 12 +-
newlib/libc/stdlib/strtoll.c | 14 +-
newlib/libc/stdlib/strtoul.c | 12 +-
newlib/libc/stdlib/strtoull.c | 12 +-
newlib/libc/stdlib/system.c | 20 +-
newlib/libc/stdlib/utoa.c | 10 +-
newlib/libc/stdlib/valloc.c | 10 +-
newlib/libc/stdlib/wcrtomb.c | 12 +-
newlib/libc/stdlib/wcsnrtombs.c | 20 +-
newlib/libc/stdlib/wcsrtombs.c | 16 +-
newlib/libc/stdlib/wcstod.c | 16 +-
newlib/libc/stdlib/wcstol.c | 12 +-
newlib/libc/stdlib/wcstoll.c | 12 +-
newlib/libc/stdlib/wcstombs.c | 5 +-
newlib/libc/stdlib/wcstombs_r.c | 9 +-
newlib/libc/stdlib/wcstoul.c | 12 +-
newlib/libc/stdlib/wcstoull.c | 12 +-
newlib/libc/stdlib/wctomb.c | 3 +-
newlib/libc/stdlib/wctomb_r.c | 42 +-
newlib/libc/string/bcmp.c | 5 +-
newlib/libc/string/bcopy.c | 5 +-
newlib/libc/string/gnu_basename.c | 3 +-
newlib/libc/string/index.c | 3 +-
newlib/libc/string/local.h | 2 +-
newlib/libc/string/memccpy.c | 17 +-
newlib/libc/string/memchr.c | 9 +-
newlib/libc/string/memcmp.c | 5 +-
newlib/libc/string/memcpy.c | 13 +-
newlib/libc/string/memmem.c | 7 +-
newlib/libc/string/memmove.c | 13 +-
newlib/libc/string/mempcpy.c | 11 +-
newlib/libc/string/memrchr.c | 9 +-
newlib/libc/string/memset.c | 7 +-
newlib/libc/string/rawmemchr.c | 7 +-
newlib/libc/string/rindex.c | 3 +-
newlib/libc/string/stpcpy.c | 7 +-
newlib/libc/string/stpncpy.c | 7 +-
newlib/libc/string/strcasecmp.c | 9 +-
newlib/libc/string/strcasestr.c | 5 +-
newlib/libc/string/strcat.c | 5 +-
newlib/libc/string/strchr.c | 5 +-
newlib/libc/string/strchrnul.c | 3 +-
newlib/libc/string/strcmp.c | 5 +-
newlib/libc/string/strcoll.c | 5 +-
newlib/libc/string/strcpy.c | 9 +-
newlib/libc/string/strcspn.c | 9 +-
newlib/libc/string/strdup.c | 2 +-
newlib/libc/string/strdup_r.c | 5 +-
newlib/libc/string/strerror.c | 12 +-
newlib/libc/string/strerror_r.c | 5 +-
newlib/libc/string/strlcat.c | 5 +-
newlib/libc/string/strlcpy.c | 5 +-
newlib/libc/string/strlen.c | 5 +-
newlib/libc/string/strlwr.c | 3 +-
newlib/libc/string/strncasecmp.c | 9 +-
newlib/libc/string/strncat.c | 5 +-
newlib/libc/string/strncmp.c | 5 +-
newlib/libc/string/strncpy.c | 11 +-
newlib/libc/string/strndup.c | 3 +-
newlib/libc/string/strndup_r.c | 7 +-
newlib/libc/string/strnlen.c | 5 +-
newlib/libc/string/strpbrk.c | 7 +-
newlib/libc/string/strrchr.c | 5 +-
newlib/libc/string/strsep.c | 3 +-
newlib/libc/string/strsignal.c | 3 +-
newlib/libc/string/strspn.c | 9 +-
newlib/libc/string/strstr.c | 5 +-
newlib/libc/string/strtok.c | 3 +-
newlib/libc/string/strtok_r.c | 12 +-
newlib/libc/string/strupr.c | 3 +-
newlib/libc/string/strxfrm.c | 5 +-
newlib/libc/string/swab.c | 5 +-
newlib/libc/string/u_strerr.c | 11 +-
newlib/libc/string/wcpcpy.c | 5 +-
newlib/libc/string/wcpncpy.c | 5 +-
newlib/libc/string/wcscasecmp.c | 5 +-
newlib/libc/string/wcscat.c | 7 +-
newlib/libc/string/wcschr.c | 5 +-
newlib/libc/string/wcscmp.c | 5 +-
newlib/libc/string/wcscoll.c | 5 +-
newlib/libc/string/wcscpy.c | 7 +-
newlib/libc/string/wcscspn.c | 9 +-
newlib/libc/string/wcslcat.c | 7 +-
newlib/libc/string/wcslcpy.c | 7 +-
newlib/libc/string/wcslen.c | 5 +-
newlib/libc/string/wcsncasecmp.c | 5 +-
newlib/libc/string/wcsncat.c | 7 +-
newlib/libc/string/wcsncmp.c | 5 +-
newlib/libc/string/wcsncpy.c | 5 +-
newlib/libc/string/wcsnlen.c | 5 +-
newlib/libc/string/wcspbrk.c | 9 +-
newlib/libc/string/wcsrchr.c | 5 +-
newlib/libc/string/wcsspn.c | 9 +-
newlib/libc/string/wcsstr.c | 11 +-
newlib/libc/string/wcstok.c | 5 +-
newlib/libc/string/wcswidth.c | 3 +-
newlib/libc/string/wcsxfrm.c | 5 +-
newlib/libc/string/wcwidth.c | 6 +-
newlib/libc/string/wmemchr.c | 5 +-
newlib/libc/string/wmemcmp.c | 5 +-
newlib/libc/string/wmemcpy.c | 5 +-
newlib/libc/string/wmemmove.c | 5 +-
newlib/libc/string/wmempcpy.c | 5 +-
newlib/libc/string/wmemset.c | 5 +-
newlib/libc/string/xpg_strerror_r.c | 5 +-
newlib/libc/sys/a29khif/getpid.c | 2 +-
newlib/libc/sys/a29khif/kill.c | 3 +-
newlib/libc/sys/arm/syscalls.c | 64 +--
newlib/libc/sys/h8300hms/misc.c | 8 +-
newlib/libc/sys/h8500hms/misc.c | 8 +-
newlib/libc/sys/linux/ctermid.c | 3 +-
newlib/libc/sys/linux/getlogin.c | 2 +-
newlib/libc/sys/linux/getpwent.c | 9 +-
newlib/libc/sys/linux/include/setjmp.h | 8 +-
newlib/libc/sys/linux/include/time.h | 68 ++-
newlib/libc/sys/linux/pread.c | 16 +-
newlib/libc/sys/linux/pread64.c | 7 +-
newlib/libc/sys/linux/pwrite.c | 16 +-
newlib/libc/sys/linux/pwrite64.c | 7 +-
newlib/libc/sys/linux/sys/errno.h | 4 +-
newlib/libc/sys/linux/sys/fcntl.h | 10 +-
newlib/libc/sys/linux/sys/signal.h | 20 +-
newlib/libc/sys/linux/sys/stat.h | 18 +-
newlib/libc/sys/linux/sys/stdio.h | 2 +-
newlib/libc/sys/linux/sys/string.h | 2 +-
newlib/libc/sys/linux/sys/time.h | 12 +-
newlib/libc/sys/linux/sys/unistd.h | 178 +++----
newlib/libc/sys/linux/sys/utime.h | 2 +-
newlib/libc/sys/phoenix/sys/errno.h | 4 +-
newlib/libc/sys/rtems/crt0.c | 10 +-
newlib/libc/sys/sparc64/ieee.c | 20 +-
newlib/libc/sys/sparc64/sys/fcntl.h | 6 +-
newlib/libc/sys/sparc64/sys/stat.h | 12 +-
newlib/libc/sys/sun4/ieee.c | 20 +-
newlib/libc/sys/sysnec810/misc.c | 3 +-
newlib/libc/sys/sysvi386/fpx.c | 15 +-
newlib/libc/sys/sysvnecv70/fpx.c | 15 +-
newlib/libc/syscalls/sysclose.c | 3 +-
newlib/libc/syscalls/sysexecve.c | 7 +-
newlib/libc/syscalls/sysfcntl.c | 5 +-
newlib/libc/syscalls/sysfork.c | 2 +-
newlib/libc/syscalls/sysfstat.c | 3 +-
newlib/libc/syscalls/sysgetpid.c | 2 +-
newlib/libc/syscalls/sysgettod.c | 3 +-
newlib/libc/syscalls/sysisatty.c | 3 +-
newlib/libc/syscalls/syskill.c | 3 +-
newlib/libc/syscalls/syslink.c | 5 +-
newlib/libc/syscalls/syslseek.c | 5 +-
newlib/libc/syscalls/sysopen.c | 18 +-
newlib/libc/syscalls/sysread.c | 5 +-
newlib/libc/syscalls/syssbrk.c | 3 +-
newlib/libc/syscalls/sysstat.c | 3 +-
newlib/libc/syscalls/systimes.c | 3 +-
newlib/libc/syscalls/sysunlink.c | 3 +-
newlib/libc/syscalls/syswait.c | 3 +-
newlib/libc/syscalls/syswrite.c | 5 +-
newlib/libc/time/asctime.c | 3 +-
newlib/libc/time/asctime_r.c | 7 +-
newlib/libc/time/ctime.c | 3 +-
newlib/libc/time/ctime_r.c | 3 +-
newlib/libc/time/difftime.c | 3 +-
newlib/libc/time/gmtime.c | 3 +-
newlib/libc/time/gmtime_r.c | 5 +-
newlib/libc/time/lcltime.c | 3 +-
newlib/libc/time/lcltime_r.c | 7 +-
newlib/libc/time/local.h | 12 +-
newlib/libc/time/mktime.c | 10 +-
newlib/libc/time/month_lengths.c | 2 +-
newlib/libc/time/strftime.c | 14 +-
newlib/libc/time/strptime.c | 2 +-
newlib/libc/time/time.c | 3 +-
newlib/libc/time/tzcalc_limits.c | 9 +-
newlib/libc/time/tzlock.c | 8 +-
newlib/libc/time/tzset.c | 8 +-
newlib/libc/time/tzset_r.c | 10 +-
newlib/libc/unix/basename.c | 3 +-
newlib/libc/unix/dirname.c | 3 +-
newlib/libc/unix/getut.c | 2 +-
newlib/libc/unix/pread.c | 16 +-
newlib/libc/unix/pwrite.c | 16 +-
newlib/libc/unix/ttyname.c | 3 +-
newlib/libc/unix/ttyname_r.c | 5 +-
newlib/libc/xdr/xdr.c | 115 ++---
newlib/libc/xdr/xdr_array.c | 20 +-
newlib/libc/xdr/xdr_float.c | 6 +-
newlib/libc/xdr/xdr_float_vax.c | 6 +-
newlib/libc/xdr/xdr_mem.c | 100 ++--
newlib/libc/xdr/xdr_private.c | 9 +-
newlib/libc/xdr/xdr_private.h | 12 +-
newlib/libc/xdr/xdr_rec.c | 119 ++---
newlib/libc/xdr/xdr_reference.c | 14 +-
newlib/libc/xdr/xdr_sizeof.c | 40 +-
newlib/libc/xdr/xdr_stdio.c | 65 ++-
newlib/libm/common/s_isinf.c | 3 +-
newlib/libm/common/s_isinfd.c | 3 +-
newlib/libm/common/s_isnand.c | 3 +-
newlib/libm/common/sf_isinf.c | 6 +-
newlib/libm/common/sf_isinff.c | 6 +-
newlib/libm/common/sf_isnan.c | 6 +-
newlib/libm/common/sf_isnanf.c | 6 +-
newlib/libm/machine/i386/f_math.h | 6 +-
newlib/libm/math/wf_acos.c | 5 -
newlib/libm/mathfp/s_acos.c | 3 +-
newlib/libm/mathfp/s_asin.c | 3 +-
newlib/libm/mathfp/s_asine.c | 3 +-
newlib/libm/mathfp/s_atan.c | 3 +-
newlib/libm/mathfp/s_atan2.c | 3 +-
newlib/libm/mathfp/s_atangent.c | 7 +-
newlib/libm/mathfp/s_ceil.c | 3 +-
newlib/libm/mathfp/s_cos.c | 3 +-
newlib/libm/mathfp/s_cosh.c | 3 +-
newlib/libm/mathfp/s_exp.c | 3 +-
newlib/libm/mathfp/s_exp2.c | 3 +-
newlib/libm/mathfp/s_fabs.c | 3 +-
newlib/libm/mathfp/s_floor.c | 3 +-
newlib/libm/mathfp/s_ldexp.c | 3 +-
newlib/libm/mathfp/s_log.c | 3 +-
newlib/libm/mathfp/s_log10.c | 3 +-
newlib/libm/mathfp/s_logarithm.c | 3 +-
newlib/libm/mathfp/s_numtest.c | 3 +-
newlib/libm/mathfp/s_sin.c | 3 +-
newlib/libm/mathfp/s_sincos.c | 5 +-
newlib/libm/mathfp/s_sine.c | 3 +-
newlib/libm/mathfp/s_sineh.c | 3 +-
newlib/libm/mathfp/s_sinf.c | 3 +-
newlib/libm/mathfp/s_sinh.c | 3 +-
newlib/libm/mathfp/s_sqrt.c | 3 +-
newlib/libm/mathfp/s_tan.c | 3 +-
newlib/libm/mathfp/s_tanh.c | 3 +-
newlib/libm/mathfp/sf_acos.c | 3 +-
newlib/libm/mathfp/sf_asin.c | 3 +-
newlib/libm/mathfp/sf_asine.c | 3 +-
newlib/libm/mathfp/sf_atan.c | 3 +-
newlib/libm/mathfp/sf_atan2.c | 3 +-
newlib/libm/mathfp/sf_atangent.c | 7 +-
newlib/libm/mathfp/sf_ceil.c | 3 +-
newlib/libm/mathfp/sf_cos.c | 3 +-
newlib/libm/mathfp/sf_cosh.c | 3 +-
newlib/libm/mathfp/sf_exp.c | 3 +-
newlib/libm/mathfp/sf_exp2.c | 3 +-
newlib/libm/mathfp/sf_fabs.c | 3 +-
newlib/libm/mathfp/sf_floor.c | 3 +-
newlib/libm/mathfp/sf_fmod.c | 3 +-
newlib/libm/mathfp/sf_ldexp.c | 3 +-
newlib/libm/mathfp/sf_log.c | 3 +-
newlib/libm/mathfp/sf_log10.c | 3 +-
newlib/libm/mathfp/sf_logarithm.c | 3 +-
newlib/libm/mathfp/sf_numtest.c | 3 +-
newlib/libm/mathfp/sf_sin.c | 3 +-
newlib/libm/mathfp/sf_sincos.c | 5 +-
newlib/libm/mathfp/sf_sine.c | 3 +-
newlib/libm/mathfp/sf_sineh.c | 3 +-
newlib/libm/mathfp/sf_sinh.c | 3 +-
newlib/libm/mathfp/sf_sqrt.c | 3 +-
newlib/libm/mathfp/sf_tan.c | 3 +-
newlib/libm/mathfp/sf_tanh.c | 3 +-
newlib/libm/mathfp/zmath.h | 24 +-
newlib/libm/test/convert.c | 46 +-
newlib/libm/test/dcvt.c | 61 +--
newlib/libm/test/math.c | 79 ++--
newlib/libm/test/math2.c | 14 +-
newlib/libm/test/string.c | 14 +-
newlib/libm/test/test.c | 33 +-
newlib/libm/test/test.h | 28 +-
newlib/libm/test/test_ieee.c | 15 +-
newlib/libm/test/test_is.c | 53 +--
winsup/cygwin/include/attr/xattr.h | 24 +-
winsup/cygwin/include/cygwin/stdlib.h | 4 +-
winsup/cygwin/include/fcntl.h | 4 +-
winsup/cygwin/include/pty.h | 8 +-
winsup/cygwin/include/sys/file.h | 2 +-
winsup/cygwin/include/sys/stdio.h | 4 +-
winsup/cygwin/include/sys/utime.h | 2 +-
winsup/cygwin/libc/strptime.cc | 2 +-
921 files changed, 5621 insertions(+), 7547 deletions(-)
delete mode 100644 newlib/doc/ansidecl.h
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 03/17] ansification: remove _DOTS
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
2017-12-07 18:19 ` [PATCH v2 04/17] ansification: remove _NOARGS Yaakov Selkowitz
2017-12-07 18:19 ` [PATCH v2 07/17] ansification: remove _PTR Yaakov Selkowitz
@ 2017-12-07 18:19 ` Yaakov Selkowitz
2017-12-07 18:20 ` [PATCH v2 01/17] ansification: remove _AND Yaakov Selkowitz
` (14 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:19 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
newlib/libc/include/_ansi.h | 2 --
newlib/libc/posix/execl.c | 2 +-
newlib/libc/posix/execle.c | 2 +-
newlib/libc/posix/execlp.c | 2 +-
newlib/libc/stdio/asiprintf.c | 4 ++--
newlib/libc/stdio/asniprintf.c | 4 ++--
newlib/libc/stdio/asnprintf.c | 4 ++--
newlib/libc/stdio/asprintf.c | 4 ++--
newlib/libc/stdio/diprintf.c | 4 ++--
newlib/libc/stdio/dprintf.c | 4 ++--
newlib/libc/stdio/fiprintf.c | 4 ++--
newlib/libc/stdio/fprintf.c | 4 ++--
newlib/libc/stdio/fwprintf.c | 4 ++--
newlib/libc/stdio/iprintf.c | 4 ++--
newlib/libc/stdio/printf.c | 4 ++--
newlib/libc/stdio/siprintf.c | 4 ++--
newlib/libc/stdio/siscanf.c | 4 ++--
newlib/libc/stdio/sniprintf.c | 4 ++--
newlib/libc/stdio/snprintf.c | 4 ++--
newlib/libc/stdio/sprintf.c | 4 ++--
newlib/libc/stdio/sscanf.c | 4 ++--
newlib/libc/stdio/swprintf.c | 4 ++--
newlib/libc/stdio/wprintf.c | 4 ++--
newlib/libc/syscalls/sysopen.c | 2 +-
newlib/libc/xdr/xdr_private.c | 2 +-
25 files changed, 43 insertions(+), 45 deletions(-)
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index b0ce3bd4e..a09bfac08 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -51,7 +51,6 @@
#define _NOARGS void
#define _VOLATILE volatile
#define _SIGNED signed
-#define _DOTS , ...
#define _VOID void
#ifdef __CYGWIN__
#define _EXFUN_NOTHROW(name, proto) __cdecl name proto _NOTHROW
@@ -78,7 +77,6 @@
#define _NOARGS
#define _VOLATILE
#define _SIGNED
-#define _DOTS
#define _VOID void
#define _EXFUN(name, proto) name()
#define _EXFUN_NOTHROW(name, proto) name()
diff --git a/newlib/libc/posix/execl.c b/newlib/libc/posix/execl.c
index fbad9f3f8..e25f21917 100644
--- a/newlib/libc/posix/execl.c
+++ b/newlib/libc/posix/execl.c
@@ -20,7 +20,7 @@ static char ***p_environ = &environ;
int
_DEFUN(execl, (path, arg0, ...),
const char *path,
- const char *arg0 _DOTS)
+ const char *arg0, ...)
#else
diff --git a/newlib/libc/posix/execle.c b/newlib/libc/posix/execle.c
index c18555c02..67387f545 100644
--- a/newlib/libc/posix/execle.c
+++ b/newlib/libc/posix/execle.c
@@ -15,7 +15,7 @@
int
_DEFUN(execle, (path, arg0, ...),
const char *path,
- const char *arg0 _DOTS)
+ const char *arg0, ...)
#else
diff --git a/newlib/libc/posix/execlp.c b/newlib/libc/posix/execlp.c
index 6b9c2f7e9..f1de21f1c 100644
--- a/newlib/libc/posix/execlp.c
+++ b/newlib/libc/posix/execlp.c
@@ -15,7 +15,7 @@
int
_DEFUN(execlp, (path, arg0, ...),
const char *path,
- const char *arg0 _DOTS)
+ const char *arg0, ...)
#else
diff --git a/newlib/libc/stdio/asiprintf.c b/newlib/libc/stdio/asiprintf.c
index 86996737f..ec60e3ed4 100644
--- a/newlib/libc/stdio/asiprintf.c
+++ b/newlib/libc/stdio/asiprintf.c
@@ -28,7 +28,7 @@ int
_DEFUN(_asiprintf_r, (ptr, strp, fmt),
struct _reent *ptr,
char **strp,
- const char *fmt _DOTS)
+ const char *fmt, ...)
{
int ret;
va_list ap;
@@ -55,7 +55,7 @@ _DEFUN(_asiprintf_r, (ptr, strp, fmt),
int
_DEFUN(asiprintf, (strp, fmt),
char **strp,
- const char *fmt _DOTS)
+ const char *fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio/asniprintf.c b/newlib/libc/stdio/asniprintf.c
index f033f1b6b..ba4772f08 100644
--- a/newlib/libc/stdio/asniprintf.c
+++ b/newlib/libc/stdio/asniprintf.c
@@ -18,7 +18,7 @@ _DEFUN(_asniprintf_r, (ptr, buf, lenp, fmt),
struct _reent *ptr,
char *buf,
size_t *lenp,
- const char *fmt _DOTS)
+ const char *fmt, ...)
{
int ret;
va_list ap;
@@ -64,7 +64,7 @@ char *
_DEFUN(asniprintf, (buf, lenp, fmt),
char *buf,
size_t *lenp,
- const char *fmt _DOTS)
+ const char *fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio/asnprintf.c b/newlib/libc/stdio/asnprintf.c
index e80ca06cb..c9a37dbf1 100644
--- a/newlib/libc/stdio/asnprintf.c
+++ b/newlib/libc/stdio/asnprintf.c
@@ -18,7 +18,7 @@ _DEFUN(_asnprintf_r, (ptr, buf, lenp, fmt),
struct _reent *__restrict ptr,
char *buf,
size_t *lenp,
- const char *__restrict fmt _DOTS)
+ const char *__restrict fmt, ...)
{
int ret;
va_list ap;
@@ -70,7 +70,7 @@ char *
_DEFUN(asnprintf, (buf, lenp, fmt),
char *__restrict buf,
size_t *__restrict lenp,
- const char *__restrict fmt _DOTS)
+ const char *__restrict fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio/asprintf.c b/newlib/libc/stdio/asprintf.c
index 1e75174d4..b3d9122f5 100644
--- a/newlib/libc/stdio/asprintf.c
+++ b/newlib/libc/stdio/asprintf.c
@@ -28,7 +28,7 @@ int
_DEFUN(_asprintf_r, (ptr, strp, fmt),
struct _reent *ptr,
char **__restrict strp,
- const char *__restrict fmt _DOTS)
+ const char *__restrict fmt, ...)
{
int ret;
va_list ap;
@@ -61,7 +61,7 @@ _EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...)
int
_DEFUN(asprintf, (strp, fmt),
char **__restrict strp,
- const char *__restrict fmt _DOTS)
+ const char *__restrict fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio/diprintf.c b/newlib/libc/stdio/diprintf.c
index f57cbac81..0059e044b 100644
--- a/newlib/libc/stdio/diprintf.c
+++ b/newlib/libc/stdio/diprintf.c
@@ -52,7 +52,7 @@ int
_DEFUN(_diprintf_r, (ptr, fd, format),
struct _reent *ptr,
int fd,
- const char *format _DOTS)
+ const char *format, ...)
{
va_list ap;
int n;
@@ -68,7 +68,7 @@ _DEFUN(_diprintf_r, (ptr, fd, format),
int
_DEFUN(diprintf, (fd, format),
int fd,
- const char *format _DOTS)
+ const char *format, ...)
{
va_list ap;
int n;
diff --git a/newlib/libc/stdio/dprintf.c b/newlib/libc/stdio/dprintf.c
index 831fe208c..5fd45049b 100644
--- a/newlib/libc/stdio/dprintf.c
+++ b/newlib/libc/stdio/dprintf.c
@@ -56,7 +56,7 @@ int
_DEFUN(_dprintf_r, (ptr, fd, format),
struct _reent *ptr,
int fd,
- const char *__restrict format _DOTS)
+ const char *__restrict format, ...)
{
va_list ap;
int n;
@@ -78,7 +78,7 @@ _EXFUN(_diprintf_r, (struct _reent *, int, const char *, ...)
int
_DEFUN(dprintf, (fd, format),
int fd,
- const char *__restrict format _DOTS)
+ const char *__restrict format, ...)
{
va_list ap;
int n;
diff --git a/newlib/libc/stdio/fiprintf.c b/newlib/libc/stdio/fiprintf.c
index 1510556b2..e86bf86e5 100644
--- a/newlib/libc/stdio/fiprintf.c
+++ b/newlib/libc/stdio/fiprintf.c
@@ -25,7 +25,7 @@ int
_DEFUN(_fiprintf_r, (ptr, fp, fmt),
struct _reent *ptr,
FILE * fp,
- const char *fmt _DOTS)
+ const char *fmt, ...)
{
int ret;
va_list ap;
@@ -41,7 +41,7 @@ _DEFUN(_fiprintf_r, (ptr, fp, fmt),
int
_DEFUN(fiprintf, (fp, fmt),
FILE * fp,
- const char *fmt _DOTS)
+ const char *fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio/fprintf.c b/newlib/libc/stdio/fprintf.c
index 6a98237a2..9dab2cd19 100644
--- a/newlib/libc/stdio/fprintf.c
+++ b/newlib/libc/stdio/fprintf.c
@@ -25,7 +25,7 @@ int
_DEFUN(_fprintf_r, (ptr, fp, fmt),
struct _reent *ptr,
FILE *__restrict fp,
- const char *__restrict fmt _DOTS)
+ const char *__restrict fmt, ...)
{
int ret;
va_list ap;
@@ -47,7 +47,7 @@ _EXFUN(_fiprintf_r, (struct _reent *, FILE *, const char *, ...)
int
_DEFUN(fprintf, (fp, fmt),
FILE *__restrict fp,
- const char *__restrict fmt _DOTS)
+ const char *__restrict fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio/fwprintf.c b/newlib/libc/stdio/fwprintf.c
index 00a8d41f9..b7604aafe 100644
--- a/newlib/libc/stdio/fwprintf.c
+++ b/newlib/libc/stdio/fwprintf.c
@@ -26,7 +26,7 @@ int
_DEFUN(_fwprintf_r, (ptr, fp, fmt),
struct _reent *ptr,
FILE *fp,
- const wchar_t *fmt _DOTS)
+ const wchar_t *fmt, ...)
{
int ret;
va_list ap;
@@ -42,7 +42,7 @@ _DEFUN(_fwprintf_r, (ptr, fp, fmt),
int
_DEFUN(fwprintf, (fp, fmt),
FILE *__restrict fp,
- const wchar_t *__restrict fmt _DOTS)
+ const wchar_t *__restrict fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio/iprintf.c b/newlib/libc/stdio/iprintf.c
index 6c30c4257..571d826e5 100644
--- a/newlib/libc/stdio/iprintf.c
+++ b/newlib/libc/stdio/iprintf.c
@@ -26,7 +26,7 @@
int
_DEFUN(iprintf, (fmt),
- const char *fmt _DOTS)
+ const char *fmt, ...)
{
int ret;
va_list ap;
@@ -44,7 +44,7 @@ _DEFUN(iprintf, (fmt),
int
_DEFUN(_iprintf_r, (ptr, fmt),
struct _reent *ptr,
- const char *fmt _DOTS)
+ const char *fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio/printf.c b/newlib/libc/stdio/printf.c
index ba5b76850..73986776b 100644
--- a/newlib/libc/stdio/printf.c
+++ b/newlib/libc/stdio/printf.c
@@ -25,7 +25,7 @@
int
_DEFUN(_printf_r, (ptr, fmt),
struct _reent *ptr,
- const char *__restrict fmt _DOTS)
+ const char *__restrict fmt, ...)
{
int ret;
va_list ap;
@@ -47,7 +47,7 @@ _EXFUN(_iprintf_r, (struct _reent *, const char *, ...)
int
_DEFUN(printf, (fmt),
- const char *__restrict fmt _DOTS)
+ const char *__restrict fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio/siprintf.c b/newlib/libc/stdio/siprintf.c
index e33687563..2251e0912 100644
--- a/newlib/libc/stdio/siprintf.c
+++ b/newlib/libc/stdio/siprintf.c
@@ -107,7 +107,7 @@ int
_DEFUN(_siprintf_r, (ptr, str, fmt),
struct _reent *ptr,
char *str,
- const char *fmt _DOTS)
+ const char *fmt, ...)
#else
_siprintf_r(ptr, str, fmt, va_alist)
struct _reent *ptr;
@@ -141,7 +141,7 @@ int
#ifdef _HAVE_STDC
_DEFUN(siprintf, (str, fmt),
char *str,
- const char *fmt _DOTS)
+ const char *fmt, ...)
#else
siprintf(str, fmt, va_alist)
char *str;
diff --git a/newlib/libc/stdio/siscanf.c b/newlib/libc/stdio/siscanf.c
index d5e62b40d..bd1528b04 100644
--- a/newlib/libc/stdio/siscanf.c
+++ b/newlib/libc/stdio/siscanf.c
@@ -89,7 +89,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
_DEFUN(siscanf, (str, fmt),
const char *str,
- const char *fmt _DOTS)
+ const char *fmt, ...)
#else
int
siscanf(str, fmt, va_alist)
@@ -126,7 +126,7 @@ int
_DEFUN(_siscanf_r, (ptr, str, fmt),
struct _reent *ptr,
const char *str,
- const char *fmt _DOTS)
+ const char *fmt, ...)
#else
int
_siscanf_r(ptr, str, fmt, va_alist)
diff --git a/newlib/libc/stdio/sniprintf.c b/newlib/libc/stdio/sniprintf.c
index 90e30271e..d7bb9a40e 100644
--- a/newlib/libc/stdio/sniprintf.c
+++ b/newlib/libc/stdio/sniprintf.c
@@ -36,7 +36,7 @@ _DEFUN (_sniprintf_r, (ptr, str, size, fmt),
struct _reent *ptr,
char *str,
size_t size,
- const char *fmt _DOTS)
+ const char *fmt, ...)
#else
_sniprintf_r (ptr, str, size, fmt, va_alist)
struct _reent *ptr;
@@ -80,7 +80,7 @@ int
_DEFUN (sniprintf, (str, size, fmt),
char *str,
size_t size,
- const char *fmt _DOTS)
+ const char *fmt, ...)
#else
sniprintf (str, size, fmt, va_alist)
char *str;
diff --git a/newlib/libc/stdio/snprintf.c b/newlib/libc/stdio/snprintf.c
index aa7a6364d..ab33dfb47 100644
--- a/newlib/libc/stdio/snprintf.c
+++ b/newlib/libc/stdio/snprintf.c
@@ -35,7 +35,7 @@ _DEFUN(_snprintf_r, (ptr, str, size, fmt),
struct _reent *ptr,
char *__restrict str,
size_t size,
- const char *__restrict fmt _DOTS)
+ const char *__restrict fmt, ...)
#else
_snprintf_r(ptr, str, size, fmt, va_alist)
struct _reent *ptr;
@@ -85,7 +85,7 @@ int
_DEFUN(snprintf, (str, size, fmt),
char *__restrict str,
size_t size,
- const char *__restrict fmt _DOTS)
+ const char *__restrict fmt, ...)
#else
snprintf(str, size, fmt, va_alist)
char *str;
diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index 1948ff158..35d39618f 100644
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -583,7 +583,7 @@ int
_DEFUN(_sprintf_r, (ptr, str, fmt),
struct _reent *ptr,
char *__restrict str,
- const char *__restrict fmt _DOTS)
+ const char *__restrict fmt, ...)
#else
_sprintf_r(ptr, str, fmt, va_alist)
struct _reent *ptr;
@@ -623,7 +623,7 @@ int
#ifdef _HAVE_STDC
_DEFUN(sprintf, (str, fmt),
char *__restrict str,
- const char *__restrict fmt _DOTS)
+ const char *__restrict fmt, ...)
#else
sprintf(str, fmt, va_alist)
char *str;
diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index 8a3232525..92983b1ec 100644
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -428,7 +428,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
_DEFUN(sscanf, (str, fmt),
const char *__restrict str,
- const char * fmt _DOTS)
+ const char * fmt, ...)
#else
int
sscanf(str, fmt, va_alist)
@@ -471,7 +471,7 @@ int
_DEFUN(_sscanf_r, (ptr, str, fmt),
struct _reent *ptr,
const char *__restrict str,
- const char *__restrict fmt _DOTS)
+ const char *__restrict fmt, ...)
#else
int
_sscanf_r(ptr, str, fmt, va_alist)
diff --git a/newlib/libc/stdio/swprintf.c b/newlib/libc/stdio/swprintf.c
index 47a2657a2..427e03ed5 100644
--- a/newlib/libc/stdio/swprintf.c
+++ b/newlib/libc/stdio/swprintf.c
@@ -557,7 +557,7 @@ _DEFUN(_swprintf_r, (ptr, str, size, fmt),
struct _reent *ptr,
wchar_t *str,
size_t size,
- const wchar_t *fmt _DOTS)
+ const wchar_t *fmt, ...)
{
int ret;
va_list ap;
@@ -597,7 +597,7 @@ int
_DEFUN(swprintf, (str, size, fmt),
wchar_t *__restrict str,
size_t size,
- const wchar_t *__restrict fmt _DOTS)
+ const wchar_t *__restrict fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio/wprintf.c b/newlib/libc/stdio/wprintf.c
index 99c5696df..ef212d851 100644
--- a/newlib/libc/stdio/wprintf.c
+++ b/newlib/libc/stdio/wprintf.c
@@ -26,7 +26,7 @@
int
_DEFUN(_wprintf_r, (ptr, fmt),
struct _reent *ptr,
- const wchar_t *fmt _DOTS)
+ const wchar_t *fmt, ...)
{
int ret;
va_list ap;
@@ -42,7 +42,7 @@ _DEFUN(_wprintf_r, (ptr, fmt),
int
_DEFUN(wprintf, (fmt),
- const wchar_t *__restrict fmt _DOTS)
+ const wchar_t *__restrict fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/syscalls/sysopen.c b/newlib/libc/syscalls/sysopen.c
index 3909564cf..36523fc67 100644
--- a/newlib/libc/syscalls/sysopen.c
+++ b/newlib/libc/syscalls/sysopen.c
@@ -12,7 +12,7 @@
int
_DEFUN (open, (file, flags, ...),
const char *file,
- int flags _DOTS)
+ int flags, ...)
{
va_list ap;
int ret;
diff --git a/newlib/libc/xdr/xdr_private.c b/newlib/libc/xdr/xdr_private.c
index 79358a518..64eac9d23 100644
--- a/newlib/libc/xdr/xdr_private.c
+++ b/newlib/libc/xdr/xdr_private.c
@@ -49,7 +49,7 @@ _DEFUN (xdr_vwarnx, (format, ap),
void
_DEFUN (xdr_warnx, (fmt),
- const char *fmt _DOTS)
+ const char *fmt, ...)
{
va_list ap;
va_start (ap, fmt);
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 04/17] ansification: remove _NOARGS
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
@ 2017-12-07 18:19 ` Yaakov Selkowitz
2017-12-07 18:19 ` [PATCH v2 07/17] ansification: remove _PTR Yaakov Selkowitz
` (16 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:19 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
libgloss/libnosys/fork.c | 2 +-
libgloss/libnosys/getpid.c | 2 +-
libgloss/mcore/cmb-inbyte.c | 2 +-
newlib/libc/include/_ansi.h | 4 +---
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/libgloss/libnosys/fork.c b/libgloss/libnosys/fork.c
index f5795cb49..5fbf68b93 100644
--- a/libgloss/libnosys/fork.c
+++ b/libgloss/libnosys/fork.c
@@ -12,7 +12,7 @@ extern int errno;
int
_DEFUN (_fork, (),
- _NOARGS)
+ void)
{
errno = ENOSYS;
return -1;
diff --git a/libgloss/libnosys/getpid.c b/libgloss/libnosys/getpid.c
index 0ea19238e..9ed416c6b 100644
--- a/libgloss/libnosys/getpid.c
+++ b/libgloss/libnosys/getpid.c
@@ -12,7 +12,7 @@ extern int errno;
int
_DEFUN (_getpid, (),
- _NOARGS)
+ void)
{
errno = ENOSYS;
return -1;
diff --git a/libgloss/mcore/cmb-inbyte.c b/libgloss/mcore/cmb-inbyte.c
index 0b0b8f5d8..839ffe605 100644
--- a/libgloss/mcore/cmb-inbyte.c
+++ b/libgloss/mcore/cmb-inbyte.c
@@ -16,7 +16,7 @@
int
_DEFUN (inbyte, (),
- _NOARGS)
+ void)
{
return -1;
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index a09bfac08..41623f7a7 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -48,7 +48,6 @@
#ifdef _HAVE_STDC
#define _PTR void *
-#define _NOARGS void
#define _VOLATILE volatile
#define _SIGNED signed
#define _VOID void
@@ -64,7 +63,7 @@
#define _EXFNPTR(name, proto) (* name) proto
#endif
#define _DEFUN(name, arglist, args) name(args)
-#define _DEFUN_VOID(name) name(_NOARGS)
+#define _DEFUN_VOID(name) name(void)
#define _CAST_VOID (void)
#ifndef _LONG_DOUBLE
#define _LONG_DOUBLE long double
@@ -74,7 +73,6 @@
#endif
#else
#define _PTR char *
-#define _NOARGS
#define _VOLATILE
#define _SIGNED
#define _VOID void
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 07/17] ansification: remove _PTR
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
2017-12-07 18:19 ` [PATCH v2 04/17] ansification: remove _NOARGS Yaakov Selkowitz
@ 2017-12-07 18:19 ` Yaakov Selkowitz
2017-12-07 18:19 ` [PATCH v2 03/17] ansification: remove _DOTS Yaakov Selkowitz
` (15 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:19 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
newlib/libc/include/_ansi.h | 2 -
newlib/libc/include/malloc.h | 34 ++++++++---------
newlib/libc/include/stdio.h | 56 ++++++++++++++--------------
newlib/libc/include/stdlib.h | 38 +++++++++----------
newlib/libc/include/string.h | 20 +++++-----
newlib/libc/include/sys/reent.h | 22 +++++------
newlib/libc/machine/powerpc/machine/malloc.h | 12 +++---
newlib/libc/machine/powerpc/machine/stdlib.h | 12 +++---
newlib/libc/machine/powerpc/vec_calloc.c | 2 +-
newlib/libc/machine/powerpc/vec_free.c | 2 +-
newlib/libc/machine/powerpc/vec_malloc.c | 2 +-
newlib/libc/machine/powerpc/vec_realloc.c | 4 +-
newlib/libc/machine/powerpc/vfscanf.c | 2 +-
newlib/libc/machine/spu/fread.c | 2 +-
newlib/libc/machine/spu/fwrite.c | 2 +-
newlib/libc/machine/xstormy16/mallocr.c | 10 ++---
newlib/libc/reent/readr.c | 2 +-
newlib/libc/reent/writer.c | 2 +-
newlib/libc/search/bsearch.c | 12 +++---
newlib/libc/stdio/fdopen.c | 2 +-
newlib/libc/stdio/fgets.c | 6 +--
newlib/libc/stdio/fopen.c | 2 +-
newlib/libc/stdio/fread.c | 10 ++---
newlib/libc/stdio/freopen.c | 2 +-
newlib/libc/stdio/fseeko.c | 2 +-
newlib/libc/stdio/fvwrite.c | 4 +-
newlib/libc/stdio/fvwrite.h | 2 +-
newlib/libc/stdio/fwrite.c | 4 +-
newlib/libc/stdio/makebuf.c | 2 +-
newlib/libc/stdio/nano-vfprintf.c | 4 +-
newlib/libc/stdio/nano-vfprintf_local.h | 2 +-
newlib/libc/stdio/nano-vfscanf.c | 2 +-
newlib/libc/stdio/setvbuf.c | 2 +-
newlib/libc/stdio/stdio.c | 2 +-
newlib/libc/stdio/ungetc.c | 4 +-
newlib/libc/stdio/vfprintf.c | 12 +++---
newlib/libc/stdio/vfscanf.c | 8 ++--
newlib/libc/stdio/vfwprintf.c | 6 +--
newlib/libc/stdio/vfwscanf.c | 6 +--
newlib/libc/stdio64/fdopen64.c | 2 +-
newlib/libc/stdio64/fopen64.c | 2 +-
newlib/libc/stdio64/freopen64.c | 2 +-
newlib/libc/stdlib/__call_atexit.c | 6 +--
newlib/libc/stdlib/atexit.h | 4 +-
newlib/libc/stdlib/calloc.c | 2 +-
newlib/libc/stdlib/cxa_atexit.c | 2 +-
newlib/libc/stdlib/exit.c | 2 +-
newlib/libc/stdlib/malign.c | 2 +-
newlib/libc/stdlib/malloc.c | 4 +-
newlib/libc/stdlib/msize.c | 2 +-
newlib/libc/stdlib/on_exit.c | 4 +-
newlib/libc/stdlib/realloc.c | 4 +-
newlib/libc/stdlib/reallocf.c | 8 ++--
newlib/libc/stdlib/valloc.c | 4 +-
newlib/libc/string/memccpy.c | 10 ++---
newlib/libc/string/memchr.c | 4 +-
newlib/libc/string/memcmp.c | 4 +-
newlib/libc/string/memcpy.c | 8 ++--
newlib/libc/string/memmove.c | 6 +--
newlib/libc/string/mempcpy.c | 6 +--
newlib/libc/string/memrchr.c | 4 +-
newlib/libc/string/memset.c | 4 +-
newlib/libc/string/rawmemchr.c | 4 +-
newlib/libc/sys/linux/pread.c | 4 +-
newlib/libc/sys/linux/pread64.c | 2 +-
newlib/libc/sys/linux/pwrite.c | 4 +-
newlib/libc/sys/linux/pwrite64.c | 2 +-
newlib/libc/sys/rtems/crt0.c | 10 ++---
newlib/libc/unix/pread.c | 4 +-
newlib/libc/unix/pwrite.c | 4 +-
newlib/libc/xdr/xdr_sizeof.c | 2 +-
winsup/cygwin/include/cygwin/stdlib.h | 4 +-
72 files changed, 228 insertions(+), 230 deletions(-)
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index 5e2eac93a..e955138fe 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -47,7 +47,6 @@
#endif
#ifdef _HAVE_STDC
-#define _PTR void *
#define _VOLATILE volatile
#define _SIGNED signed
#define _VOID void
@@ -69,7 +68,6 @@
#define _LONG_DOUBLE long double
#endif
#else
-#define _PTR char *
#define _VOLATILE
#define _SIGNED
#define _VOID void
diff --git a/newlib/libc/include/malloc.h b/newlib/libc/include/malloc.h
index b1e0a0946..f9144cdca 100644
--- a/newlib/libc/include/malloc.h
+++ b/newlib/libc/include/malloc.h
@@ -34,44 +34,44 @@ struct mallinfo {
/* The routines. */
-extern _PTR malloc (size_t);
+extern void *malloc (size_t);
#ifdef __CYGWIN__
#undef _malloc_r
#define _malloc_r(r, s) malloc (s)
#else
-extern _PTR _malloc_r (struct _reent *, size_t);
+extern void *_malloc_r (struct _reent *, size_t);
#endif
-extern _VOID free (_PTR);
+extern _VOID free (void *);
#ifdef __CYGWIN__
#undef _free_r
#define _free_r(r, p) free (p)
#else
-extern _VOID _free_r (struct _reent *, _PTR);
+extern _VOID _free_r (struct _reent *, void *);
#endif
-extern _PTR realloc (_PTR, size_t);
+extern void *realloc (void *, size_t);
#ifdef __CYGWIN__
#undef _realloc_r
#define _realloc_r(r, p, s) realloc (p, s)
#else
-extern _PTR _realloc_r (struct _reent *, _PTR, size_t);
+extern void *_realloc_r (struct _reent *, void *, size_t);
#endif
-extern _PTR calloc (size_t, size_t);
+extern void *calloc (size_t, size_t);
#ifdef __CYGWIN__
#undef _calloc_r
#define _calloc_r(r, s1, s2) calloc (s1, s2);
#else
-extern _PTR _calloc_r (struct _reent *, size_t, size_t);
+extern void *_calloc_r (struct _reent *, size_t, size_t);
#endif
-extern _PTR memalign (size_t, size_t);
+extern void *memalign (size_t, size_t);
#ifdef __CYGWIN__
#undef _memalign_r
#define _memalign_r(r, s1, s2) memalign (s1, s2);
#else
-extern _PTR _memalign_r (struct _reent *, size_t, size_t);
+extern void *_memalign_r (struct _reent *, size_t, size_t);
#endif
extern struct mallinfo mallinfo (void);
@@ -98,31 +98,31 @@ extern int mallopt (int, int);
extern int _mallopt_r (struct _reent *, int, int);
#endif
-extern size_t malloc_usable_size (_PTR);
+extern size_t malloc_usable_size (void *);
#ifdef __CYGWIN__
#undef _malloc_usable_size_r
#define _malloc_usable_size_r(r, p) malloc_usable_size (p)
#else
-extern size_t _malloc_usable_size_r (struct _reent *, _PTR);
+extern size_t _malloc_usable_size_r (struct _reent *, void *);
#endif
/* These aren't too useful on an embedded system, but we define them
anyhow. */
-extern _PTR valloc (size_t);
+extern void *valloc (size_t);
#ifdef __CYGWIN__
#undef _valloc_r
#define _valloc_r(r, s) valloc (s)
#else
-extern _PTR _valloc_r (struct _reent *, size_t);
+extern void *_valloc_r (struct _reent *, size_t);
#endif
-extern _PTR pvalloc (size_t);
+extern void *pvalloc (size_t);
#ifdef __CYGWIN__
#undef _pvalloc_r
#define _pvalloc_r(r, s) pvalloc (s)
#else
-extern _PTR _pvalloc_r (struct _reent *, size_t);
+extern void *_pvalloc_r (struct _reent *, size_t);
#endif
extern int malloc_trim (size_t);
@@ -159,7 +159,7 @@ extern _VOID _mstats_r (struct _reent *, char *);
#ifndef __CYGWIN__
/* Some systems provide this, so do too for compatibility. */
-extern void cfree (_PTR);
+extern void cfree (void *);
#endif /* __CYGWIN__ */
#ifdef __cplusplus
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index 9152bf096..fe0a31827 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -220,8 +220,8 @@ int _EXFUN(putc, (int, FILE *));
int _EXFUN(putchar, (int));
int _EXFUN(puts, (const char *));
int _EXFUN(ungetc, (int, FILE *));
-size_t _EXFUN(fread, (_PTR __restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t _EXFUN(fwrite, (const _PTR __restrict , size_t _size, size_t _n, FILE *));
+size_t _EXFUN(fread, (void *__restrict, size_t _size, size_t _n, FILE *__restrict));
+size_t _EXFUN(fwrite, (const void *__restrict , size_t _size, size_t _n, FILE *));
#ifdef _COMPILING_NEWLIB
int _EXFUN(fgetpos, (FILE *, _fpos_t *));
#else
@@ -434,8 +434,8 @@ int _EXFUN(_fputc_r, (struct _reent *, int, FILE *));
int _EXFUN(_fputc_unlocked_r, (struct _reent *, int, FILE *));
int _EXFUN(_fputs_r, (struct _reent *, const char *__restrict, FILE *__restrict));
int _EXFUN(_fputs_unlocked_r, (struct _reent *, const char *__restrict, FILE *__restrict));
-size_t _EXFUN(_fread_r, (struct _reent *, _PTR __restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t _EXFUN(_fread_unlocked_r, (struct _reent *, _PTR __restrict, size_t _size, size_t _n, FILE *__restrict));
+size_t _EXFUN(_fread_r, (struct _reent *, void *__restrict, size_t _size, size_t _n, FILE *__restrict));
+size_t _EXFUN(_fread_unlocked_r, (struct _reent *, void *__restrict, size_t _size, size_t _n, FILE *__restrict));
int _EXFUN(_fscanf_r, (struct _reent *, FILE *__restrict, const char *__restrict, ...)
_ATTRIBUTE ((__format__ (__scanf__, 3, 4))));
int _EXFUN(_fseek_r, (struct _reent *, FILE *, long, int));
@@ -443,8 +443,8 @@ int _EXFUN(_fseeko_r,(struct _reent *, FILE *, _off_t, int));
long _EXFUN(_ftell_r, (struct _reent *, FILE *));
_off_t _EXFUN(_ftello_r,(struct _reent *, FILE *));
void _EXFUN(_rewind_r, (struct _reent *, FILE *));
-size_t _EXFUN(_fwrite_r, (struct _reent *, const _PTR __restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t _EXFUN(_fwrite_unlocked_r, (struct _reent *, const _PTR __restrict, size_t _size, size_t _n, FILE *__restrict));
+size_t _EXFUN(_fwrite_r, (struct _reent *, const void *__restrict, size_t _size, size_t _n, FILE *__restrict));
+size_t _EXFUN(_fwrite_unlocked_r, (struct _reent *, const void *__restrict, size_t _size, size_t _n, FILE *__restrict));
int _EXFUN(_getc_r, (struct _reent *, FILE *));
int _EXFUN(_getc_unlocked_r, (struct _reent *, FILE *));
int _EXFUN(_getchar_r, (struct _reent *));
@@ -539,8 +539,8 @@ int _EXFUN(fileno_unlocked, (FILE *));
int _EXFUN(fflush_unlocked, (FILE *));
int _EXFUN(fgetc_unlocked, (FILE *));
int _EXFUN(fputc_unlocked, (int, FILE *));
-size_t _EXFUN(fread_unlocked, (_PTR __restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t _EXFUN(fwrite_unlocked, (const _PTR __restrict , size_t _size, size_t _n, FILE *));
+size_t _EXFUN(fread_unlocked, (void *__restrict, size_t _size, size_t _n, FILE *__restrict));
+size_t _EXFUN(fwrite_unlocked, (const void *__restrict , size_t _size, size_t _n, FILE *));
#endif
#if __GNU_VISIBLE
@@ -583,35 +583,35 @@ int _EXFUN(__swbuf_r, (struct _reent *, int, FILE *));
#if __BSD_VISIBLE
# ifdef __LARGE64_FILES
-FILE *_EXFUN(funopen,(const _PTR __cookie,
- int (*__readfn)(_PTR __c, char *__buf,
+FILE *_EXFUN(funopen,(const void *__cookie,
+ int (*__readfn)(void *__c, char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
- int (*__writefn)(_PTR __c, const char *__buf,
+ int (*__writefn)(void *__c, const char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
- _fpos64_t (*__seekfn)(_PTR __c, _fpos64_t __off, int __whence),
- int (*__closefn)(_PTR __c)));
-FILE *_EXFUN(_funopen_r,(struct _reent *, const _PTR __cookie,
- int (*__readfn)(_PTR __c, char *__buf,
+ _fpos64_t (*__seekfn)(void *__c, _fpos64_t __off, int __whence),
+ int (*__closefn)(void *__c)));
+FILE *_EXFUN(_funopen_r,(struct _reent *, const void *__cookie,
+ int (*__readfn)(void *__c, char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
- int (*__writefn)(_PTR __c, const char *__buf,
+ int (*__writefn)(void *__c, const char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
- _fpos64_t (*__seekfn)(_PTR __c, _fpos64_t __off, int __whence),
- int (*__closefn)(_PTR __c)));
+ _fpos64_t (*__seekfn)(void *__c, _fpos64_t __off, int __whence),
+ int (*__closefn)(void *__c)));
# else
-FILE *_EXFUN(funopen,(const _PTR __cookie,
- int (*__readfn)(_PTR __cookie, char *__buf,
+FILE *_EXFUN(funopen,(const void *__cookie,
+ int (*__readfn)(void *__cookie, char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
- int (*__writefn)(_PTR __cookie, const char *__buf,
+ int (*__writefn)(void *__cookie, const char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
- fpos_t (*__seekfn)(_PTR __cookie, fpos_t __off, int __whence),
- int (*__closefn)(_PTR __cookie)));
-FILE *_EXFUN(_funopen_r,(struct _reent *, const _PTR __cookie,
- int (*__readfn)(_PTR __cookie, char *__buf,
+ fpos_t (*__seekfn)(void *__cookie, fpos_t __off, int __whence),
+ int (*__closefn)(void *__cookie)));
+FILE *_EXFUN(_funopen_r,(struct _reent *, const void *__cookie,
+ int (*__readfn)(void *__cookie, char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
- int (*__writefn)(_PTR __cookie, const char *__buf,
+ int (*__writefn)(void *__cookie, const char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
- fpos_t (*__seekfn)(_PTR __cookie, fpos_t __off, int __whence),
- int (*__closefn)(_PTR __cookie)));
+ fpos_t (*__seekfn)(void *__cookie, fpos_t __off, int __whence),
+ int (*__closefn)(void *__cookie)));
# endif /* !__LARGE64_FILES */
# define fropen(__cookie, __fn) funopen(__cookie, __fn, (int (*)())0, \
diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h
index ac433db21..7213a3c16 100644
--- a/newlib/libc/include/stdlib.h
+++ b/newlib/libc/include/stdlib.h
@@ -54,7 +54,7 @@ typedef struct
#ifndef __compar_fn_t_defined
#define __compar_fn_t_defined
-typedef int (*__compar_fn_t) (const _PTR, const _PTR);
+typedef int (*__compar_fn_t) (const void *, const void *);
#endif
#define EXIT_FAILURE 1
@@ -82,15 +82,15 @@ int _EXFUN(atoi,(const char *__nptr));
int _EXFUN(_atoi_r,(struct _reent *, const char *__nptr));
long _EXFUN(atol,(const char *__nptr));
long _EXFUN(_atol_r,(struct _reent *, const char *__nptr));
-_PTR _EXFUN(bsearch,(const _PTR __key,
- const _PTR __base,
+void * _EXFUN(bsearch,(const void *__key,
+ const void *__base,
size_t __nmemb,
size_t __size,
__compar_fn_t _compar));
-_PTR _EXFUN_NOTHROW(calloc,(size_t __nmemb, size_t __size));
+void * _EXFUN_NOTHROW(calloc,(size_t __nmemb, size_t __size));
div_t _EXFUN(div,(int __numer, int __denom));
_VOID _EXFUN(exit,(int __status) _ATTRIBUTE ((__noreturn__)));
-_VOID _EXFUN_NOTHROW(free,(_PTR));
+_VOID _EXFUN_NOTHROW(free,(void *));
char * _EXFUN(getenv,(const char *__string));
char * _EXFUN(_getenv_r,(struct _reent *, const char *__string));
char * _EXFUN(_findenv,(const char *, int *));
@@ -101,7 +101,7 @@ int _EXFUN(getsubopt,(char **, char * const *, char **));
#endif
long _EXFUN(labs,(long));
ldiv_t _EXFUN(ldiv,(long __numer, long __denom));
-_PTR _EXFUN_NOTHROW(malloc,(size_t __size));
+void * _EXFUN_NOTHROW(malloc,(size_t __size));
int _EXFUN(mblen,(const char *, size_t));
int _EXFUN(_mblen_r,(struct _reent *, const char *, size_t, _mbstate_t *));
int _EXFUN(mbtowc,(wchar_t *__restrict, const char *__restrict, size_t));
@@ -136,13 +136,13 @@ int _EXFUN(_mkostemps_r, (struct _reent *, char *, int, int));
int _EXFUN(_mkstemp_r, (struct _reent *, char *));
int _EXFUN(_mkstemps_r, (struct _reent *, char *, int));
char * _EXFUN(_mktemp_r, (struct _reent *, char *) _ATTRIBUTE ((__deprecated__("the use of `mktemp' is dangerous; use `mkstemp' instead"))));
-_VOID _EXFUN(qsort,(_PTR __base, size_t __nmemb, size_t __size, __compar_fn_t _compar));
+_VOID _EXFUN(qsort,(void *__base, size_t __nmemb, size_t __size, __compar_fn_t _compar));
int _EXFUN(rand,(_VOID));
-_PTR _EXFUN_NOTHROW(realloc,(_PTR __r, size_t __size));
+void * _EXFUN_NOTHROW(realloc,(void *__r, size_t __size));
#if __BSD_VISIBLE
void *reallocarray(void *, size_t, size_t) __result_use_check __alloc_size(2)
__alloc_size(3);
-_PTR _EXFUN(reallocf,(_PTR __r, size_t __size));
+void * _EXFUN(reallocf,(void *__r, size_t __size));
#endif
#if __BSD_VISIBLE || __XSI_VISIBLE >= 4
char * _EXFUN(realpath, (const char *__restrict path, char *__restrict resolved_path));
@@ -193,7 +193,7 @@ char * _EXFUN(l64a,(long __input));
char * _EXFUN(_l64a_r,(struct _reent *,long __input));
#endif
#if __MISC_VISIBLE
-int _EXFUN(on_exit,(_VOID (*__func)(int, _PTR),_PTR __arg));
+int _EXFUN(on_exit,(_VOID (*__func)(int, void *),void *__arg));
#endif
#if __ISO_C_VISIBLE >= 1999
_VOID _EXFUN(_Exit,(int __status) _ATTRIBUTE ((__noreturn__)));
@@ -202,7 +202,7 @@ _VOID _EXFUN(_Exit,(int __status) _ATTRIBUTE ((__noreturn__)));
int _EXFUN(putenv,(char *__string));
#endif
int _EXFUN(_putenv_r,(struct _reent *, char *__string));
-_PTR _EXFUN(_reallocf_r,(struct _reent *, _PTR, size_t));
+void * _EXFUN(_reallocf_r,(struct _reent *, void *, size_t));
#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112
int _EXFUN(setenv,(const char *__string, const char *__value, int __overwrite));
#endif
@@ -273,7 +273,7 @@ unsigned long long _EXFUN(_strtoull_r,(struct _reent *, const char *__restrict _
#ifndef __CYGWIN__
#if __MISC_VISIBLE
-_VOID _EXFUN(cfree,(_PTR));
+_VOID _EXFUN(cfree,(void *));
#endif
#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112
int _EXFUN(unsetenv,(const char *__string));
@@ -287,10 +287,10 @@ int _EXFUN(__nonnull ((1)) posix_memalign,(void **, size_t, size_t));
char * _EXFUN(_dtoa_r,(struct _reent *, double, int, int, int *, int*, char**));
#ifndef __CYGWIN__
-_PTR _EXFUN_NOTHROW(_malloc_r,(struct _reent *, size_t));
-_PTR _EXFUN_NOTHROW(_calloc_r,(struct _reent *, size_t, size_t));
-_VOID _EXFUN_NOTHROW(_free_r,(struct _reent *, _PTR));
-_PTR _EXFUN_NOTHROW(_realloc_r,(struct _reent *, _PTR, size_t));
+void * _EXFUN_NOTHROW(_malloc_r,(struct _reent *, size_t));
+void * _EXFUN_NOTHROW(_calloc_r,(struct _reent *, size_t, size_t));
+_VOID _EXFUN_NOTHROW(_free_r,(struct _reent *, void *));
+void * _EXFUN_NOTHROW(_realloc_r,(struct _reent *, void *, size_t));
_VOID _EXFUN(_mstats_r,(struct _reent *, char *));
#endif
int _EXFUN(_system_r,(struct _reent *, const char *));
@@ -302,13 +302,13 @@ _VOID _EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *))
version. We want that #undef qsort_r will still let you
invoke the underlying function, but that requires gcc support. */
#if __GNU_VISIBLE
-_VOID _EXFUN(qsort_r,(_PTR __base, size_t __nmemb, size_t __size, int (*_compar)(const _PTR, const _PTR, _PTR), _PTR __thunk));
+_VOID _EXFUN(qsort_r,(void *__base, size_t __nmemb, size_t __size, int (*_compar)(const void *, const void *, void *), void *__thunk));
#elif __BSD_VISIBLE
# ifdef __GNUC__
-_VOID _EXFUN(qsort_r,(_PTR __base, size_t __nmemb, size_t __size, _PTR __thunk, int (*_compar)(_PTR, const _PTR, const _PTR)))
+_VOID _EXFUN(qsort_r,(void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *)))
__asm__ (__ASMNAME ("__bsd_qsort_r"));
# else
-_VOID _EXFUN(__bsd_qsort_r,(_PTR __base, size_t __nmemb, size_t __size, _PTR __thunk, int (*_compar)(_PTR, const _PTR, const _PTR)));
+_VOID _EXFUN(__bsd_qsort_r,(void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *)));
# define qsort_r __bsd_qsort_r
# endif
#endif
diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h
index b54b83335..e44ac3079 100644
--- a/newlib/libc/include/string.h
+++ b/newlib/libc/include/string.h
@@ -26,11 +26,11 @@
_BEGIN_STD_C
-_PTR _EXFUN(memchr,(const _PTR, int, size_t));
-int _EXFUN(memcmp,(const _PTR, const _PTR, size_t));
-_PTR _EXFUN(memcpy,(_PTR __restrict, const _PTR __restrict, size_t));
-_PTR _EXFUN(memmove,(_PTR, const _PTR, size_t));
-_PTR _EXFUN(memset,(_PTR, int, size_t));
+void * _EXFUN(memchr,(const void *, int, size_t));
+int _EXFUN(memcmp,(const void *, const void *, size_t));
+void * _EXFUN(memcpy,(void *__restrict, const void *__restrict, size_t));
+void * _EXFUN(memmove,(void *, const void *, size_t));
+void * _EXFUN(memset,(void *, int, size_t));
char *_EXFUN(strcat,(char *__restrict, const char *__restrict));
char *_EXFUN(strchr,(const char *, int));
int _EXFUN(strcmp,(const char *, const char *));
@@ -64,13 +64,13 @@ int _EXFUN(timingsafe_bcmp,(const void *, const void *, size_t));
int _EXFUN(timingsafe_memcmp,(const void *, const void *, size_t));
#endif
#if __MISC_VISIBLE || __POSIX_VISIBLE
-_PTR _EXFUN(memccpy,(_PTR __restrict, const _PTR __restrict, int, size_t));
+void * _EXFUN(memccpy,(void *__restrict, const void *__restrict, int, size_t));
#endif
#if __GNU_VISIBLE
-_PTR _EXFUN(mempcpy,(_PTR, const _PTR, size_t));
-_PTR _EXFUN(memmem, (const _PTR, size_t, const _PTR, size_t));
-_PTR _EXFUN(memrchr,(const _PTR, int, size_t));
-_PTR _EXFUN(rawmemchr,(const _PTR, int));
+void * _EXFUN(mempcpy,(void *, const void *, size_t));
+void * _EXFUN(memmem, (const void *, size_t, const void *, size_t));
+void * _EXFUN(memrchr,(const void *, int, size_t));
+void * _EXFUN(rawmemchr,(const void *, int));
#endif
#if __POSIX_VISIBLE >= 200809
char *_EXFUN(stpcpy,(char *__restrict, const char *__restrict));
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index aa352dc08..1381db67b 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -192,15 +192,15 @@ struct __sFILE {
#endif
/* operations */
- _PTR _cookie; /* cookie passed to io functions */
+ void * _cookie; /* cookie passed to io functions */
- _READ_WRITE_RETURN_TYPE _EXFNPTR(_read, (struct _reent *, _PTR,
+ _READ_WRITE_RETURN_TYPE _EXFNPTR(_read, (struct _reent *, void *,
char *, _READ_WRITE_BUFSIZE_TYPE));
- _READ_WRITE_RETURN_TYPE _EXFNPTR(_write, (struct _reent *, _PTR,
+ _READ_WRITE_RETURN_TYPE _EXFNPTR(_write, (struct _reent *, void *,
const char *,
_READ_WRITE_BUFSIZE_TYPE));
- _fpos_t _EXFNPTR(_seek, (struct _reent *, _PTR, _fpos_t, int));
- int _EXFNPTR(_close, (struct _reent *, _PTR));
+ _fpos_t _EXFNPTR(_seek, (struct _reent *, void *, _fpos_t, int));
+ int _EXFNPTR(_close, (struct _reent *, void *));
/* separate buffer for long sequences of ungetc() */
struct __sbuf _ub; /* ungetc buffer */
@@ -248,15 +248,15 @@ struct __sFILE64 {
struct _reent *_data;
/* operations */
- _PTR _cookie; /* cookie passed to io functions */
+ void * _cookie; /* cookie passed to io functions */
- _READ_WRITE_RETURN_TYPE _EXFNPTR(_read, (struct _reent *, _PTR,
+ _READ_WRITE_RETURN_TYPE _EXFNPTR(_read, (struct _reent *, void *,
char *, _READ_WRITE_BUFSIZE_TYPE));
- _READ_WRITE_RETURN_TYPE _EXFNPTR(_write, (struct _reent *, _PTR,
+ _READ_WRITE_RETURN_TYPE _EXFNPTR(_write, (struct _reent *, void *,
const char *,
_READ_WRITE_BUFSIZE_TYPE));
- _fpos_t _EXFNPTR(_seek, (struct _reent *, _PTR, _fpos_t, int));
- int _EXFNPTR(_close, (struct _reent *, _PTR));
+ _fpos_t _EXFNPTR(_seek, (struct _reent *, void *, _fpos_t, int));
+ int _EXFNPTR(_close, (struct _reent *, void *));
/* separate buffer for long sequences of ungetc() */
struct __sbuf _ub; /* ungetc buffer */
@@ -275,7 +275,7 @@ struct __sFILE64 {
int _flags2; /* for future use */
_off64_t _offset; /* current lseek offset */
- _fpos64_t _EXFNPTR(_seek64, (struct _reent *, _PTR, _fpos64_t, int));
+ _fpos64_t _EXFNPTR(_seek64, (struct _reent *, void *, _fpos64_t, int));
#ifndef __SINGLE_THREAD__
_flock_t _lock; /* for thread-safety locking */
diff --git a/newlib/libc/machine/powerpc/machine/malloc.h b/newlib/libc/machine/powerpc/machine/malloc.h
index 945a9651a..6be7eac80 100644
--- a/newlib/libc/machine/powerpc/machine/malloc.h
+++ b/newlib/libc/machine/powerpc/machine/malloc.h
@@ -3,14 +3,14 @@
# if defined(__ALTIVEC__)
-_PTR _EXFUN(vec_calloc,(size_t __nmemb, size_t __size));
-_PTR _EXFUN(_vec_calloc_r,(struct _reent *, size_t __nmemb, size_t __size));
-_VOID _EXFUN(vec_free,(_PTR));
+void *_EXFUN(vec_calloc,(size_t __nmemb, size_t __size));
+void *_EXFUN(_vec_calloc_r,(struct _reent *, size_t __nmemb, size_t __size));
+_VOID _EXFUN(vec_free,(void *));
#define _vec_freer _freer
-_PTR _EXFUN(vec_malloc,(size_t __size));
+void *_EXFUN(vec_malloc,(size_t __size));
#define _vec_mallocr _memalign_r
-_PTR _EXFUN(vec_realloc,(_PTR __r, size_t __size));
-_PTR _EXFUN(_vec_realloc_r,(struct _reent *, _PTR __r, size_t __size));
+void *_EXFUN(vec_realloc,(void *__r, size_t __size));
+void *_EXFUN(_vec_realloc_r,(struct _reent *, void *__r, size_t __size));
# endif /* __ALTIVEC__ */
diff --git a/newlib/libc/machine/powerpc/machine/stdlib.h b/newlib/libc/machine/powerpc/machine/stdlib.h
index 1cf18371a..bc9b9cfe9 100644
--- a/newlib/libc/machine/powerpc/machine/stdlib.h
+++ b/newlib/libc/machine/powerpc/machine/stdlib.h
@@ -5,14 +5,14 @@
# if defined(__ALTIVEC__)
-_PTR _EXFUN(vec_calloc,(size_t __nmemb, size_t __size));
-_PTR _EXFUN(_vec_calloc_r,(struct _reent *, size_t __nmemb, size_t __size));
-_VOID _EXFUN(vec_free,(_PTR));
+void *_EXFUN(vec_calloc,(size_t __nmemb, size_t __size));
+void *_EXFUN(_vec_calloc_r,(struct _reent *, size_t __nmemb, size_t __size));
+_VOID _EXFUN(vec_free,(void *));
#define _vec_freer _freer
-_PTR _EXFUN(vec_malloc,(size_t __size));
+void *_EXFUN(vec_malloc,(size_t __size));
#define _vec_mallocr _memalign_r
-_PTR _EXFUN(vec_realloc,(_PTR __r, size_t __size));
-_PTR _EXFUN(_vec_realloc_r,(struct _reent *, _PTR __r, size_t __size));
+void *_EXFUN(vec_realloc,(void *__r, size_t __size));
+void *_EXFUN(_vec_realloc_r,(struct _reent *, void *__r, size_t __size));
# endif /* __ALTIVEC__ */
diff --git a/newlib/libc/machine/powerpc/vec_calloc.c b/newlib/libc/machine/powerpc/vec_calloc.c
index 8a10507d3..cc156bc76 100644
--- a/newlib/libc/machine/powerpc/vec_calloc.c
+++ b/newlib/libc/machine/powerpc/vec_calloc.c
@@ -43,7 +43,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifndef _REENT_ONLY
-_PTR
+void *
_DEFUN (vec_calloc, (n, size),
size_t n,
size_t size)
diff --git a/newlib/libc/machine/powerpc/vec_free.c b/newlib/libc/machine/powerpc/vec_free.c
index b55c52dde..fa2ea9686 100644
--- a/newlib/libc/machine/powerpc/vec_free.c
+++ b/newlib/libc/machine/powerpc/vec_free.c
@@ -7,7 +7,7 @@
void
_DEFUN (vec_free, (aptr),
- _PTR aptr)
+ void *aptr)
{
_free_r (_REENT, aptr);
}
diff --git a/newlib/libc/machine/powerpc/vec_malloc.c b/newlib/libc/machine/powerpc/vec_malloc.c
index 181f360f0..ad62b119f 100644
--- a/newlib/libc/machine/powerpc/vec_malloc.c
+++ b/newlib/libc/machine/powerpc/vec_malloc.c
@@ -95,7 +95,7 @@ Supporting OS subroutines required: <<sbrk>>. */
#ifndef _REENT_ONLY
-_PTR
+void *
_DEFUN (vec_malloc, (nbytes),
size_t nbytes) /* get a block */
{
diff --git a/newlib/libc/machine/powerpc/vec_realloc.c b/newlib/libc/machine/powerpc/vec_realloc.c
index 7e857b55a..05ee82be1 100644
--- a/newlib/libc/machine/powerpc/vec_realloc.c
+++ b/newlib/libc/machine/powerpc/vec_realloc.c
@@ -6,9 +6,9 @@
#ifndef _REENT_ONLY
-_PTR
+void *
_DEFUN (vec_realloc, (ap, nbytes),
- _PTR ap,
+ void *ap,
size_t nbytes)
{
return _vec_realloc_r (_REENT, ap, nbytes);
diff --git a/newlib/libc/machine/powerpc/vfscanf.c b/newlib/libc/machine/powerpc/vfscanf.c
index df5344e20..b27a0b81c 100644
--- a/newlib/libc/machine/powerpc/vfscanf.c
+++ b/newlib/libc/machine/powerpc/vfscanf.c
@@ -928,7 +928,7 @@ __svfscanf_r (rptr, fp, fmt0, ap)
*p = 0;
res = (*ccfn) (rptr, buf, (char **) NULL, base);
if ((flags & POINTER) && !(flags & VECTOR))
- *(va_arg (ap, _PTR *)) = (_PTR) (unsigned _POINTER_INT) res;
+ *(va_arg (ap, void **)) = (void *) (unsigned _POINTER_INT) res;
else if (flags & SHORT)
{
if (!(flags & VECTOR))
diff --git a/newlib/libc/machine/spu/fread.c b/newlib/libc/machine/spu/fread.c
index 3ea24cc4a..8a6e9c417 100644
--- a/newlib/libc/machine/spu/fread.c
+++ b/newlib/libc/machine/spu/fread.c
@@ -50,7 +50,7 @@ typedef struct
size_t
_DEFUN (fread, (buf, size, count, fp),
- _PTR __restrict buf,
+ void *__restrict buf,
size_t size,
size_t count,
FILE *__restrict fp)
diff --git a/newlib/libc/machine/spu/fwrite.c b/newlib/libc/machine/spu/fwrite.c
index 149eb1345..0db2f549b 100644
--- a/newlib/libc/machine/spu/fwrite.c
+++ b/newlib/libc/machine/spu/fwrite.c
@@ -50,7 +50,7 @@ typedef struct
size_t
_DEFUN (fwrite, (buf, size, count, fp),
- const _PTR __restrict buf,
+ const void *__restrict buf,
size_t size,
size_t count,
FILE * fp)
diff --git a/newlib/libc/machine/xstormy16/mallocr.c b/newlib/libc/machine/xstormy16/mallocr.c
index 23e02f74c..07be53039 100644
--- a/newlib/libc/machine/xstormy16/mallocr.c
+++ b/newlib/libc/machine/xstormy16/mallocr.c
@@ -1,7 +1,7 @@
#include <malloc.h>
#ifdef DEFINE_MALLOC
-_PTR
+void *
_malloc_r (struct _reent *r, size_t sz)
{
return malloc (sz);
@@ -9,7 +9,7 @@ _malloc_r (struct _reent *r, size_t sz)
#endif
#ifdef DEFINE_CALLOC
-_PTR
+void *
_calloc_r (struct _reent *r, size_t a, size_t b)
{
return calloc (a, b);
@@ -18,15 +18,15 @@ _calloc_r (struct _reent *r, size_t a, size_t b)
#ifdef DEFINE_FREE
void
-_free_r (struct _reent *r, _PTR x)
+_free_r (struct _reent *r, void *x)
{
free (x);
}
#endif
#ifdef DEFINE_REALLOC
-_PTR
-_realloc_r (struct _reent *r, _PTR x, size_t sz)
+void *
+_realloc_r (struct _reent *r, void *x, size_t sz)
{
return realloc (x, sz);
}
diff --git a/newlib/libc/reent/readr.c b/newlib/libc/reent/readr.c
index edc6fd08b..9a3a694cc 100644
--- a/newlib/libc/reent/readr.c
+++ b/newlib/libc/reent/readr.c
@@ -41,7 +41,7 @@ _ssize_t
_DEFUN (_read_r, (ptr, fd, buf, cnt),
struct _reent *ptr,
int fd,
- _PTR buf,
+ void *buf,
size_t cnt)
{
_ssize_t ret;
diff --git a/newlib/libc/reent/writer.c b/newlib/libc/reent/writer.c
index 4c4f95f77..8d4b37530 100644
--- a/newlib/libc/reent/writer.c
+++ b/newlib/libc/reent/writer.c
@@ -41,7 +41,7 @@ _ssize_t
_DEFUN (_write_r, (ptr, fd, buf, cnt),
struct _reent *ptr,
int fd,
- const _PTR buf,
+ const void *buf,
size_t cnt)
{
_ssize_t ret;
diff --git a/newlib/libc/search/bsearch.c b/newlib/libc/search/bsearch.c
index 86380a816..79a489680 100644
--- a/newlib/libc/search/bsearch.c
+++ b/newlib/libc/search/bsearch.c
@@ -55,15 +55,15 @@ No supporting OS subroutines are required.
#include <stdlib.h>
-_PTR
+void *
_DEFUN (bsearch, (key, base, nmemb, size, compar),
- const _PTR key,
- const _PTR base,
+ const void *key,
+ const void *base,
size_t nmemb,
size_t size,
- int _EXFNPTR(compar, (const _PTR, const _PTR)))
+ int _EXFNPTR(compar, (const void *, const void *)))
{
- _PTR current;
+ void *current;
size_t lower = 0;
size_t upper = nmemb;
size_t index;
@@ -75,7 +75,7 @@ _DEFUN (bsearch, (key, base, nmemb, size, compar),
while (lower < upper)
{
index = (lower + upper) / 2;
- current = (_PTR) (((char *) base) + (index * size));
+ current = (void *) (((char *) base) + (index * size));
result = compar (key, current);
diff --git a/newlib/libc/stdio/fdopen.c b/newlib/libc/stdio/fdopen.c
index 82b7a9bc2..876a94117 100644
--- a/newlib/libc/stdio/fdopen.c
+++ b/newlib/libc/stdio/fdopen.c
@@ -94,7 +94,7 @@ _DEFUN(_fdopen_r, (ptr, fd, mode),
_fcntl_r (ptr, fd, F_SETFL, fdflags | O_APPEND);
#endif
fp->_file = fd;
- fp->_cookie = (_PTR) fp;
+ fp->_cookie = (void *) fp;
#undef _read
#undef _write
diff --git a/newlib/libc/stdio/fgets.c b/newlib/libc/stdio/fgets.c
index 5edeef957..d4e0af35c 100644
--- a/newlib/libc/stdio/fgets.c
+++ b/newlib/libc/stdio/fgets.c
@@ -164,20 +164,20 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp),
*/
if (len > n)
len = n;
- t = (unsigned char *) memchr ((_PTR) p, '\n', len);
+ t = (unsigned char *) memchr ((void *) p, '\n', len);
if (t != 0)
{
len = ++t - p;
fp->_r -= len;
fp->_p = t;
- _CAST_VOID memcpy ((_PTR) s, (_PTR) p, len);
+ _CAST_VOID memcpy ((void *) s, (void *) p, len);
s[len] = 0;
_newlib_flockfile_exit (fp);
return (buf);
}
fp->_r -= len;
fp->_p += len;
- _CAST_VOID memcpy ((_PTR) s, (_PTR) p, len);
+ _CAST_VOID memcpy ((void *) s, (void *) p, len);
s += len;
}
while ((n -= len) != 0);
diff --git a/newlib/libc/stdio/fopen.c b/newlib/libc/stdio/fopen.c
index e6b044557..57268945f 100644
--- a/newlib/libc/stdio/fopen.c
+++ b/newlib/libc/stdio/fopen.c
@@ -142,7 +142,7 @@ _DEFUN(_fopen_r, (ptr, file, mode),
fp->_file = f;
fp->_flags = flags;
- fp->_cookie = (_PTR) fp;
+ fp->_cookie = (void *) fp;
fp->_read = __sread;
fp->_write = __swrite;
fp->_seek = __sseek;
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
index cff60efe1..58aa2c68d 100644
--- a/newlib/libc/stdio/fread.c
+++ b/newlib/libc/stdio/fread.c
@@ -144,7 +144,7 @@ _DEFUN(crlf_r, (ptr, fp, buf, count, eof),
size_t
_DEFUN(_fread_r, (ptr, buf, size, count, fp),
struct _reent * ptr,
- _PTR __restrict buf,
+ void *__restrict buf,
size_t size,
size_t count,
FILE * __restrict fp)
@@ -173,7 +173,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp),
{
/* First copy any available characters from ungetc buffer. */
int copy_size = resid > fp->_r ? fp->_r : resid;
- _CAST_VOID memcpy ((_PTR) p, (_PTR) fp->_p, (size_t) copy_size);
+ _CAST_VOID memcpy ((void *) p, (void *) fp->_p, (size_t) copy_size);
fp->_p += copy_size;
fp->_r -= copy_size;
p += copy_size;
@@ -222,7 +222,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp),
{
while (resid > (r = fp->_r))
{
- _CAST_VOID memcpy ((_PTR) p, (_PTR) fp->_p, (size_t) r);
+ _CAST_VOID memcpy ((void *) p, (void *) fp->_p, (size_t) r);
fp->_p += r;
/* fp->_r = 0 ... done in __srefill */
p += r;
@@ -241,7 +241,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp),
return (total - resid) / size;
}
}
- _CAST_VOID memcpy ((_PTR) p, (_PTR) fp->_p, resid);
+ _CAST_VOID memcpy ((void *) p, (void *) fp->_p, resid);
fp->_r -= resid;
fp->_p += resid;
}
@@ -261,7 +261,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp),
#ifndef _REENT_ONLY
size_t
_DEFUN(fread, (buf, size, count, fp),
- _PTR __restrict buf,
+ void *__restrict buf,
size_t size,
size_t count,
FILE *__restrict fp)
diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c
index 7e70b9a98..46cbd81ce 100644
--- a/newlib/libc/stdio/freopen.c
+++ b/newlib/libc/stdio/freopen.c
@@ -221,7 +221,7 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
fp->_flags = flags;
fp->_file = f;
- fp->_cookie = (_PTR) fp;
+ fp->_cookie = (void *) fp;
fp->_read = __sread;
fp->_write = __swrite;
fp->_seek = __sseek;
diff --git a/newlib/libc/stdio/fseeko.c b/newlib/libc/stdio/fseeko.c
index 58bb9511b..a2ed1b5b5 100644
--- a/newlib/libc/stdio/fseeko.c
+++ b/newlib/libc/stdio/fseeko.c
@@ -99,7 +99,7 @@ _DEFUN(_fseeko_r, (ptr, fp, offset, whence),
_off_t offset,
int whence)
{
- _fpos_t _EXFNPTR(seekfn, (struct _reent *, _PTR, _fpos_t, int));
+ _fpos_t _EXFNPTR(seekfn, (struct _reent *, void *, _fpos_t, int));
_fpos_t target;
_fpos_t curoff = 0;
size_t n;
diff --git a/newlib/libc/stdio/fvwrite.c b/newlib/libc/stdio/fvwrite.c
index c93888dc4..95bd34c6d 100644
--- a/newlib/libc/stdio/fvwrite.c
+++ b/newlib/libc/stdio/fvwrite.c
@@ -26,7 +26,7 @@
#include "fvwrite.h"
#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define COPY(n) _CAST_VOID memmove ((_PTR) fp->_p, (_PTR) p, (size_t) (n))
+#define COPY(n) _CAST_VOID memmove ((void *) fp->_p, (void *) p, (size_t) (n))
#define GETIOV(extra_work) \
while (len == 0) \
@@ -219,7 +219,7 @@ _DEFUN(__sfvwrite_r, (ptr, fp, uio),
GETIOV (nlknown = 0);
if (!nlknown)
{
- nl = memchr ((_PTR) p, '\n', len);
+ nl = memchr ((void *) p, '\n', len);
nldist = nl ? nl + 1 - p : len + 1;
nlknown = 1;
}
diff --git a/newlib/libc/stdio/fvwrite.h b/newlib/libc/stdio/fvwrite.h
index 8b01a2a9d..91cabc890 100644
--- a/newlib/libc/stdio/fvwrite.h
+++ b/newlib/libc/stdio/fvwrite.h
@@ -22,7 +22,7 @@
* I/O descriptors for __sfvwrite_r().
*/
struct __siov {
- const _PTR iov_base;
+ const void *iov_base;
size_t iov_len;
};
struct __suio {
diff --git a/newlib/libc/stdio/fwrite.c b/newlib/libc/stdio/fwrite.c
index cfaa2499a..7dec80c1a 100644
--- a/newlib/libc/stdio/fwrite.c
+++ b/newlib/libc/stdio/fwrite.c
@@ -110,7 +110,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
size_t
_DEFUN(_fwrite_r, (ptr, buf, size, count, fp),
struct _reent * ptr,
- const _PTR __restrict buf,
+ const void *__restrict buf,
size_t size,
size_t count,
FILE * __restrict fp)
@@ -171,7 +171,7 @@ ret:
#ifndef _REENT_ONLY
size_t
_DEFUN(fwrite, (buf, size, count, fp),
- const _PTR __restrict buf,
+ const void *__restrict buf,
size_t size,
size_t count,
FILE * fp)
diff --git a/newlib/libc/stdio/makebuf.c b/newlib/libc/stdio/makebuf.c
index ac1276b48..c76527da6 100644
--- a/newlib/libc/stdio/makebuf.c
+++ b/newlib/libc/stdio/makebuf.c
@@ -39,7 +39,7 @@ _DEFUN(__smakebuf_r, (ptr, fp),
struct _reent *ptr,
register FILE *fp)
{
- register _PTR p;
+ register void *p;
int flags;
size_t size;
int couldbetty;
diff --git a/newlib/libc/stdio/nano-vfprintf.c b/newlib/libc/stdio/nano-vfprintf.c
index ad75b195c..58359dd4a 100644
--- a/newlib/libc/stdio/nano-vfprintf.c
+++ b/newlib/libc/stdio/nano-vfprintf.c
@@ -229,7 +229,7 @@ _DEFUN(__ssputs_r, (ptr, fp, buf, len),
if (len < w)
w = len;
- (void)memmove ((_PTR) fp->_p, (_PTR) buf, (size_t) (w));
+ (void)memmove ((void *) fp->_p, (void *) buf, (size_t) (w));
fp->_w -= w;
fp->_p += w;
return 0;
@@ -321,7 +321,7 @@ _DEFUN(__ssprint_r, (ptr, fp, uio),
if (len < w)
w = len;
- (void)memmove ((_PTR) fp->_p, (_PTR) p, (size_t) (w));
+ (void)memmove ((void *) fp->_p, (void *) p, (size_t) (w));
fp->_w -= w;
fp->_p += w;
/* Pretend we copied all. */
diff --git a/newlib/libc/stdio/nano-vfprintf_local.h b/newlib/libc/stdio/nano-vfprintf_local.h
index f883741d2..15ddce08e 100644
--- a/newlib/libc/stdio/nano-vfprintf_local.h
+++ b/newlib/libc/stdio/nano-vfprintf_local.h
@@ -114,7 +114,7 @@ extern char *_dtoa_r (struct _reent *, double, int,
#define u_quad_t unsigned long
typedef quad_t * quad_ptr_t;
-typedef _PTR void_ptr_t;
+typedef void *void_ptr_t;
typedef char * char_ptr_t;
typedef long * long_ptr_t;
typedef int * int_ptr_t;
diff --git a/newlib/libc/stdio/nano-vfscanf.c b/newlib/libc/stdio/nano-vfscanf.c
index 0196b285a..553fc22cb 100644
--- a/newlib/libc/stdio/nano-vfscanf.c
+++ b/newlib/libc/stdio/nano-vfscanf.c
@@ -255,7 +255,7 @@ _DEFUN(__ssrefill_r, (ptr, fp),
#else
int _EXFUN (_sungetc_r, (struct _reent *, int, register FILE *));
int _EXFUN (__ssrefill_r, (struct _reent *, register FILE *));
-size_t _EXFUN (_sfread_r, (struct _reent *, _PTR buf, size_t, size_t, FILE *));
+size_t _EXFUN (_sfread_r, (struct _reent *, void *buf, size_t, size_t, FILE *));
#endif /* !STRING_ONLY. */
int
diff --git a/newlib/libc/stdio/setvbuf.c b/newlib/libc/stdio/setvbuf.c
index 684a8b582..6ce0ee1fe 100644
--- a/newlib/libc/stdio/setvbuf.c
+++ b/newlib/libc/stdio/setvbuf.c
@@ -123,7 +123,7 @@ _DEFUN(setvbuf, (fp, buf, mode, size),
FREEUB(reent, fp);
fp->_r = fp->_lbfsize = 0;
if (fp->_flags & __SMBF)
- _free_r (reent, (_PTR) fp->_bf._base);
+ _free_r (reent, (void *) fp->_bf._base);
fp->_flags &= ~(__SLBF | __SNBF | __SMBF | __SOPT | __SNPT | __SEOF);
if (mode == _IONBF)
diff --git a/newlib/libc/stdio/stdio.c b/newlib/libc/stdio/stdio.c
index e64c061dd..0e8016b12 100644
--- a/newlib/libc/stdio/stdio.c
+++ b/newlib/libc/stdio/stdio.c
@@ -65,7 +65,7 @@ _DEFUN(__sread, (ptr, cookie, buf, n),
_READ_WRITE_RETURN_TYPE
_DEFUN(__seofread, (ptr, cookie, buf, len),
struct _reent *_ptr,
- _PTR cookie,
+ void *cookie,
char *buf,
_READ_WRITE_BUFSIZE_TYPE len)
{
diff --git a/newlib/libc/stdio/ungetc.c b/newlib/libc/stdio/ungetc.c
index 98590478b..f7e12880e 100644
--- a/newlib/libc/stdio/ungetc.c
+++ b/newlib/libc/stdio/ungetc.c
@@ -100,10 +100,10 @@ _DEFUN(__submore, (rptr, fp),
return 0;
}
i = fp->_ub._size;
- p = (unsigned char *) _realloc_r (rptr, (_PTR) (fp->_ub._base), i << 1);
+ p = (unsigned char *) _realloc_r (rptr, (void *) (fp->_ub._base), i << 1);
if (p == NULL)
return EOF;
- _CAST_VOID memcpy ((_PTR) (p + i), (_PTR) p, (size_t) i);
+ _CAST_VOID memcpy ((void *) (p + i), (void *) p, (size_t) i);
fp->_p = p + i;
fp->_ub._base = p;
fp->_ub._size = i << 1;
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index b9b17fe58..f2d052b13 100644
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -254,7 +254,7 @@ _DEFUN(__ssputs_r, (ptr, fp, buf, len),
}
if (len < w)
w = len;
- (void)memmove ((_PTR) fp->_p, (_PTR) buf, (size_t) (w));
+ (void)memmove ((void *) fp->_p, (void *) buf, (size_t) (w));
fp->_w -= w;
fp->_p += w;
@@ -339,7 +339,7 @@ _DEFUN(__ssprint_r, (ptr, fp, uio),
}
if (len < w)
w = len;
- (void)memmove ((_PTR) fp->_p, (_PTR) p, (size_t) (w));
+ (void)memmove ((void *) fp->_p, (void *) p, (size_t) (w));
fp->_w -= w;
fp->_p += w;
w = len; /* pretend we copied all */
@@ -571,7 +571,7 @@ static int exponent(char *, int, int);
#endif
typedef quad_t * quad_ptr_t;
-typedef _PTR void_ptr_t;
+typedef void *void_ptr_t;
typedef char * char_ptr_t;
typedef long * long_ptr_t;
typedef int * int_ptr_t;
@@ -1175,7 +1175,7 @@ reswitch: switch (ch) {
if (ch == 'C' || (flags & LONGINT)) {
mbstate_t ps;
- memset ((_PTR)&ps, '\0', sizeof (mbstate_t));
+ memset ((void *)&ps, '\0', sizeof (mbstate_t));
if ((size = (int)_wcrtomb_r (data, cp,
(wchar_t)GET_ARG (N, ap, wint_t),
&ps)) == -1) {
@@ -1463,7 +1463,7 @@ string:
wcp = (const wchar_t *)cp;
size = m = 0;
- memset ((_PTR)&ps, '\0', sizeof (mbstate_t));
+ memset ((void *)&ps, '\0', sizeof (mbstate_t));
/* Count number of bytes needed for multibyte
string that will be produced from widechar
@@ -1509,7 +1509,7 @@ string:
cp = buf;
/* Convert widechar string to multibyte string. */
- memset ((_PTR)&ps, '\0', sizeof (mbstate_t));
+ memset ((void *)&ps, '\0', sizeof (mbstate_t));
if (_wcsrtombs_r (data, cp, &wcp, size, &ps)
!= size) {
fp->_flags |= __SERR;
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index 38ef36ea5..8009699e4 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -349,7 +349,7 @@ _DEFUN(__ssrefill_r, (ptr, fp),
size_t
_DEFUN(_sfread_r, (ptr, buf, size, count, fp),
struct _reent * ptr,
- _PTR buf,
+ void *buf,
size_t size,
size_t count,
FILE * fp)
@@ -367,7 +367,7 @@ _DEFUN(_sfread_r, (ptr, buf, size, count, fp),
while (resid > (r = fp->_r))
{
- _CAST_VOID memcpy ((_PTR) p, (_PTR) fp->_p, (size_t) r);
+ _CAST_VOID memcpy ((void *) p, (void *) fp->_p, (size_t) r);
fp->_p += r;
fp->_r = 0;
p += r;
@@ -378,7 +378,7 @@ _DEFUN(_sfread_r, (ptr, buf, size, count, fp),
return (total - resid) / size;
}
}
- _CAST_VOID memcpy ((_PTR) p, (_PTR) fp->_p, resid);
+ _CAST_VOID memcpy ((void *) p, (void *) fp->_p, resid);
fp->_r -= resid;
fp->_p += resid;
return count;
@@ -386,7 +386,7 @@ _DEFUN(_sfread_r, (ptr, buf, size, count, fp),
#else /* !STRING_ONLY || !INTEGER_ONLY */
int _EXFUN (_sungetc_r, (struct _reent *, int, register FILE *));
int _EXFUN (__ssrefill_r, (struct _reent *, register FILE *));
-size_t _EXFUN (_sfread_r, (struct _reent *, _PTR buf, size_t, size_t, FILE *));
+size_t _EXFUN (_sfread_r, (struct _reent *, void *buf, size_t, size_t, FILE *));
#endif /* !STRING_ONLY || !INTEGER_ONLY */
static inline int
diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
index 1054eb942..449b628db 100644
--- a/newlib/libc/stdio/vfwprintf.c
+++ b/newlib/libc/stdio/vfwprintf.c
@@ -289,7 +289,7 @@ static int wexponent(wchar_t *, int, int);
#endif
typedef quad_t * quad_ptr_t;
-typedef _PTR void_ptr_t;
+typedef void *void_ptr_t;
typedef char * char_ptr_t;
typedef wchar_t* wchar_ptr_t;
typedef long * long_ptr_t;
@@ -1199,7 +1199,7 @@ string:
if (prec >= 0) {
char *p = arg;
- memset ((_PTR)&ps, '\0', sizeof (mbstate_t));
+ memset ((void *)&ps, '\0', sizeof (mbstate_t));
while (nchars < (size_t)prec) {
nconv = mbrlen (p, MB_CUR_MAX, &ps);
if (nconv == 0 || nconv == (size_t)-1 ||
@@ -1224,7 +1224,7 @@ string:
cp = malloc_buf;
} else
cp = buf;
- memset ((_PTR)&ps, '\0', sizeof (mbstate_t));
+ memset ((void *)&ps, '\0', sizeof (mbstate_t));
p = cp;
while (insize != 0) {
nconv = _mbrtowc_r (data, p, arg, insize, &ps);
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
index 73d8f3209..3ac6ecc07 100644
--- a/newlib/libc/stdio/vfwscanf.c
+++ b/newlib/libc/stdio/vfwscanf.c
@@ -936,7 +936,7 @@ _DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap),
else
mbp = GET_ARG(N, ap, char *);
n = 0;
- memset ((_PTR)&mbs, '\0', sizeof (mbstate_t));
+ memset ((void *)&mbs, '\0', sizeof (mbstate_t));
while (width != 0 && (wi = _fgetwc_r (rptr, fp)) != WEOF)
{
nconv = _wcrtomb_r (rptr, mbp, wi, &mbs);
@@ -1028,7 +1028,7 @@ _DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap),
else
mbp = GET_ARG(N, ap, char *);
n = 0;
- memset ((_PTR) &mbs, '\0', sizeof (mbstate_t));
+ memset ((void *) &mbs, '\0', sizeof (mbstate_t));
while ((wi = _fgetwc_r (rptr, fp)) != WEOF
&& width != 0 && INCCL (wi))
{
@@ -1117,7 +1117,7 @@ _DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap),
#endif
else
mbp = GET_ARG(N, ap, char *);
- memset ((_PTR) &mbs, '\0', sizeof (mbstate_t));
+ memset ((void *) &mbs, '\0', sizeof (mbstate_t));
while ((wi = _fgetwc_r (rptr, fp)) != WEOF
&& width != 0 && !iswspace (wi))
{
diff --git a/newlib/libc/stdio64/fdopen64.c b/newlib/libc/stdio64/fdopen64.c
index f0c3c0784..3c8d4fa05 100644
--- a/newlib/libc/stdio64/fdopen64.c
+++ b/newlib/libc/stdio64/fdopen64.c
@@ -76,7 +76,7 @@ _DEFUN (_fdopen64_r, (ptr, fd, mode),
_fcntl_r (ptr, fd, F_SETFL, fdflags | O_APPEND);
#endif
fp->_file = fd;
- fp->_cookie = (_PTR) fp;
+ fp->_cookie = (void *) fp;
#undef _read
#undef _write
diff --git a/newlib/libc/stdio64/fopen64.c b/newlib/libc/stdio64/fopen64.c
index 6bdf61973..406afa190 100644
--- a/newlib/libc/stdio64/fopen64.c
+++ b/newlib/libc/stdio64/fopen64.c
@@ -93,7 +93,7 @@ _DEFUN (_fopen64_r, (ptr, file, mode),
fp->_file = f;
fp->_flags = flags;
- fp->_cookie = (_PTR) fp;
+ fp->_cookie = (void *) fp;
fp->_read = __sread;
fp->_write = __swrite64;
fp->_seek = __sseek;
diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c
index 02995b98a..d267899c6 100644
--- a/newlib/libc/stdio64/freopen64.c
+++ b/newlib/libc/stdio64/freopen64.c
@@ -222,7 +222,7 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp),
fp->_flags = flags;
fp->_file = f;
- fp->_cookie = (_PTR) fp;
+ fp->_cookie = (void *) fp;
fp->_read = __sread;
fp->_write = __swrite64;
fp->_seek = __sseek;
diff --git a/newlib/libc/stdlib/__call_atexit.c b/newlib/libc/stdlib/__call_atexit.c
index e6c1ee643..ad70fcd33 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, _PTR d)
+ int code, void *d)
{
register struct _atexit *p;
struct _atexit **lastp;
@@ -119,9 +119,9 @@ _DEFUN (__call_exitprocs, (code, d),
if (!args || (args->_fntypes & i) == 0)
fn ();
else if ((args->_is_cxa & i) == 0)
- (*((void (*)(int, _PTR)) fn))(code, args->_fnargs[n]);
+ (*((void (*)(int, void *)) fn))(code, args->_fnargs[n]);
else
- (*((void (*)(_PTR)) fn))(args->_fnargs[n]);
+ (*((void (*)(void *)) fn))(args->_fnargs[n]);
/* The function we called call atexit and registered another
function (or functions). Call these new functions before
diff --git a/newlib/libc/stdlib/atexit.h b/newlib/libc/stdlib/atexit.h
index eadc7d13d..df99963d5 100644
--- a/newlib/libc/stdlib/atexit.h
+++ b/newlib/libc/stdlib/atexit.h
@@ -9,6 +9,6 @@ enum __atexit_types
__et_cxa
};
-void __call_exitprocs (int, _PTR);
-int __register_exitproc (int, void (*fn) (void), _PTR, _PTR);
+void __call_exitprocs (int, void *);
+int __register_exitproc (int, void (*fn) (void), void *, void *);
diff --git a/newlib/libc/stdlib/calloc.c b/newlib/libc/stdlib/calloc.c
index dfdb7f5dc..f853f4f3c 100644
--- a/newlib/libc/stdlib/calloc.c
+++ b/newlib/libc/stdlib/calloc.c
@@ -45,7 +45,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifndef _REENT_ONLY
-_PTR
+void *
_DEFUN (calloc, (n, size),
size_t n,
size_t size)
diff --git a/newlib/libc/stdlib/cxa_atexit.c b/newlib/libc/stdlib/cxa_atexit.c
index c03894c4a..096add4fa 100644
--- a/newlib/libc/stdlib/cxa_atexit.c
+++ b/newlib/libc/stdlib/cxa_atexit.c
@@ -30,7 +30,7 @@ _DEFUN (__cxa_atexit,
{
#ifdef _LITE_EXIT
/* Refer to comments in __atexit.c for more details of lite exit. */
- int __register_exitproc (int, void (*fn) (void), _PTR, _PTR)
+ int __register_exitproc (int, void (*fn) (void), void *, void *)
__attribute__ ((weak));
if (!__register_exitproc)
diff --git a/newlib/libc/stdlib/exit.c b/newlib/libc/stdlib/exit.c
index 481985cd1..8fa949081 100644
--- a/newlib/libc/stdlib/exit.c
+++ b/newlib/libc/stdlib/exit.c
@@ -55,7 +55,7 @@ _DEFUN (exit, (code),
{
#ifdef _LITE_EXIT
/* Refer to comments in __atexit.c for more details of lite exit. */
- void __call_exitprocs (int, _PTR)) __attribute__((weak);
+ void __call_exitprocs (int, void *)) __attribute__((weak);
if (__call_exitprocs)
#endif
__call_exitprocs (code, NULL);
diff --git a/newlib/libc/stdlib/malign.c b/newlib/libc/stdlib/malign.c
index d36846f98..e7d56bb51 100644
--- a/newlib/libc/stdlib/malign.c
+++ b/newlib/libc/stdlib/malign.c
@@ -8,7 +8,7 @@
#ifndef _REENT_ONLY
-_PTR
+void *
_DEFUN (memalign, (align, nbytes),
size_t align,
size_t nbytes)
diff --git a/newlib/libc/stdlib/malloc.c b/newlib/libc/stdlib/malloc.c
index 9cf897852..5acaa85d3 100644
--- a/newlib/libc/stdlib/malloc.c
+++ b/newlib/libc/stdlib/malloc.c
@@ -158,7 +158,7 @@ Supporting OS subroutines required: <<sbrk>>. */
#ifndef _REENT_ONLY
-_PTR
+void *
_DEFUN (malloc, (nbytes),
size_t nbytes) /* get a block */
{
@@ -167,7 +167,7 @@ _DEFUN (malloc, (nbytes),
void
_DEFUN (free, (aptr),
- _PTR aptr)
+ void *aptr)
{
_free_r (_REENT, aptr);
}
diff --git a/newlib/libc/stdlib/msize.c b/newlib/libc/stdlib/msize.c
index e33e4aa37..8c2b221e4 100644
--- a/newlib/libc/stdlib/msize.c
+++ b/newlib/libc/stdlib/msize.c
@@ -10,7 +10,7 @@
size_t
_DEFUN (malloc_usable_size, (ptr),
- _PTR ptr)
+ void *ptr)
{
return _malloc_usable_size_r (_REENT, ptr);
}
diff --git a/newlib/libc/stdlib/on_exit.c b/newlib/libc/stdlib/on_exit.c
index b21cf0cb2..329b25425 100644
--- a/newlib/libc/stdlib/on_exit.c
+++ b/newlib/libc/stdlib/on_exit.c
@@ -68,8 +68,8 @@ const void * const __on_exit_dummy = &__on_exit_args;
int
_DEFUN (on_exit,
(fn, arg),
- _VOID _EXFNPTR(fn, (int, _PTR)),
- _PTR arg)
+ _VOID _EXFNPTR(fn, (int, void *)),
+ void *arg)
{
return __register_exitproc (__et_onexit, (void (*)(void)) fn, arg, NULL);
}
diff --git a/newlib/libc/stdlib/realloc.c b/newlib/libc/stdlib/realloc.c
index 8258e211e..00a88a5a2 100644
--- a/newlib/libc/stdlib/realloc.c
+++ b/newlib/libc/stdlib/realloc.c
@@ -10,9 +10,9 @@ int _dummy_realloc = 1;
#ifndef _REENT_ONLY
-_PTR
+void *
_DEFUN (realloc, (ap, nbytes),
- _PTR ap,
+ void *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 b3f1b2aab..c4aaeaeaa 100644
--- a/newlib/libc/stdlib/reallocf.c
+++ b/newlib/libc/stdlib/reallocf.c
@@ -30,10 +30,10 @@
#include <stdlib.h>
-_PTR
+void *
_DEFUN (_reallocf_r, (reentptr, ptr, size),
struct _reent *reentptr,
- _PTR ptr,
+ void *ptr,
size_t size)
{
void *nptr;
@@ -45,9 +45,9 @@ _DEFUN (_reallocf_r, (reentptr, ptr, size),
}
#ifndef _REENT_ONLY
-_PTR
+void *
_DEFUN (reallocf, (ptr, size),
- _PTR ptr,
+ void *ptr,
size_t size)
{
return _reallocf_r(_REENT, ptr, size);
diff --git a/newlib/libc/stdlib/valloc.c b/newlib/libc/stdlib/valloc.c
index 26a44df44..83a839e31 100644
--- a/newlib/libc/stdlib/valloc.c
+++ b/newlib/libc/stdlib/valloc.c
@@ -8,14 +8,14 @@
#ifndef _REENT_ONLY
-_PTR
+void *
_DEFUN (valloc, (nbytes),
size_t nbytes)
{
return _valloc_r (_REENT, nbytes);
}
-_PTR
+void *
_DEFUN (pvalloc, (nbytes),
size_t nbytes)
{
diff --git a/newlib/libc/string/memccpy.c b/newlib/libc/string/memccpy.c
index b03b504c1..9b94061cb 100644
--- a/newlib/libc/string/memccpy.c
+++ b/newlib/libc/string/memccpy.c
@@ -55,16 +55,16 @@ PORTABILITY
#endif
-_PTR
+void *
_DEFUN (memccpy, (dst0, src0, endchar, len0),
- _PTR __restrict dst0,
- const _PTR __restrict src0,
+ void *__restrict dst0,
+ const void *__restrict src0,
int endchar0,
size_t len0)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
- _PTR ptr = NULL;
+ void *ptr = NULL;
char *dst = (char *) dst0;
char *src = (char *) src0;
char endchar = endchar0 & 0xff;
@@ -80,7 +80,7 @@ _DEFUN (memccpy, (dst0, src0, endchar, len0),
return ptr;
#else
- _PTR ptr = NULL;
+ void *ptr = NULL;
char *dst = dst0;
const char *src = src0;
long *aligned_dst;
diff --git a/newlib/libc/string/memchr.c b/newlib/libc/string/memchr.c
index 9660ed383..91f0b3788 100644
--- a/newlib/libc/string/memchr.c
+++ b/newlib/libc/string/memchr.c
@@ -61,9 +61,9 @@ QUICKREF
to fill (long)MASK. */
#define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
-_PTR
+void *
_DEFUN (memchr, (src_void, c, length),
- const _PTR src_void,
+ const void *src_void,
int c,
size_t length)
{
diff --git a/newlib/libc/string/memcmp.c b/newlib/libc/string/memcmp.c
index 37d653a26..c05cf5745 100644
--- a/newlib/libc/string/memcmp.c
+++ b/newlib/libc/string/memcmp.c
@@ -44,8 +44,8 @@ QUICKREF
int
_DEFUN (memcmp, (m1, m2, n),
- const _PTR m1,
- const _PTR m2,
+ const void *m1,
+ const void *m2,
size_t n)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/memcpy.c b/newlib/libc/string/memcpy.c
index 919379053..e1ae0ffe9 100644
--- a/newlib/libc/string/memcpy.c
+++ b/newlib/libc/string/memcpy.c
@@ -43,17 +43,17 @@ QUICKREF
/* Threshhold for punting to the byte copier. */
#define TOO_SMALL(LEN) ((LEN) < BIGBLOCKSIZE)
-_PTR
+void *
_DEFUN (memcpy, (dst0, src0, len0),
- _PTR __restrict dst0,
- const _PTR __restrict src0,
+ void *__restrict dst0,
+ const void *__restrict src0,
size_t len0)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
char *dst = (char *) dst0;
char *src = (char *) src0;
- _PTR save = dst0;
+ void *save = dst0;
while (len0--)
{
diff --git a/newlib/libc/string/memmove.c b/newlib/libc/string/memmove.c
index e50ab587a..70adb836c 100644
--- a/newlib/libc/string/memmove.c
+++ b/newlib/libc/string/memmove.c
@@ -48,11 +48,11 @@ QUICKREF
#define TOO_SMALL(LEN) ((LEN) < BIGBLOCKSIZE)
/*SUPPRESS 20*/
-_PTR
+void *
__inhibit_loop_to_libcall
_DEFUN (memmove, (dst_void, src_void, length),
- _PTR dst_void,
- const _PTR src_void,
+ void *dst_void,
+ const void *src_void,
size_t length)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/mempcpy.c b/newlib/libc/string/mempcpy.c
index 79cbf2350..babaea006 100644
--- a/newlib/libc/string/mempcpy.c
+++ b/newlib/libc/string/mempcpy.c
@@ -42,10 +42,10 @@ PORTABILITY
/* Threshhold for punting to the byte copier. */
#define TOO_SMALL(LEN) ((LEN) < BIGBLOCKSIZE)
-_PTR
+void *
_DEFUN (mempcpy, (dst0, src0, len0),
- _PTR dst0,
- const _PTR src0,
+ void *dst0,
+ const void *src0,
size_t len0)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/memrchr.c b/newlib/libc/string/memrchr.c
index 7a28e2733..432f46212 100644
--- a/newlib/libc/string/memrchr.c
+++ b/newlib/libc/string/memrchr.c
@@ -61,9 +61,9 @@ QUICKREF
to fill (long)MASK. */
#define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
-_PTR
+void *
_DEFUN (memrchr, (src_void, c, length),
- const _PTR src_void,
+ const void *src_void,
int c,
size_t length)
{
diff --git a/newlib/libc/string/memset.c b/newlib/libc/string/memset.c
index 284c36e2c..5ce15c5aa 100644
--- a/newlib/libc/string/memset.c
+++ b/newlib/libc/string/memset.c
@@ -33,10 +33,10 @@ QUICKREF
#define UNALIGNED(X) ((long)X & (LBLOCKSIZE - 1))
#define TOO_SMALL(LEN) ((LEN) < LBLOCKSIZE)
-_PTR
+void *
__inhibit_loop_to_libcall
_DEFUN (memset, (m, c, n),
- _PTR m,
+ void *m,
int c,
size_t n)
{
diff --git a/newlib/libc/string/rawmemchr.c b/newlib/libc/string/rawmemchr.c
index b2078dc27..881bd231a 100644
--- a/newlib/libc/string/rawmemchr.c
+++ b/newlib/libc/string/rawmemchr.c
@@ -60,9 +60,9 @@ QUICKREF
to fill (long)MASK. */
#define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
-_PTR
+void *
_DEFUN (rawmemchr, (src_void, c),
- const _PTR src_void,
+ const void *src_void,
int c)
{
const unsigned char *src = (const unsigned char *) src_void;
diff --git a/newlib/libc/sys/linux/pread.c b/newlib/libc/sys/linux/pread.c
index 8a016e08a..8d905598f 100644
--- a/newlib/libc/sys/linux/pread.c
+++ b/newlib/libc/sys/linux/pread.c
@@ -9,7 +9,7 @@ ssize_t
_DEFUN (_pread_r, (rptr, fd, buf, n, off),
struct _reent *rptr,
int fd,
- _PTR buf,
+ void *buf,
size_t n,
off_t off)
{
@@ -35,7 +35,7 @@ _DEFUN (_pread_r, (rptr, fd, buf, n, off),
ssize_t
_DEFUN (__libc_pread, (fd, buf, n, off),
int fd,
- _PTR buf,
+ void *buf,
size_t n,
off_t off)
{
diff --git a/newlib/libc/sys/linux/pread64.c b/newlib/libc/sys/linux/pread64.c
index f95989b45..20d1f9c35 100644
--- a/newlib/libc/sys/linux/pread64.c
+++ b/newlib/libc/sys/linux/pread64.c
@@ -32,7 +32,7 @@ Supporting OS subroutine required: <<read>>, <<lseek64>>.
ssize_t
_DEFUN (__libc_pread64, (fd, buf, n, off),
int fd,
- _PTR buf,
+ void *buf,
size_t n,
loff_t off)
{
diff --git a/newlib/libc/sys/linux/pwrite.c b/newlib/libc/sys/linux/pwrite.c
index 2db2935ed..b0ec9c233 100644
--- a/newlib/libc/sys/linux/pwrite.c
+++ b/newlib/libc/sys/linux/pwrite.c
@@ -9,7 +9,7 @@ ssize_t
_DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
struct _reent *rptr,
int fd,
- const _PTR buf,
+ const void *buf,
size_t n,
off_t off)
{
@@ -35,7 +35,7 @@ _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
ssize_t
_DEFUN (__libc_pwrite, (fd, buf, n, off),
int fd,
- const _PTR buf,
+ const void *buf,
size_t n,
off_t off)
{
diff --git a/newlib/libc/sys/linux/pwrite64.c b/newlib/libc/sys/linux/pwrite64.c
index d486988dd..c80a3a2d3 100644
--- a/newlib/libc/sys/linux/pwrite64.c
+++ b/newlib/libc/sys/linux/pwrite64.c
@@ -32,7 +32,7 @@ Supporting OS subroutine required: <<write>>, <<lseek64>>.
ssize_t
_DEFUN (__libc_pwrite64, (fd, buf, n, off),
int fd,
- _PTR buf,
+ void *buf,
size_t n,
loff_t off)
{
diff --git a/newlib/libc/sys/rtems/crt0.c b/newlib/libc/sys/rtems/crt0.c
index 9778b985a..dca5fc8bc 100644
--- a/newlib/libc/sys/rtems/crt0.c
+++ b/newlib/libc/sys/rtems/crt0.c
@@ -30,7 +30,7 @@ ret func body
RTEMS_STUB(void *,malloc(size_t s), { return 0; })
RTEMS_STUB(void *,realloc(void* p, size_t s), { return 0; })
RTEMS_STUB(void, free(void* ptr), { })
-RTEMS_STUB(_PTR, calloc(size_t s1, size_t s2), { return 0; })
+RTEMS_STUB(void *, calloc(size_t s1, size_t s2), { return 0; })
RTEMS_STUB(int, posix_memalign(void **p, size_t si, size_t s2), { return -1; })
/* Stubs for routines from RTEMS <sys/lock.h> */
@@ -186,10 +186,10 @@ RTEMS_STUB(int, issetugid (void), { return 0; })
#endif
/* stdlib.h */
-RTEMS_STUB(_PTR, _realloc_r(struct _reent *r, _PTR p, size_t s), { return 0; })
-RTEMS_STUB(_PTR, _calloc_r(struct _reent *r, size_t s1, size_t s2), { return 0; })
-RTEMS_STUB(_PTR, _malloc_r(struct _reent * r, size_t s), { return 0; })
-RTEMS_STUB(_VOID, _free_r(struct _reent *r, _PTR *p), { })
+RTEMS_STUB(void *, _realloc_r(struct _reent *r, void *p, size_t s), { return 0; })
+RTEMS_STUB(void *, _calloc_r(struct _reent *r, size_t s1, size_t s2), { return 0; })
+RTEMS_STUB(void *, _malloc_r(struct _reent * r, size_t s), { return 0; })
+RTEMS_STUB(_VOID, _free_r(struct _reent *r, void **p), { })
/* stubs for functions required by libc/stdlib */
RTEMS_STUB(void, __assert_func(const char *file, int line, const char *failedexpr), { })
diff --git a/newlib/libc/unix/pread.c b/newlib/libc/unix/pread.c
index 236044465..54efe29fe 100644
--- a/newlib/libc/unix/pread.c
+++ b/newlib/libc/unix/pread.c
@@ -41,7 +41,7 @@ ssize_t
_DEFUN (_pread_r, (rptr, fd, buf, n, off),
struct _reent *rptr,
int fd,
- _PTR buf,
+ void *buf,
size_t n,
off_t off)
{
@@ -67,7 +67,7 @@ _DEFUN (_pread_r, (rptr, fd, buf, n, off),
ssize_t
_DEFUN (pread, (fd, buf, n, off),
int fd,
- _PTR buf,
+ void *buf,
size_t n,
off_t off)
{
diff --git a/newlib/libc/unix/pwrite.c b/newlib/libc/unix/pwrite.c
index 3bf759bd0..939d186d4 100644
--- a/newlib/libc/unix/pwrite.c
+++ b/newlib/libc/unix/pwrite.c
@@ -42,7 +42,7 @@ ssize_t
_DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
struct _reent *rptr,
int fd,
- const _PTR buf,
+ const void *buf,
size_t n,
off_t off)
{
@@ -68,7 +68,7 @@ _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
ssize_t
_DEFUN (pwrite, (fd, buf, n, off),
int fd,
- const _PTR buf,
+ const void *buf,
size_t n,
off_t off)
{
diff --git a/newlib/libc/xdr/xdr_sizeof.c b/newlib/libc/xdr/xdr_sizeof.c
index fe7aaa723..b7dc6d098 100644
--- a/newlib/libc/xdr/xdr_sizeof.c
+++ b/newlib/libc/xdr/xdr_sizeof.c
@@ -144,7 +144,7 @@ _DEFUN (x_putint32, (xdrs, int32p),
unsigned long
_DEFUN (xdr_sizeof, (func, data),
xdrproc_t func,
- _PTR data)
+ void *data)
{
XDR x;
struct xdr_ops ops;
diff --git a/winsup/cygwin/include/cygwin/stdlib.h b/winsup/cygwin/include/cygwin/stdlib.h
index fc8bc8486..845d2d81b 100644
--- a/winsup/cygwin/include/cygwin/stdlib.h
+++ b/winsup/cygwin/include/cygwin/stdlib.h
@@ -45,9 +45,9 @@ int posix_openpt (int);
#define _unsetenv_r UNUSED__unsetenv_r
#endif
-extern _PTR memalign (size_t, size_t);
+extern void *memalign (size_t, size_t);
#if __BSD_VISIBLE || (__XSI_VISIBLE >= 4 && __POSIX_VISIBLE < 200112)
-extern _PTR valloc (size_t);
+extern void *valloc (size_t);
#endif
#undef _malloc_r
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 14/17] ansification: remove _EXFUN, _EXFUN_NOTHROW
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
` (3 preceding siblings ...)
2017-12-07 18:20 ` [PATCH v2 01/17] ansification: remove _AND Yaakov Selkowitz
@ 2017-12-07 18:20 ` Yaakov Selkowitz
2017-12-07 19:08 ` Craig Howland
2017-12-07 18:20 ` [PATCH v2 13/17] ansification: remove _EXFNPTR, _EXPARM Yaakov Selkowitz
` (12 subsequent siblings)
17 siblings, 1 reply; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:20 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
libgloss/aarch64/syscalls.c | 2 +-
libgloss/arm/syscalls.c | 2 +-
libgloss/mcore/write.c | 2 +-
libgloss/sparc_leon/asm-leon/clock.h | 4 +-
libgloss/write.c | 2 +-
newlib/libc/ctype/local.h | 2 +-
newlib/libc/iconv/ces/table.c | 8 +-
newlib/libc/iconv/lib/ucsconv.c | 4 +-
newlib/libc/include/_ansi.h | 9 -
newlib/libc/include/alloca.h | 2 +-
newlib/libc/include/assert.h | 8 +-
newlib/libc/include/ctype.h | 32 +-
newlib/libc/include/envlock.h | 4 +-
newlib/libc/include/getopt.h | 28 +-
newlib/libc/include/iconv.h | 16 +-
newlib/libc/include/ieeefp.h | 16 +-
newlib/libc/include/libgen.h | 4 +-
newlib/libc/include/locale.h | 8 +-
newlib/libc/include/pthread.h | 352 +++++++--------
newlib/libc/include/rpc/xdr.h | 102 ++---
newlib/libc/include/setjmp.h | 6 +-
newlib/libc/include/signal.h | 10 +-
newlib/libc/include/spawn.h | 81 ++--
newlib/libc/include/stdio.h | 638 +++++++++++++--------------
newlib/libc/include/stdio_ext.h | 18 +-
newlib/libc/include/stdlib.h | 270 ++++++------
newlib/libc/include/string.h | 104 ++---
newlib/libc/include/sys/iconvnls.h | 22 +-
newlib/libc/include/sys/reent.h | 4 +-
newlib/libc/include/sys/resource.h | 2 +-
newlib/libc/include/sys/signal.h | 47 +-
newlib/libc/include/sys/stat.h | 42 +-
newlib/libc/include/sys/time.h | 24 +-
newlib/libc/include/sys/times.h | 4 +-
newlib/libc/include/sys/unistd.h | 266 +++++------
newlib/libc/include/time.h | 85 ++--
newlib/libc/include/wchar.h | 326 +++++++-------
newlib/libc/include/wctype.h | 36 +-
newlib/libc/machine/powerpc/machine/malloc.h | 12 +-
newlib/libc/machine/powerpc/machine/stdlib.h | 78 ++--
newlib/libc/machine/spu/c99ppe.h | 4 +-
newlib/libc/misc/__dprintf.c | 8 +-
newlib/libc/stdio/asnprintf.c | 8 +-
newlib/libc/stdio/asprintf.c | 8 +-
newlib/libc/stdio/dprintf.c | 8 +-
newlib/libc/stdio/fprintf.c | 8 +-
newlib/libc/stdio/fscanf.c | 8 +-
newlib/libc/stdio/fvwrite.h | 4 +-
newlib/libc/stdio/getline.c | 2 +-
newlib/libc/stdio/local.h | 106 ++---
newlib/libc/stdio/nano-vfprintf.c | 14 +-
newlib/libc/stdio/nano-vfscanf.c | 22 +-
newlib/libc/stdio/printf.c | 8 +-
newlib/libc/stdio/scanf.c | 8 +-
newlib/libc/stdio/snprintf.c | 8 +-
newlib/libc/stdio/sprintf.c | 8 +-
newlib/libc/stdio/sscanf.c | 8 +-
newlib/libc/stdio/vasnprintf.c | 8 +-
newlib/libc/stdio/vasprintf.c | 8 +-
newlib/libc/stdio/vdprintf.c | 8 +-
newlib/libc/stdio/vfprintf.c | 8 +-
newlib/libc/stdio/vfscanf.c | 6 +-
newlib/libc/stdio/vfwprintf.c | 12 +-
newlib/libc/stdio/vprintf.c | 6 +-
newlib/libc/stdio/vscanf.c | 6 +-
newlib/libc/stdio/vsnprintf.c | 8 +-
newlib/libc/stdio/vsprintf.c | 8 +-
newlib/libc/stdio/vsscanf.c | 8 +-
newlib/libc/stdlib/local.h | 2 +-
newlib/libc/stdlib/mbctype.h | 8 +-
newlib/libc/stdlib/mprec.h | 46 +-
newlib/libc/stdlib/rand48.h | 2 +-
newlib/libc/stdlib/system.c | 2 +-
newlib/libc/string/local.h | 2 +-
newlib/libc/sys/arm/syscalls.c | 2 +-
newlib/libc/sys/linux/include/setjmp.h | 8 +-
newlib/libc/sys/linux/include/time.h | 68 ++-
newlib/libc/sys/linux/sys/signal.h | 20 +-
newlib/libc/sys/linux/sys/stat.h | 18 +-
newlib/libc/sys/linux/sys/stdio.h | 2 +-
newlib/libc/sys/linux/sys/string.h | 2 +-
newlib/libc/sys/linux/sys/time.h | 12 +-
newlib/libc/sys/linux/sys/unistd.h | 178 ++++----
newlib/libc/sys/linux/sys/utime.h | 2 +-
newlib/libc/sys/sparc64/sys/stat.h | 12 +-
newlib/libc/time/local.h | 10 +-
newlib/libc/xdr/xdr_mem.c | 30 +-
newlib/libc/xdr/xdr_private.h | 10 +-
newlib/libc/xdr/xdr_rec.c | 24 +-
newlib/libc/xdr/xdr_stdio.c | 20 +-
newlib/libm/mathfp/zmath.h | 24 +-
newlib/libm/test/convert.c | 2 +-
newlib/libm/test/math.c | 12 +-
newlib/libm/test/test.h | 28 +-
winsup/cygwin/include/attr/xattr.h | 24 +-
winsup/cygwin/include/pty.h | 8 +-
winsup/cygwin/include/sys/stdio.h | 4 +-
winsup/cygwin/include/sys/utime.h | 2 +-
98 files changed, 1767 insertions(+), 1825 deletions(-)
diff --git a/libgloss/aarch64/syscalls.c b/libgloss/aarch64/syscalls.c
index 5aeb3d0b5..8198d3ed0 100644
--- a/libgloss/aarch64/syscalls.c
+++ b/libgloss/aarch64/syscalls.c
@@ -120,7 +120,7 @@ register char * stack_ptr asm ("sp");
/* following is copied from libc/stdio/local.h to check std streams */
-extern void _EXFUN (__sinit, (struct _reent *));
+extern void __sinit (struct _reent *);
#define CHECK_INIT(ptr) \
do \
{ \
diff --git a/libgloss/arm/syscalls.c b/libgloss/arm/syscalls.c
index b76858fc9..f80615db9 100644
--- a/libgloss/arm/syscalls.c
+++ b/libgloss/arm/syscalls.c
@@ -85,7 +85,7 @@ register char * stack_ptr asm ("sp");
/* following is copied from libc/stdio/local.h to check std streams */
-extern void _EXFUN(__sinit,(struct _reent *));
+extern void __sinit (struct _reent *);
#define CHECK_INIT(ptr) \
do \
{ \
diff --git a/libgloss/mcore/write.c b/libgloss/mcore/write.c
index 87dca10a1..8b50fe274 100644
--- a/libgloss/mcore/write.c
+++ b/libgloss/mcore/write.c
@@ -14,7 +14,7 @@
*/
#include "glue.h"
-extern int _EXFUN (outbyte, (char x));
+extern int outbyte (char x);
/*
* write -- write bytes to the serial port. Ignore fd, since
diff --git a/libgloss/sparc_leon/asm-leon/clock.h b/libgloss/sparc_leon/asm-leon/clock.h
index 189e942e1..7e33ae4d0 100644
--- a/libgloss/sparc_leon/asm-leon/clock.h
+++ b/libgloss/sparc_leon/asm-leon/clock.h
@@ -30,8 +30,8 @@
#include <asm-leon/param.h>
#ifndef __ASSEMBLER__
-int _EXFUN (gettimeofday, (struct timeval * __p, void *__tz));
-int _EXFUN (settimeofday, (const struct timeval *, const struct timezone *));
+int gettimeofday (struct timeval * __p, void *__tz);
+int settimeofday (const struct timeval *, const struct timezone *);
void do_gettimeofday (struct timeval *tv);
#endif
diff --git a/libgloss/write.c b/libgloss/write.c
index 4b25cfce7..28b7ea37a 100644
--- a/libgloss/write.c
+++ b/libgloss/write.c
@@ -14,7 +14,7 @@
*/
#include "glue.h"
-extern int _EXFUN (outbyte, (char x));
+extern int outbyte (char x);
/*
* write -- write bytes to the serial port. Ignore fd, since
diff --git a/newlib/libc/ctype/local.h b/newlib/libc/ctype/local.h
index b3788e218..62d2b1553 100644
--- a/newlib/libc/ctype/local.h
+++ b/newlib/libc/ctype/local.h
@@ -27,5 +27,5 @@
to the requirements of the underlying OS. */
#define _jp2uc(c) (c)
#else
-wint_t _EXFUN (_jp2uc, (wint_t));
+wint_t _jp2uc (wint_t);
#endif
diff --git a/newlib/libc/iconv/ces/table.c b/newlib/libc/iconv/ces/table.c
index 2b844d558..c8ef218a1 100644
--- a/newlib/libc/iconv/ces/table.c
+++ b/newlib/libc/iconv/ces/table.c
@@ -57,17 +57,17 @@
*/
static ucs2_t
-_EXFUN(find_code_size, (ucs2_t code, const __uint16_t *tblp));
+find_code_size (ucs2_t code, const __uint16_t *tblp);
static __inline ucs2_t
-_EXFUN(find_code_speed, (ucs2_t code, const __uint16_t *tblp));
+find_code_speed (ucs2_t code, const __uint16_t *tblp);
static __inline ucs2_t
-_EXFUN(find_code_speed_8bit, (ucs2_t code, const unsigned char *tblp));
+find_code_speed_8bit (ucs2_t code, const unsigned char *tblp);
#ifdef _ICONV_ENABLE_EXTERNAL_CCS
static const iconv_ccs_desc_t *
-_EXFUN(load_file, (struct _reent *rptr, const char *name, int direction));
+load_file (struct _reent *rptr, const char *name, int direction);
#endif
/*
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index 8c3d19073..59f4f993d 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -36,8 +36,8 @@
static int fake_data;
static int
-_EXFUN(find_encoding_name, (const char *searchee,
- const char **names));
+find_encoding_name (const char *searchee,
+ const char **names);
/*
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index 3e2490088..e2737ed48 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -47,19 +47,10 @@
#endif
#ifdef _HAVE_STDC
-#ifdef __CYGWIN__
-#define _EXFUN_NOTHROW(name, proto) __cdecl name proto _NOTHROW
-#define _EXFUN(name, proto) __cdecl name proto
-#else
-#define _EXFUN_NOTHROW(name, proto) name proto _NOTHROW
-#define _EXFUN(name, proto) name proto
-#endif
#ifndef _LONG_DOUBLE
#define _LONG_DOUBLE long double
#endif
#else
-#define _EXFUN(name, proto) name()
-#define _EXFUN_NOTHROW(name, proto) name()
#define _LONG_DOUBLE double
#endif
diff --git a/newlib/libc/include/alloca.h b/newlib/libc/include/alloca.h
index 2ea0fd9b3..5d3631891 100644
--- a/newlib/libc/include/alloca.h
+++ b/newlib/libc/include/alloca.h
@@ -15,7 +15,7 @@
#ifdef __GNUC__
#define alloca(size) __builtin_alloca(size)
#else
-void * _EXFUN(alloca,(size_t));
+void * alloca (size_t);
#endif
#endif
diff --git a/newlib/libc/include/assert.h b/newlib/libc/include/assert.h
index 91bb040ca..b9e5e9b4a 100644
--- a/newlib/libc/include/assert.h
+++ b/newlib/libc/include/assert.h
@@ -36,10 +36,10 @@ extern "C" {
# endif /* !__ASSERT_FUNC */
#endif /* !NDEBUG */
-void _EXFUN(__assert, (const char *, int, const char *)
- _ATTRIBUTE ((__noreturn__)));
-void _EXFUN(__assert_func, (const char *, int, const char *, const char *)
- _ATTRIBUTE ((__noreturn__)));
+void __assert (const char *, int, const char *)
+ _ATTRIBUTE ((__noreturn__));
+void __assert_func (const char *, int, const char *, const char *)
+ _ATTRIBUTE ((__noreturn__));
#if __STDC_VERSION__ >= 201112L && !defined __cplusplus
# define static_assert _Static_assert
diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h
index 0d705e131..f74b3499b 100644
--- a/newlib/libc/include/ctype.h
+++ b/newlib/libc/include/ctype.h
@@ -10,27 +10,27 @@
_BEGIN_STD_C
-int _EXFUN(isalnum, (int __c));
-int _EXFUN(isalpha, (int __c));
-int _EXFUN(iscntrl, (int __c));
-int _EXFUN(isdigit, (int __c));
-int _EXFUN(isgraph, (int __c));
-int _EXFUN(islower, (int __c));
-int _EXFUN(isprint, (int __c));
-int _EXFUN(ispunct, (int __c));
-int _EXFUN(isspace, (int __c));
-int _EXFUN(isupper, (int __c));
-int _EXFUN(isxdigit,(int __c));
-int _EXFUN(tolower, (int __c));
-int _EXFUN(toupper, (int __c));
+int isalnum (int __c);
+int isalpha (int __c);
+int iscntrl (int __c);
+int isdigit (int __c);
+int isgraph (int __c);
+int islower (int __c);
+int isprint (int __c);
+int ispunct (int __c);
+int isspace (int __c);
+int isupper (int __c);
+int isxdigit (int __c);
+int tolower (int __c);
+int toupper (int __c);
#if __ISO_C_VISIBLE >= 1999
-int _EXFUN(isblank, (int __c));
+int isblank (int __c);
#endif
#if __MISC_VISIBLE || __XSI_VISIBLE
-int _EXFUN(isascii, (int __c));
-int _EXFUN(toascii, (int __c));
+int isascii (int __c);
+int toascii (int __c);
#define _tolower(__c) ((unsigned char)(__c) - 'A' + 'a')
#define _toupper(__c) ((unsigned char)(__c) - 'a' + 'A')
#endif
diff --git a/newlib/libc/include/envlock.h b/newlib/libc/include/envlock.h
index 9bb6a813e..799cf7f9e 100644
--- a/newlib/libc/include/envlock.h
+++ b/newlib/libc/include/envlock.h
@@ -9,7 +9,7 @@
#define ENV_LOCK __env_lock(reent_ptr)
#define ENV_UNLOCK __env_unlock(reent_ptr)
-void _EXFUN(__env_lock,(struct _reent *reent));
-void _EXFUN(__env_unlock,(struct _reent *reent));
+void __env_lock (struct _reent *reent);
+void __env_unlock (struct _reent *reent);
#endif /* _INCLUDE_ENVLOCK_H_ */
diff --git a/newlib/libc/include/getopt.h b/newlib/libc/include/getopt.h
index e12d253d4..9bced42e4 100644
--- a/newlib/libc/include/getopt.h
+++ b/newlib/libc/include/getopt.h
@@ -153,31 +153,25 @@ extern "C"
extern int optopt;
/* function prototypes */
- int _EXFUN (getopt,
- (int __argc, char *const __argv[], const char *__optstring));
+ int getopt (int __argc, char *const __argv[], const char *__optstring);
- int _EXFUN (getopt_long,
- (int __argc, char *const __argv[], const char *__shortopts,
- const struct option * __longopts, int *__longind));
+ int getopt_long (int __argc, char *const __argv[], const char *__shortopts,
+ const struct option * __longopts, int *__longind);
- int _EXFUN (getopt_long_only,
- (int __argc, char *const __argv[], const char *__shortopts,
- const struct option * __longopts, int *__longind));
+ int getopt_long_only (int __argc, char *const __argv[], const char *__shortopts,
+ const struct option * __longopts, int *__longind);
#ifdef __need_getopt_newlib
- int _EXFUN (__getopt_r,
- (int __argc, char *const __argv[], const char *__optstring,
- struct getopt_data * __data));
+ int __getopt_r (int __argc, char *const __argv[], const char *__optstring,
+ struct getopt_data * __data);
- int _EXFUN (__getopt_long_r,
- (int __argc, char *const __argv[], const char *__shortopts,
+ int __getopt_long_r (int __argc, char *const __argv[], const char *__shortopts,
const struct option * __longopts, int *__longind,
- struct getopt_data * __data));
+ struct getopt_data * __data);
- int _EXFUN (__getopt_long_only_r,
- (int __argc, char *const __argv[], const char *__shortopts,
+ int __getopt_long_only_r (int __argc, char *const __argv[], const char *__shortopts,
const struct option * __longopts, int *__longind,
- struct getopt_data * __data));
+ struct getopt_data * __data);
#endif /* __need_getopt_newlib */
#ifdef __cplusplus
diff --git a/newlib/libc/include/iconv.h b/newlib/libc/include/iconv.h
index e19f73d85..37feb882f 100644
--- a/newlib/libc/include/iconv.h
+++ b/newlib/libc/include/iconv.h
@@ -38,25 +38,25 @@ _BEGIN_STD_C
#ifndef _REENT_ONLY
iconv_t
-_EXFUN(iconv_open, (const char *, const char *));
+iconv_open (const char *, const char *);
size_t
-_EXFUN(iconv, (iconv_t, char **__restrict, size_t *__restrict,
- char **__restrict, size_t *__restrict));
+iconv (iconv_t, char **__restrict, size_t *__restrict,
+ char **__restrict, size_t *__restrict);
int
-_EXFUN(iconv_close, (iconv_t));
+iconv_close (iconv_t);
#endif
iconv_t
-_EXFUN(_iconv_open_r, (struct _reent *, const char *, const char *));
+_iconv_open_r (struct _reent *, const char *, const char *);
size_t
-_EXFUN(_iconv_r, (struct _reent *, iconv_t, const char **,
- size_t *, char **, size_t *));
+_iconv_r (struct _reent *, iconv_t, const char **,
+ size_t *, char **, size_t *);
int
-_EXFUN(_iconv_close_r, (struct _reent *, iconv_t));
+_iconv_close_r (struct _reent *, iconv_t);
_END_STD_C
diff --git a/newlib/libc/include/ieeefp.h b/newlib/libc/include/ieeefp.h
index 2c042848b..2d6421a4c 100644
--- a/newlib/libc/include/ieeefp.h
+++ b/newlib/libc/include/ieeefp.h
@@ -215,8 +215,8 @@ typedef int fp_rnd;
#define FP_RP 2 /* Round up */
#define FP_RZ 3 /* Round to zero (trunate) */
-fp_rnd _EXFUN(fpgetround,(void));
-fp_rnd _EXFUN(fpsetround, (fp_rnd));
+fp_rnd fpgetround (void);
+fp_rnd fpsetround (fp_rnd);
/* EXCEPTIONS */
@@ -227,10 +227,10 @@ typedef int fp_except;
#define FP_X_UFL 0x02 /* Underflow exception */
#define FP_X_IMP 0x01 /* imprecise exception */
-fp_except _EXFUN(fpgetmask,(void));
-fp_except _EXFUN(fpsetmask,(fp_except));
-fp_except _EXFUN(fpgetsticky,(void));
-fp_except _EXFUN(fpsetsticky, (fp_except));
+fp_except fpgetmask (void);
+fp_except fpsetmask (fp_except);
+fp_except fpgetsticky (void);
+fp_except fpsetsticky (fp_except);
/* INTEGER ROUNDING */
@@ -238,8 +238,8 @@ typedef int fp_rdi;
#define FP_RDI_TOZ 0 /* Round to Zero */
#define FP_RDI_RD 1 /* Follow float mode */
-fp_rdi _EXFUN(fpgetroundtoi,(void));
-fp_rdi _EXFUN(fpsetroundtoi,(fp_rdi));
+fp_rdi fpgetroundtoi (void);
+fp_rdi fpsetroundtoi (fp_rdi);
#define __IEEE_DBL_EXPBIAS 1023
#define __IEEE_FLT_EXPBIAS 127
diff --git a/newlib/libc/include/libgen.h b/newlib/libc/include/libgen.h
index 3c717c5b0..414b5aa18 100644
--- a/newlib/libc/include/libgen.h
+++ b/newlib/libc/include/libgen.h
@@ -26,8 +26,8 @@ extern "C" {
sure here. */
#undef basename
#define basename __xpg_basename
-char *_EXFUN(basename, (char *)) __asm__(__ASMNAME("basename"));
-char *_EXFUN(dirname, (char *));
+char *basename (char *) __asm__(__ASMNAME("basename"));
+char *dirname (char *);
#ifdef __cplusplus
}
diff --git a/newlib/libc/include/locale.h b/newlib/libc/include/locale.h
index 8ba88a90c..d11eb00fb 100644
--- a/newlib/libc/include/locale.h
+++ b/newlib/libc/include/locale.h
@@ -68,8 +68,8 @@ struct lconv
};
struct _reent;
-char *_EXFUN(_setlocale_r,(struct _reent *, int, const char *));
-struct lconv *_EXFUN(_localeconv_r,(struct _reent *));
+char *_setlocale_r (struct _reent *, int, const char *);
+struct lconv *_localeconv_r (struct _reent *);
struct __locale_t *_newlocale_r (struct _reent *, int, const char *,
struct __locale_t *);
@@ -79,8 +79,8 @@ struct __locale_t *_uselocale_r (struct _reent *, struct __locale_t *);
#ifndef _REENT_ONLY
-char *_EXFUN(setlocale,(int, const char *));
-struct lconv *_EXFUN(localeconv,(void));
+char *setlocale (int, const char *);
+struct lconv *localeconv (void);
#if __POSIX_VISIBLE >= 200809
locale_t newlocale (int, const char *, locale_t);
diff --git a/newlib/libc/include/pthread.h b/newlib/libc/include/pthread.h
index 493eafd7e..3dee1c9ae 100644
--- a/newlib/libc/include/pthread.h
+++ b/newlib/libc/include/pthread.h
@@ -39,34 +39,32 @@ struct _pthread_cleanup_context {
};
/* Register Fork Handlers */
-int _EXFUN(pthread_atfork,(void (*prepare)(void), void (*parent)(void),
- void (*child)(void)));
+int pthread_atfork (void (*prepare)(void), void (*parent)(void),
+ void (*child)(void));
/* Mutex Initialization Attributes, P1003.1c/Draft 10, p. 81 */
-int _EXFUN(pthread_mutexattr_init, (pthread_mutexattr_t *__attr));
-int _EXFUN(pthread_mutexattr_destroy, (pthread_mutexattr_t *__attr));
-int _EXFUN(pthread_mutexattr_getpshared,
- (const pthread_mutexattr_t *__attr, int *__pshared));
-int _EXFUN(pthread_mutexattr_setpshared,
- (pthread_mutexattr_t *__attr, int __pshared));
+int pthread_mutexattr_init (pthread_mutexattr_t *__attr);
+int pthread_mutexattr_destroy (pthread_mutexattr_t *__attr);
+int pthread_mutexattr_getpshared (const pthread_mutexattr_t *__attr,
+ int *__pshared);
+int pthread_mutexattr_setpshared (pthread_mutexattr_t *__attr,
+ int __pshared);
#if defined(_UNIX98_THREAD_MUTEX_ATTRIBUTES)
/* Single UNIX Specification 2 Mutex Attributes types */
-int _EXFUN(pthread_mutexattr_gettype,
- (const pthread_mutexattr_t *__attr, int *__kind));
-int _EXFUN(pthread_mutexattr_settype,
- (pthread_mutexattr_t *__attr, int __kind));
+int pthread_mutexattr_gettype (const pthread_mutexattr_t *__attr, int *__kind);
+int pthread_mutexattr_settype (pthread_mutexattr_t *__attr, int __kind);
#endif
/* Initializing and Destroying a Mutex, P1003.1c/Draft 10, p. 87 */
-int _EXFUN(pthread_mutex_init,
- (pthread_mutex_t *__mutex, const pthread_mutexattr_t *__attr));
-int _EXFUN(pthread_mutex_destroy, (pthread_mutex_t *__mutex));
+int pthread_mutex_init (pthread_mutex_t *__mutex,
+ const pthread_mutexattr_t *__attr);
+int pthread_mutex_destroy (pthread_mutex_t *__mutex);
/* This is used to statically initialize a pthread_mutex_t. Example:
@@ -78,38 +76,36 @@ int _EXFUN(pthread_mutex_destroy, (pthread_mutex_t *__mutex));
/* Locking and Unlocking a Mutex, P1003.1c/Draft 10, p. 93
NOTE: P1003.4b/D8 adds pthread_mutex_timedlock(), p. 29 */
-int _EXFUN(pthread_mutex_lock, (pthread_mutex_t *__mutex));
-int _EXFUN(pthread_mutex_trylock, (pthread_mutex_t *__mutex));
-int _EXFUN(pthread_mutex_unlock, (pthread_mutex_t *__mutex));
+int pthread_mutex_lock (pthread_mutex_t *__mutex);
+int pthread_mutex_trylock (pthread_mutex_t *__mutex);
+int pthread_mutex_unlock (pthread_mutex_t *__mutex);
#if defined(_POSIX_TIMEOUTS)
-int _EXFUN(pthread_mutex_timedlock,
- (pthread_mutex_t *__mutex, const struct timespec *__timeout));
+int pthread_mutex_timedlock (pthread_mutex_t *__mutex,
+ const struct timespec *__timeout);
#endif /* _POSIX_TIMEOUTS */
/* Condition Variable Initialization Attributes, P1003.1c/Draft 10, p. 96 */
-int _EXFUN(pthread_condattr_init, (pthread_condattr_t *__attr));
-int _EXFUN(pthread_condattr_destroy, (pthread_condattr_t *__attr));
-
-int _EXFUN(pthread_condattr_getclock,
- (const pthread_condattr_t *__restrict __attr,
- clockid_t *__restrict __clock_id));
-int _EXFUN(pthread_condattr_setclock,
- (pthread_condattr_t *__attr, clockid_t __clock_id));
-
-int _EXFUN(pthread_condattr_getpshared,
- (const pthread_condattr_t *__attr, int *__pshared));
-int _EXFUN(pthread_condattr_setpshared,
- (pthread_condattr_t *__attr, int __pshared));
+int pthread_condattr_init (pthread_condattr_t *__attr);
+int pthread_condattr_destroy (pthread_condattr_t *__attr);
+
+int pthread_condattr_getclock (const pthread_condattr_t *__restrict __attr,
+ clockid_t *__restrict __clock_id);
+int pthread_condattr_setclock (pthread_condattr_t *__attr,
+ clockid_t __clock_id);
+
+int pthread_condattr_getpshared (const pthread_condattr_t *__attr,
+ int *__pshared);
+int pthread_condattr_setpshared (pthread_condattr_t *__attr, int __pshared);
/* Initializing and Destroying a Condition Variable, P1003.1c/Draft 10, p. 87 */
-int _EXFUN(pthread_cond_init,
- (pthread_cond_t *__cond, const pthread_condattr_t *__attr));
-int _EXFUN(pthread_cond_destroy, (pthread_cond_t *__mutex));
+int pthread_cond_init (pthread_cond_t *__cond,
+ const pthread_condattr_t *__attr);
+int pthread_cond_destroy (pthread_cond_t *__mutex);
/* This is used to statically initialize a pthread_cond_t. Example:
@@ -120,53 +116,50 @@ int _EXFUN(pthread_cond_destroy, (pthread_cond_t *__mutex));
/* Broadcasting and Signaling a Condition, P1003.1c/Draft 10, p. 101 */
-int _EXFUN(pthread_cond_signal, (pthread_cond_t *__cond));
-int _EXFUN(pthread_cond_broadcast, (pthread_cond_t *__cond));
+int pthread_cond_signal (pthread_cond_t *__cond);
+int pthread_cond_broadcast (pthread_cond_t *__cond);
/* Waiting on a Condition, P1003.1c/Draft 10, p. 105 */
-int _EXFUN(pthread_cond_wait,
- (pthread_cond_t *__cond, pthread_mutex_t *__mutex));
+int pthread_cond_wait (pthread_cond_t *__cond, pthread_mutex_t *__mutex);
-int _EXFUN(pthread_cond_timedwait,
- (pthread_cond_t *__cond, pthread_mutex_t *__mutex,
- const struct timespec *__abstime));
+int pthread_cond_timedwait (pthread_cond_t *__cond,
+ pthread_mutex_t *__mutex,
+ const struct timespec *__abstime);
#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
/* Thread Creation Scheduling Attributes, P1003.1c/Draft 10, p. 120 */
-int _EXFUN(pthread_attr_setscope,
- (pthread_attr_t *__attr, int __contentionscope));
-int _EXFUN(pthread_attr_getscope,
- (const pthread_attr_t *__attr, int *__contentionscope));
-int _EXFUN(pthread_attr_setinheritsched,
- (pthread_attr_t *__attr, int __inheritsched));
-int _EXFUN(pthread_attr_getinheritsched,
- (const pthread_attr_t *__attr, int *__inheritsched));
-int _EXFUN(pthread_attr_setschedpolicy,
- (pthread_attr_t *__attr, int __policy));
-int _EXFUN(pthread_attr_getschedpolicy,
- (const pthread_attr_t *__attr, int *__policy));
+int pthread_attr_setscope (pthread_attr_t *__attr, int __contentionscope);
+int pthread_attr_getscope (const pthread_attr_t *__attr,
+ int *__contentionscope);
+int pthread_attr_setinheritsched (pthread_attr_t *__attr,
+ int __inheritsched);
+int pthread_attr_getinheritsched (const pthread_attr_t *__attr,
+ int *__inheritsched);
+int pthread_attr_setschedpolicy (pthread_attr_t *__attr, int __policy);
+int pthread_attr_getschedpolicy (const pthread_attr_t *__attr,
+ int *__policy);
#endif /* defined(_POSIX_THREAD_PRIORITY_SCHEDULING) */
-int _EXFUN(pthread_attr_setschedparam,
- (pthread_attr_t *__attr, const struct sched_param *__param));
-int _EXFUN(pthread_attr_getschedparam,
- (const pthread_attr_t *__attr, struct sched_param *__param));
+int pthread_attr_setschedparam (pthread_attr_t *__attr,
+ const struct sched_param *__param);
+int pthread_attr_getschedparam (const pthread_attr_t *__attr,
+ struct sched_param *__param);
#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
/* Dynamic Thread Scheduling Parameters Access, P1003.1c/Draft 10, p. 124 */
-int _EXFUN(pthread_getschedparam,
- (pthread_t __pthread, int *__policy, struct sched_param *__param));
-int _EXFUN(pthread_setschedparam,
- (pthread_t __pthread, int __policy, struct sched_param *__param));
+int pthread_getschedparam (pthread_t __pthread, int *__policy,
+ struct sched_param *__param);
+int pthread_setschedparam (pthread_t __pthread, int __policy,
+ struct sched_param *__param);
/* Set Scheduling Priority of a Thread */
-int _EXFUN(pthread_setschedprio, (pthread_t thread, int prio));
+int pthread_setschedprio (pthread_t thread, int prio);
#endif /* defined(_POSIX_THREAD_PRIORITY_SCHEDULING) */
@@ -180,14 +173,14 @@ int pthread_setname_np(pthread_t, const char *) __nonnull((2));
/* Mutex Initialization Scheduling Attributes, P1003.1c/Draft 10, p. 128 */
-int _EXFUN(pthread_mutexattr_setprotocol,
- (pthread_mutexattr_t *__attr, int __protocol));
-int _EXFUN(pthread_mutexattr_getprotocol,
- (const pthread_mutexattr_t *__attr, int *__protocol));
-int _EXFUN(pthread_mutexattr_setprioceiling,
- (pthread_mutexattr_t *__attr, int __prioceiling));
-int _EXFUN(pthread_mutexattr_getprioceiling,
- (const pthread_mutexattr_t *__attr, int *__prioceiling));
+int pthread_mutexattr_setprotocol (pthread_mutexattr_t *__attr,
+ int __protocol);
+int pthread_mutexattr_getprotocol (const pthread_mutexattr_t *__attr,
+ int *__protocol);
+int pthread_mutexattr_setprioceiling (pthread_mutexattr_t *__attr,
+ int __prioceiling);
+int pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *__attr,
+ int *__prioceiling);
#endif /* _POSIX_THREAD_PRIO_INHERIT || _POSIX_THREAD_PRIO_PROTECT */
@@ -195,37 +188,33 @@ int _EXFUN(pthread_mutexattr_getprioceiling,
/* Change the Priority Ceiling of a Mutex, P1003.1c/Draft 10, p. 131 */
-int _EXFUN(pthread_mutex_setprioceiling,
- (pthread_mutex_t *__mutex, int __prioceiling, int *__old_ceiling));
-int _EXFUN(pthread_mutex_getprioceiling,
- (pthread_mutex_t *__mutex, int *__prioceiling));
+int pthread_mutex_setprioceiling (pthread_mutex_t *__mutex,
+ int __prioceiling, int *__old_ceiling);
+int pthread_mutex_getprioceiling (pthread_mutex_t *__mutex,
+ int *__prioceiling);
#endif /* _POSIX_THREAD_PRIO_PROTECT */
/* Thread Creation Attributes, P1003.1c/Draft 10, p, 140 */
-int _EXFUN(pthread_attr_init, (pthread_attr_t *__attr));
-int _EXFUN(pthread_attr_destroy, (pthread_attr_t *__attr));
-int _EXFUN(pthread_attr_setstack, (pthread_attr_t *attr,
- void *__stackaddr, size_t __stacksize));
-int _EXFUN(pthread_attr_getstack, (const pthread_attr_t *attr,
- void **__stackaddr, size_t *__stacksize));
-int _EXFUN(pthread_attr_getstacksize,
- (const pthread_attr_t *__attr, size_t *__stacksize));
-int _EXFUN(pthread_attr_setstacksize,
- (pthread_attr_t *__attr, size_t __stacksize));
-int _EXFUN(pthread_attr_getstackaddr,
- (const pthread_attr_t *__attr, void **__stackaddr));
-int _EXFUN(pthread_attr_setstackaddr,
- (pthread_attr_t *__attr, void *__stackaddr));
-int _EXFUN(pthread_attr_getdetachstate,
- (const pthread_attr_t *__attr, int *__detachstate));
-int _EXFUN(pthread_attr_setdetachstate,
- (pthread_attr_t *__attr, int __detachstate));
-int _EXFUN(pthread_attr_getguardsize,
- (const pthread_attr_t *__attr, size_t *__guardsize));
-int _EXFUN(pthread_attr_setguardsize,
- (pthread_attr_t *__attr, size_t __guardsize));
+int pthread_attr_init (pthread_attr_t *__attr);
+int pthread_attr_destroy (pthread_attr_t *__attr);
+int pthread_attr_setstack (pthread_attr_t *attr,
+ void *__stackaddr, size_t __stacksize);
+int pthread_attr_getstack (const pthread_attr_t *attr,
+ void **__stackaddr, size_t *__stacksize);
+int pthread_attr_getstacksize (const pthread_attr_t *__attr,
+ size_t *__stacksize);
+int pthread_attr_setstacksize (pthread_attr_t *__attr, size_t __stacksize);
+int pthread_attr_getstackaddr (const pthread_attr_t *__attr,
+ void **__stackaddr);
+int pthread_attr_setstackaddr (pthread_attr_t *__attr, void *__stackaddr);
+int pthread_attr_getdetachstate (const pthread_attr_t *__attr,
+ int *__detachstate);
+int pthread_attr_setdetachstate (pthread_attr_t *__attr, int __detachstate);
+int pthread_attr_getguardsize (const pthread_attr_t *__attr,
+ size_t *__guardsize);
+int pthread_attr_setguardsize (pthread_attr_t *__attr, size_t __guardsize);
/* POSIX thread APIs beyond the POSIX standard but provided
* in GNU/Linux. They may be provided by other OSes for
@@ -233,59 +222,55 @@ int _EXFUN(pthread_attr_setguardsize,
*/
#if __GNU_VISIBLE
#if defined(__rtems__)
-int _EXFUN(pthread_attr_setaffinity_np,
- (pthread_attr_t *__attr, size_t __cpusetsize,
- const cpu_set_t *__cpuset));
-int _EXFUN(pthread_attr_getaffinity_np,
- (const pthread_attr_t *__attr, size_t __cpusetsize,
- cpu_set_t *__cpuset));
-
-int _EXFUN(pthread_setaffinity_np,
- (pthread_t __id, size_t __cpusetsize, const cpu_set_t *__cpuset));
-int _EXFUN(pthread_getaffinity_np,
- (const pthread_t __id, size_t __cpusetsize, cpu_set_t *__cpuset));
-
-int _EXFUN(pthread_getattr_np,
- (pthread_t __id, pthread_attr_t *__attr));
+int pthread_attr_setaffinity_np (pthread_attr_t *__attr,
+ size_t __cpusetsize,
+ const cpu_set_t *__cpuset);
+int pthread_attr_getaffinity_np (const pthread_attr_t *__attr,
+ size_t __cpusetsize, cpu_set_t *__cpuset);
+
+int pthread_setaffinity_np (pthread_t __id, size_t __cpusetsize,
+ const cpu_set_t *__cpuset);
+int pthread_getaffinity_np (const pthread_t __id, size_t __cpusetsize,
+ cpu_set_t *__cpuset);
+
+int pthread_getattr_np (pthread_t __id, pthread_attr_t *__attr);
#endif /* defined(__rtems__) */
#endif /* __GNU_VISIBLE */
/* Thread Creation, P1003.1c/Draft 10, p. 144 */
-int _EXFUN(pthread_create,
- (pthread_t *__pthread, const pthread_attr_t *__attr,
- void *(*__start_routine)( void * ), void *__arg));
+int pthread_create (pthread_t *__pthread, const pthread_attr_t *__attr,
+ void *(*__start_routine)(void *), void *__arg);
/* Wait for Thread Termination, P1003.1c/Draft 10, p. 147 */
-int _EXFUN(pthread_join, (pthread_t __pthread, void **__value_ptr));
+int pthread_join (pthread_t __pthread, void **__value_ptr);
/* Detaching a Thread, P1003.1c/Draft 10, p. 149 */
-int _EXFUN(pthread_detach, (pthread_t __pthread));
+int pthread_detach (pthread_t __pthread);
/* Thread Termination, p1003.1c/Draft 10, p. 150 */
-void _EXFUN(pthread_exit, (void *__value_ptr)) __dead2;
+void pthread_exit (void *__value_ptr) __dead2;
/* Get Calling Thread's ID, p1003.1c/Draft 10, p. XXX */
-pthread_t _EXFUN(pthread_self, (void));
+pthread_t pthread_self (void);
/* Compare Thread IDs, p1003.1c/Draft 10, p. 153 */
-int _EXFUN(pthread_equal, (pthread_t __t1, pthread_t __t2));
+int pthread_equal (pthread_t __t1, pthread_t __t2);
/* Retrieve ID of a Thread's CPU Time Clock */
-int _EXFUN(pthread_getcpuclockid,
- (pthread_t thread, clockid_t *clock_id));
+int pthread_getcpuclockid (pthread_t thread, clockid_t *clock_id);
/* Get/Set Current Thread's Concurrency Level */
-int _EXFUN(pthread_setconcurrency, (int new_level));
-int _EXFUN(pthread_getconcurrency, (void));
+int pthread_setconcurrency (int new_level);
+int pthread_getconcurrency (void);
#if __BSD_VISIBLE || __GNU_VISIBLE
-void _EXFUN(pthread_yield, (void));
+void pthread_yield (void);
#endif
/* Dynamic Package Initialization */
@@ -298,23 +283,22 @@ void _EXFUN(pthread_yield, (void));
#define PTHREAD_ONCE_INIT _PTHREAD_ONCE_INIT
-int _EXFUN(pthread_once,
- (pthread_once_t *__once_control, void (*__init_routine)(void)));
+int pthread_once (pthread_once_t *__once_control,
+ void (*__init_routine)(void));
/* Thread-Specific Data Key Create, P1003.1c/Draft 10, p. 163 */
-int _EXFUN(pthread_key_create,
- (pthread_key_t *__key, void (*__destructor)( void * )));
+int pthread_key_create (pthread_key_t *__key,
+ void (*__destructor)(void *));
/* Thread-Specific Data Management, P1003.1c/Draft 10, p. 165 */
-int _EXFUN(pthread_setspecific,
- (pthread_key_t __key, const void *__value));
-void * _EXFUN(pthread_getspecific, (pthread_key_t __key));
+int pthread_setspecific (pthread_key_t __key, const void *__value);
+void * pthread_getspecific (pthread_key_t __key);
/* Thread-Specific Data Key Deletion, P1003.1c/Draft 10, p. 167 */
-int _EXFUN(pthread_key_delete, (pthread_key_t __key));
+int pthread_key_delete (pthread_key_t __key);
/* Execution of a Thread, P1003.1c/Draft 10, p. 181 */
@@ -326,23 +310,21 @@ int _EXFUN(pthread_key_delete, (pthread_key_t __key));
#define PTHREAD_CANCELED ((void *) -1)
-int _EXFUN(pthread_cancel, (pthread_t __pthread));
+int pthread_cancel (pthread_t __pthread);
/* Setting Cancelability State, P1003.1c/Draft 10, p. 183 */
-int _EXFUN(pthread_setcancelstate, (int __state, int *__oldstate));
-int _EXFUN(pthread_setcanceltype, (int __type, int *__oldtype));
-void _EXFUN(pthread_testcancel, (void));
+int pthread_setcancelstate (int __state, int *__oldstate);
+int pthread_setcanceltype (int __type, int *__oldtype);
+void pthread_testcancel (void);
/* Establishing Cancellation Handlers, P1003.1c/Draft 10, p. 184 */
-void _EXFUN(_pthread_cleanup_push,
- (struct _pthread_cleanup_context *_context,
- void (*_routine)(void *), void *_arg));
+void _pthread_cleanup_push (struct _pthread_cleanup_context *_context,
+ void (*_routine)(void *), void *_arg);
-void _EXFUN(_pthread_cleanup_pop,
- (struct _pthread_cleanup_context *_context,
- int _execute));
+void _pthread_cleanup_pop (struct _pthread_cleanup_context *_context,
+ int _execute);
/* It is intentional to open and close the scope in two different macros */
#define pthread_cleanup_push(_routine, _arg) \
@@ -355,13 +337,11 @@ void _EXFUN(_pthread_cleanup_pop,
} while (0)
#if __GNU_VISIBLE
-void _EXFUN(_pthread_cleanup_push_defer,
- (struct _pthread_cleanup_context *_context,
- void (*_routine)(void *), void *_arg));
+void _pthread_cleanup_push_defer (struct _pthread_cleanup_context *_context,
+ void (*_routine)(void *), void *_arg);
-void _EXFUN(_pthread_cleanup_pop_restore,
- (struct _pthread_cleanup_context *_context,
- int _execute));
+void _pthread_cleanup_pop_restore (struct _pthread_cleanup_context *_context,
+ int _execute);
/* It is intentional to open and close the scope in two different macros */
#define pthread_cleanup_push_defer_np(_routine, _arg) \
@@ -378,8 +358,7 @@ void _EXFUN(_pthread_cleanup_pop_restore,
/* Accessing a Thread CPU-time Clock, P1003.4b/D8, p. 58 */
-int _EXFUN(pthread_getcpuclockid,
- (pthread_t __pthread_id, clockid_t *__clock_id));
+int pthread_getcpuclockid (pthread_t __pthread_id, clockid_t *__clock_id);
#endif /* defined(_POSIX_THREAD_CPUTIME) */
@@ -388,31 +367,30 @@ int _EXFUN(pthread_getcpuclockid,
#if defined(_POSIX_BARRIERS)
-int _EXFUN(pthread_barrierattr_init, (pthread_barrierattr_t *__attr));
-int _EXFUN(pthread_barrierattr_destroy, (pthread_barrierattr_t *__attr));
-int _EXFUN(pthread_barrierattr_getpshared,
- (const pthread_barrierattr_t *__attr, int *__pshared));
-int _EXFUN(pthread_barrierattr_setpshared,
- (pthread_barrierattr_t *__attr, int __pshared));
+int pthread_barrierattr_init (pthread_barrierattr_t *__attr);
+int pthread_barrierattr_destroy (pthread_barrierattr_t *__attr);
+int pthread_barrierattr_getpshared (const pthread_barrierattr_t *__attr,
+ int *__pshared);
+int pthread_barrierattr_setpshared (pthread_barrierattr_t *__attr,
+ int __pshared);
#define PTHREAD_BARRIER_SERIAL_THREAD -1
-int _EXFUN(pthread_barrier_init,
- (pthread_barrier_t *__barrier,
- const pthread_barrierattr_t *__attr, unsigned __count));
-int _EXFUN(pthread_barrier_destroy, (pthread_barrier_t *__barrier));
-int _EXFUN(pthread_barrier_wait,(pthread_barrier_t *__barrier));
+int pthread_barrier_init (pthread_barrier_t *__barrier,
+ const pthread_barrierattr_t *__attr,
+ unsigned __count);
+int pthread_barrier_destroy (pthread_barrier_t *__barrier);
+int pthread_barrier_wait (pthread_barrier_t *__barrier);
#endif /* defined(_POSIX_BARRIERS) */
#if defined(_POSIX_SPIN_LOCKS)
-int _EXFUN(pthread_spin_init,
- (pthread_spinlock_t *__spinlock, int __pshared));
-int _EXFUN(pthread_spin_destroy, (pthread_spinlock_t *__spinlock));
-int _EXFUN(pthread_spin_lock, (pthread_spinlock_t *__spinlock));
-int _EXFUN(pthread_spin_trylock, (pthread_spinlock_t *__spinlock));
-int _EXFUN(pthread_spin_unlock, (pthread_spinlock_t *__spinlock));
+int pthread_spin_init (pthread_spinlock_t *__spinlock, int __pshared);
+int pthread_spin_destroy (pthread_spinlock_t *__spinlock);
+int pthread_spin_lock (pthread_spinlock_t *__spinlock);
+int pthread_spin_trylock (pthread_spinlock_t *__spinlock);
+int pthread_spin_unlock (pthread_spinlock_t *__spinlock);
#endif /* defined(_POSIX_SPIN_LOCKS) */
@@ -425,25 +403,25 @@ int _EXFUN(pthread_spin_unlock, (pthread_spinlock_t *__spinlock));
#define PTHREAD_RWLOCK_INITIALIZER _PTHREAD_RWLOCK_INITIALIZER
-int _EXFUN(pthread_rwlockattr_init, (pthread_rwlockattr_t *__attr));
-int _EXFUN(pthread_rwlockattr_destroy, (pthread_rwlockattr_t *__attr));
-int _EXFUN(pthread_rwlockattr_getpshared,
- (const pthread_rwlockattr_t *__attr, int *__pshared));
-int _EXFUN(pthread_rwlockattr_setpshared,
- (pthread_rwlockattr_t *__attr, int __pshared));
-
-int _EXFUN(pthread_rwlock_init,
- (pthread_rwlock_t *__rwlock, const pthread_rwlockattr_t *__attr));
-int _EXFUN(pthread_rwlock_destroy, (pthread_rwlock_t *__rwlock));
-int _EXFUN(pthread_rwlock_rdlock,(pthread_rwlock_t *__rwlock));
-int _EXFUN(pthread_rwlock_tryrdlock,(pthread_rwlock_t *__rwlock));
-int _EXFUN(pthread_rwlock_timedrdlock,
- (pthread_rwlock_t *__rwlock, const struct timespec *__abstime));
-int _EXFUN(pthread_rwlock_unlock,(pthread_rwlock_t *__rwlock));
-int _EXFUN(pthread_rwlock_wrlock,(pthread_rwlock_t *__rwlock));
-int _EXFUN(pthread_rwlock_trywrlock,(pthread_rwlock_t *__rwlock));
-int _EXFUN(pthread_rwlock_timedwrlock,
- (pthread_rwlock_t *__rwlock, const struct timespec *__abstime));
+int pthread_rwlockattr_init (pthread_rwlockattr_t *__attr);
+int pthread_rwlockattr_destroy (pthread_rwlockattr_t *__attr);
+int pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *__attr,
+ int *__pshared);
+int pthread_rwlockattr_setpshared (pthread_rwlockattr_t *__attr,
+ int __pshared);
+
+int pthread_rwlock_init (pthread_rwlock_t *__rwlock,
+ const pthread_rwlockattr_t *__attr);
+int pthread_rwlock_destroy (pthread_rwlock_t *__rwlock);
+int pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock);
+int pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock);
+int pthread_rwlock_timedrdlock (pthread_rwlock_t *__rwlock,
+ const struct timespec *__abstime);
+int pthread_rwlock_unlock (pthread_rwlock_t *__rwlock);
+int pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock);
+int pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock);
+int pthread_rwlock_timedwrlock (pthread_rwlock_t *__rwlock,
+ const struct timespec *__abstime);
#endif /* defined(_POSIX_READER_WRITER_LOCKS) */
diff --git a/newlib/libc/include/rpc/xdr.h b/newlib/libc/include/rpc/xdr.h
index bda8e9926..139e0c7ce 100644
--- a/newlib/libc/include/rpc/xdr.h
+++ b/newlib/libc/include/rpc/xdr.h
@@ -292,51 +292,51 @@ struct xdr_discrim
/*
* These are the "generic" xdr routines.
*/
-extern bool_t _EXFUN (xdr_void, (void));
-extern bool_t _EXFUN (xdr_short, (XDR *, short *));
-extern bool_t _EXFUN (xdr_u_short, (XDR *, u_short *));
-extern bool_t _EXFUN (xdr_int, (XDR *, int *));
-extern bool_t _EXFUN (xdr_u_int, (XDR *, u_int *));
-extern bool_t _EXFUN (xdr_long, (XDR *, long *));
-extern bool_t _EXFUN (xdr_u_long, (XDR *, u_long *));
-extern bool_t _EXFUN (xdr_int8_t, (XDR *, int8_t *));
-extern bool_t _EXFUN (xdr_uint8_t, (XDR *, uint8_t *));
-extern bool_t _EXFUN (xdr_u_int8_t, (XDR *, u_int8_t *));
-extern bool_t _EXFUN (xdr_int16_t, (XDR *, int16_t *));
-extern bool_t _EXFUN (xdr_uint16_t, (XDR *, uint16_t *));
-extern bool_t _EXFUN (xdr_u_int16_t, (XDR *, u_int16_t *));
-extern bool_t _EXFUN (xdr_int32_t, (XDR *, int32_t *));
-extern bool_t _EXFUN (xdr_uint32_t, (XDR *, uint32_t *));
-extern bool_t _EXFUN (xdr_u_int32_t, (XDR *, u_int32_t *));
+extern bool_t xdr_void (void);
+extern bool_t xdr_short (XDR *, short *);
+extern bool_t xdr_u_short (XDR *, u_short *);
+extern bool_t xdr_int (XDR *, int *);
+extern bool_t xdr_u_int (XDR *, u_int *);
+extern bool_t xdr_long (XDR *, long *);
+extern bool_t xdr_u_long (XDR *, u_long *);
+extern bool_t xdr_int8_t (XDR *, int8_t *);
+extern bool_t xdr_uint8_t (XDR *, uint8_t *);
+extern bool_t xdr_u_int8_t (XDR *, u_int8_t *);
+extern bool_t xdr_int16_t (XDR *, int16_t *);
+extern bool_t xdr_uint16_t (XDR *, uint16_t *);
+extern bool_t xdr_u_int16_t (XDR *, u_int16_t *);
+extern bool_t xdr_int32_t (XDR *, int32_t *);
+extern bool_t xdr_uint32_t (XDR *, uint32_t *);
+extern bool_t xdr_u_int32_t (XDR *, u_int32_t *);
#if defined(___int64_t_defined)
-extern bool_t _EXFUN (xdr_int64_t, (XDR *, int64_t *));
-extern bool_t _EXFUN (xdr_uint64_t, (XDR *, uint64_t *));
-extern bool_t _EXFUN (xdr_u_int64_t, (XDR *, u_int64_t *));
+extern bool_t xdr_int64_t (XDR *, int64_t *);
+extern bool_t xdr_uint64_t (XDR *, uint64_t *);
+extern bool_t xdr_u_int64_t (XDR *, u_int64_t *);
#endif /* ___int64_t_defined */
-extern bool_t _EXFUN (xdr_bool, (XDR *, bool_t *));
-extern bool_t _EXFUN (xdr_enum, (XDR *, enum_t *));
-extern bool_t _EXFUN (xdr_array, (XDR *, char **, u_int *, u_int, u_int, xdrproc_t));
-extern bool_t _EXFUN (xdr_bytes, (XDR *, char **, u_int *, u_int));
-extern bool_t _EXFUN (xdr_opaque, (XDR *, char *, u_int));
-extern bool_t _EXFUN (xdr_string, (XDR *, char **, u_int));
-extern bool_t _EXFUN (xdr_union, (XDR *, enum_t *, char *,
- const struct xdr_discrim *, xdrproc_t));
-extern bool_t _EXFUN (xdr_char, (XDR *, char *));
-extern bool_t _EXFUN (xdr_u_char, (XDR *, u_char *));
-extern bool_t _EXFUN (xdr_vector, (XDR *, char *, u_int, u_int, xdrproc_t));
-extern bool_t _EXFUN (xdr_float, (XDR *, float *));
-extern bool_t _EXFUN (xdr_double, (XDR *, double *));
-/* extern bool_t _EXFUN (xdr_quadruple, (XDR *, long double *)); */
-extern bool_t _EXFUN (xdr_reference, (XDR *, char **, u_int, xdrproc_t));
-extern bool_t _EXFUN (xdr_pointer, (XDR *, char **, u_int, xdrproc_t));
-extern bool_t _EXFUN (xdr_wrapstring, (XDR *, char **));
+extern bool_t xdr_bool (XDR *, bool_t *);
+extern bool_t xdr_enum (XDR *, enum_t *);
+extern bool_t xdr_array (XDR *, char **, u_int *, u_int, u_int, xdrproc_t);
+extern bool_t xdr_bytes (XDR *, char **, u_int *, u_int);
+extern bool_t xdr_opaque (XDR *, char *, u_int);
+extern bool_t xdr_string (XDR *, char **, u_int);
+extern bool_t xdr_union (XDR *, enum_t *, char *,
+ const struct xdr_discrim *, xdrproc_t);
+extern bool_t xdr_char (XDR *, char *);
+extern bool_t xdr_u_char (XDR *, u_char *);
+extern bool_t xdr_vector (XDR *, char *, u_int, u_int, xdrproc_t);
+extern bool_t xdr_float (XDR *, float *);
+extern bool_t xdr_double (XDR *, double *);
+/* extern bool_t xdr_quadruple (XDR *, long double *); */
+extern bool_t xdr_reference (XDR *, char **, u_int, xdrproc_t);
+extern bool_t xdr_pointer (XDR *, char **, u_int, xdrproc_t);
+extern bool_t xdr_wrapstring (XDR *, char **);
#if defined(___int64_t_defined)
-extern bool_t _EXFUN (xdr_hyper, (XDR *, quad_t *));
-extern bool_t _EXFUN (xdr_u_hyper, (XDR *, u_quad_t *));
-extern bool_t _EXFUN (xdr_longlong_t, (XDR *, quad_t *));
-extern bool_t _EXFUN (xdr_u_longlong_t, (XDR *, u_quad_t *));
+extern bool_t xdr_hyper (XDR *, quad_t *);
+extern bool_t xdr_u_hyper (XDR *, u_quad_t *);
+extern bool_t xdr_longlong_t (XDR *, quad_t *);
+extern bool_t xdr_u_longlong_t (XDR *, u_quad_t *);
#endif /* ___int64_t_defined */
-extern u_long _EXFUN (xdr_sizeof, (xdrproc_t, void *));
+extern u_long xdr_sizeof (xdrproc_t, void *);
/*
* Common opaque bytes objects used by many rpc protocols;
@@ -349,7 +349,7 @@ struct netobj
char *n_bytes;
};
typedef struct netobj netobj;
-extern bool_t _EXFUN (xdr_netobj, (XDR *, struct netobj *));
+extern bool_t xdr_netobj (XDR *, struct netobj *);
/*
* These are the public routines for the various implementations of
@@ -357,30 +357,30 @@ extern bool_t _EXFUN (xdr_netobj, (XDR *, struct netobj *));
*/
/* XDR using memory buffers */
-extern void _EXFUN (xdrmem_create, (XDR *, char *, u_int, enum xdr_op));
+extern void xdrmem_create (XDR *, char *, u_int, enum xdr_op);
/* XDR using stdio library */
#if defined(_STDIO_H_)
-extern void _EXFUN (xdrstdio_create, (XDR *, FILE *, enum xdr_op));
+extern void xdrstdio_create (XDR *, FILE *, enum xdr_op);
#endif
/* XDR pseudo records for tcp */
-extern void _EXFUN (xdrrec_create, (XDR *, u_int, u_int, void *,
+extern void xdrrec_create (XDR *, u_int, u_int, void *,
int (*) (void *, void *, int),
- int (*) (void *, void *, int)));
+ int (*) (void *, void *, int));
/* make end of xdr record */
-extern bool_t _EXFUN (xdrrec_endofrecord, (XDR *, bool_t));
+extern bool_t xdrrec_endofrecord (XDR *, bool_t);
/* move to beginning of next record */
-extern bool_t _EXFUN (xdrrec_skiprecord, (XDR *));
+extern bool_t xdrrec_skiprecord (XDR *);
/* true if no more input */
-extern bool_t _EXFUN (xdrrec_eof, (XDR *));
-extern u_int _EXFUN (xdrrec_readbytes, (XDR *, caddr_t, u_int));
+extern bool_t xdrrec_eof (XDR *);
+extern u_int xdrrec_readbytes (XDR *, caddr_t, u_int);
/* free memory buffers for xdr */
-extern void _EXFUN (xdr_free, (xdrproc_t, void *));
+extern void xdr_free (xdrproc_t, void *);
#ifdef __cplusplus
}
diff --git a/newlib/libc/include/setjmp.h b/newlib/libc/include/setjmp.h
index 521eac5a1..a2830b275 100644
--- a/newlib/libc/include/setjmp.h
+++ b/newlib/libc/include/setjmp.h
@@ -12,12 +12,12 @@
_BEGIN_STD_C
#ifdef __GNUC__
-void _EXFUN(longjmp,(jmp_buf __jmpb, int __retval))
+void longjmp (jmp_buf __jmpb, int __retval)
__attribute__ ((__noreturn__));
#else
-void _EXFUN(longjmp,(jmp_buf __jmpb, int __retval));
+void longjmp (jmp_buf __jmpb, int __retval);
#endif
-int _EXFUN(setjmp,(jmp_buf __jmpb));
+int setjmp (jmp_buf __jmpb);
_END_STD_C
diff --git a/newlib/libc/include/signal.h b/newlib/libc/include/signal.h
index 0324ae71a..23a9863e6 100644
--- a/newlib/libc/include/signal.h
+++ b/newlib/libc/include/signal.h
@@ -21,13 +21,13 @@ typedef _sig_func_ptr sighandler_t; /* glibc naming */
struct _reent;
-_sig_func_ptr _EXFUN(_signal_r, (struct _reent *, int, _sig_func_ptr));
-int _EXFUN(_raise_r, (struct _reent *, int));
+_sig_func_ptr _signal_r (struct _reent *, int, _sig_func_ptr);
+int _raise_r (struct _reent *, int);
#ifndef _REENT_ONLY
-_sig_func_ptr _EXFUN(signal, (int, _sig_func_ptr));
-int _EXFUN(raise, (int));
-void _EXFUN(psignal, (int, const char *));
+_sig_func_ptr signal (int, _sig_func_ptr);
+int raise (int);
+void psignal (int, const char *);
#endif
_END_STD_C
diff --git a/newlib/libc/include/spawn.h b/newlib/libc/include/spawn.h
index 5a6692f11..d172177b1 100644
--- a/newlib/libc/include/spawn.h
+++ b/newlib/libc/include/spawn.h
@@ -53,67 +53,52 @@ _BEGIN_STD_C
* XXX both arrays should be __restrict, but this does not work when GCC
* is invoked with -std=c99.
*/
-int _EXFUN(posix_spawn, (pid_t * __restrict, const char * __restrict,
+int posix_spawn (pid_t * __restrict, const char * __restrict,
const posix_spawn_file_actions_t *, const posix_spawnattr_t * __restrict,
- char * const [], char * const [])
-);
-int _EXFUN(posix_spawnp, (pid_t * __restrict, const char * __restrict,
+ char * const [], char * const []);
+int posix_spawnp (pid_t * __restrict, const char * __restrict,
const posix_spawn_file_actions_t *, const posix_spawnattr_t * __restrict,
- char * const [], char * const [])
-);
+ char * const [], char * const []);
/*
* File descriptor actions
*/
-int _EXFUN(posix_spawn_file_actions_init, (posix_spawn_file_actions_t *));
-int _EXFUN(posix_spawn_file_actions_destroy, (posix_spawn_file_actions_t *));
+int posix_spawn_file_actions_init (posix_spawn_file_actions_t *);
+int posix_spawn_file_actions_destroy (posix_spawn_file_actions_t *);
-int _EXFUN(posix_spawn_file_actions_addopen,
- (posix_spawn_file_actions_t * __restrict, int, const char * __restrict, int, mode_t)
-);
-int _EXFUN(posix_spawn_file_actions_adddup2,
- (posix_spawn_file_actions_t *, int, int)
-);
-int _EXFUN(posix_spawn_file_actions_addclose,
- (posix_spawn_file_actions_t *, int)
-);
+int posix_spawn_file_actions_addopen (posix_spawn_file_actions_t * __restrict,
+ int, const char * __restrict, int, mode_t);
+int posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *, int, int);
+int posix_spawn_file_actions_addclose (posix_spawn_file_actions_t *, int);
/*
* Spawn attributes
*/
-int _EXFUN(posix_spawnattr_init, (posix_spawnattr_t *));
-int _EXFUN(posix_spawnattr_destroy, (posix_spawnattr_t *));
+int posix_spawnattr_init (posix_spawnattr_t *);
+int posix_spawnattr_destroy (posix_spawnattr_t *);
-int _EXFUN(posix_spawnattr_getflags,
- (const posix_spawnattr_t * __restrict, short * __restrict)
-);
-int _EXFUN(posix_spawnattr_getpgroup,
- (const posix_spawnattr_t * __restrict, pid_t * __restrict));
-int _EXFUN(posix_spawnattr_getschedparam,
- (const posix_spawnattr_t * __restrict, struct sched_param * __restrict)
-);
-int _EXFUN(posix_spawnattr_getschedpolicy,
- (const posix_spawnattr_t * __restrict, int * __restrict)
-);
-int _EXFUN(posix_spawnattr_getsigdefault,
- (const posix_spawnattr_t * __restrict, sigset_t * __restrict)
-);
-int _EXFUN(posix_spawnattr_getsigmask,
- (const posix_spawnattr_t * __restrict, sigset_t * __restrict)
-);
+int posix_spawnattr_getflags (const posix_spawnattr_t * __restrict,
+ short * __restrict);
+int posix_spawnattr_getpgroup (const posix_spawnattr_t * __restrict,
+ pid_t * __restrict);
+int posix_spawnattr_getschedparam (const posix_spawnattr_t * __restrict,
+ struct sched_param * __restrict);
+int posix_spawnattr_getschedpolicy (const posix_spawnattr_t * __restrict,
+ int * __restrict);
+int posix_spawnattr_getsigdefault (const posix_spawnattr_t * __restrict,
+ sigset_t * __restrict);
+int posix_spawnattr_getsigmask (const posix_spawnattr_t * __restrict,
+ sigset_t * __restrict);
-int _EXFUN(posix_spawnattr_setflags, (posix_spawnattr_t *, short));
-int _EXFUN(posix_spawnattr_setpgroup, (posix_spawnattr_t *, pid_t));
-int _EXFUN(posix_spawnattr_setschedparam,
- (posix_spawnattr_t * __restrict, const struct sched_param * __restrict)
-);
-int _EXFUN(posix_spawnattr_setschedpolicy, (posix_spawnattr_t *, int));
-int _EXFUN(posix_spawnattr_setsigdefault,
- (posix_spawnattr_t * __restrict, const sigset_t * __restrict)
-);
-int _EXFUN(posix_spawnattr_setsigmask,
- (posix_spawnattr_t * __restrict, const sigset_t * __restrict)
-);
+int posix_spawnattr_setflags (posix_spawnattr_t *, short);
+int posix_spawnattr_setpgroup (posix_spawnattr_t *, pid_t);
+int posix_spawnattr_setschedparam (posix_spawnattr_t * __restrict,
+ const struct sched_param * __restrict);
+int posix_spawnattr_setschedpolicy (posix_spawnattr_t *, int);
+int posix_spawnattr_setsigdefault (posix_spawnattr_t * __restrict,
+ const sigset_t * __restrict);
+int posix_spawnattr_setsigmask (posix_spawnattr_t * __restrict,
+ const sigset_t * __restrict);
_END_STD_C
#endif /* !_SPAWN_H_ */
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index 127145083..cbc0fa989 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -178,155 +178,155 @@ typedef _fpos64_t fpos64_t;
#endif
#if __POSIX_VISIBLE
-char * _EXFUN(ctermid, (char *));
+char * ctermid (char *);
#endif
#if __XSI_VISIBLE && __XSI_VISIBLE < 600
-char * _EXFUN(cuserid, (char *));
+char * cuserid (char *);
#endif
-FILE * _EXFUN(tmpfile, (void));
-char * _EXFUN(tmpnam, (char *));
+FILE * tmpfile (void);
+char * tmpnam (char *);
#if __BSD_VISIBLE || __XSI_VISIBLE || __POSIX_VISIBLE >= 200112
-char * _EXFUN(tempnam, (const char *, const char *));
-#endif
-int _EXFUN(fclose, (FILE *));
-int _EXFUN(fflush, (FILE *));
-FILE * _EXFUN(freopen, (const char *__restrict, const char *__restrict, FILE *__restrict));
-void _EXFUN(setbuf, (FILE *__restrict, char *__restrict));
-int _EXFUN(setvbuf, (FILE *__restrict, char *__restrict, int, size_t));
-int _EXFUN(fprintf, (FILE *__restrict, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int _EXFUN(fscanf, (FILE *__restrict, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int _EXFUN(printf, (const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__printf__, 1, 2))));
-int _EXFUN(scanf, (const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__scanf__, 1, 2))));
-int _EXFUN(sscanf, (const char *__restrict, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int _EXFUN(vfprintf, (FILE *__restrict, const char *__restrict, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int _EXFUN(vprintf, (const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 1, 0))));
-int _EXFUN(vsprintf, (char *__restrict, const char *__restrict, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int _EXFUN(fgetc, (FILE *));
-char * _EXFUN(fgets, (char *__restrict, int, FILE *__restrict));
-int _EXFUN(fputc, (int, FILE *));
-int _EXFUN(fputs, (const char *__restrict, FILE *__restrict));
-int _EXFUN(getc, (FILE *));
-int _EXFUN(getchar, (void));
-char * _EXFUN(gets, (char *));
-int _EXFUN(putc, (int, FILE *));
-int _EXFUN(putchar, (int));
-int _EXFUN(puts, (const char *));
-int _EXFUN(ungetc, (int, FILE *));
-size_t _EXFUN(fread, (void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t _EXFUN(fwrite, (const void *__restrict , size_t _size, size_t _n, FILE *));
+char * tempnam (const char *, const char *);
+#endif
+int fclose (FILE *);
+int fflush (FILE *);
+FILE * freopen (const char *__restrict, const char *__restrict, FILE *__restrict);
+void setbuf (FILE *__restrict, char *__restrict);
+int setvbuf (FILE *__restrict, char *__restrict, int, size_t);
+int fprintf (FILE *__restrict, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int fscanf (FILE *__restrict, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+int printf (const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 1, 2)));
+int scanf (const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__scanf__, 1, 2)));
+int sscanf (const char *__restrict, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+int vfprintf (FILE *__restrict, const char *__restrict, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int vprintf (const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 1, 0)));
+int vsprintf (char *__restrict, const char *__restrict, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int fgetc (FILE *);
+char * fgets (char *__restrict, int, FILE *__restrict);
+int fputc (int, FILE *);
+int fputs (const char *__restrict, FILE *__restrict);
+int getc (FILE *);
+int getchar (void);
+char * gets (char *);
+int putc (int, FILE *);
+int putchar (int);
+int puts (const char *);
+int ungetc (int, FILE *);
+size_t fread (void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+size_t fwrite (const void *__restrict , size_t _size, size_t _n, FILE *);
#ifdef _COMPILING_NEWLIB
-int _EXFUN(fgetpos, (FILE *, _fpos_t *));
+int fgetpos (FILE *, _fpos_t *);
#else
-int _EXFUN(fgetpos, (FILE *__restrict, fpos_t *__restrict));
+int fgetpos (FILE *__restrict, fpos_t *__restrict);
#endif
-int _EXFUN(fseek, (FILE *, long, int));
+int fseek (FILE *, long, int);
#ifdef _COMPILING_NEWLIB
-int _EXFUN(fsetpos, (FILE *, const _fpos_t *));
+int fsetpos (FILE *, const _fpos_t *);
#else
-int _EXFUN(fsetpos, (FILE *, const fpos_t *));
-#endif
-long _EXFUN(ftell, ( FILE *));
-void _EXFUN(rewind, (FILE *));
-void _EXFUN(clearerr, (FILE *));
-int _EXFUN(feof, (FILE *));
-int _EXFUN(ferror, (FILE *));
-void _EXFUN(perror, (const char *));
+int fsetpos (FILE *, const fpos_t *);
+#endif
+long ftell ( FILE *);
+void rewind (FILE *);
+void clearerr (FILE *);
+int feof (FILE *);
+int ferror (FILE *);
+void perror (const char *);
#ifndef _REENT_ONLY
-FILE * _EXFUN(fopen, (const char *__restrict _name, const char *__restrict _type));
-int _EXFUN(sprintf, (char *__restrict, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int _EXFUN(remove, (const char *));
-int _EXFUN(rename, (const char *, const char *));
+FILE * fopen (const char *__restrict _name, const char *__restrict _type);
+int sprintf (char *__restrict, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int remove (const char *);
+int rename (const char *, const char *);
#ifdef _COMPILING_NEWLIB
-int _EXFUN(_rename, (const char *, const char *));
+int _rename (const char *, const char *);
#endif
#endif
#if __LARGEFILE_VISIBLE || __POSIX_VISIBLE >= 200112
#ifdef _COMPILING_NEWLIB
-int _EXFUN(fseeko, (FILE *, _off_t, int));
-_off_t _EXFUN(ftello, ( FILE *));
+int fseeko (FILE *, _off_t, int);
+_off_t ftello (FILE *);
#else
-int _EXFUN(fseeko, (FILE *, off_t, int));
-off_t _EXFUN(ftello, ( FILE *));
+int fseeko (FILE *, off_t, int);
+off_t ftello (FILE *);
#endif
#endif
#if __GNU_VISIBLE
-int _EXFUN(fcloseall, (void));
+int fcloseall (void);
#endif
#ifndef _REENT_ONLY
#if __ISO_C_VISIBLE >= 1999
-int _EXFUN(snprintf, (char *__restrict, size_t, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int _EXFUN(vsnprintf, (char *__restrict, size_t, const char *__restrict, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int _EXFUN(vfscanf, (FILE *__restrict, const char *__restrict, __VALIST)
- _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int _EXFUN(vscanf, (const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__scanf__, 1, 0))));
-int _EXFUN(vsscanf, (const char *__restrict, const char *__restrict, __VALIST)
- _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
+int snprintf (char *__restrict, size_t, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int vsnprintf (char *__restrict, size_t, const char *__restrict, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int vfscanf (FILE *__restrict, const char *__restrict, __VALIST)
+ _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
+int vscanf (const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__scanf__, 1, 0)));
+int vsscanf (const char *__restrict, const char *__restrict, __VALIST)
+ _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
#endif
#if __GNU_VISIBLE
-int _EXFUN(asprintf, (char **__restrict, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int _EXFUN(vasprintf, (char **, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
+int asprintf (char **__restrict, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int vasprintf (char **, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
#endif
#if __MISC_VISIBLE /* Newlib-specific */
-int _EXFUN(asiprintf, (char **, const char *, ...)
- _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-char * _EXFUN(asniprintf, (char *, size_t *, const char *, ...)
- _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-char * _EXFUN(asnprintf, (char *__restrict, size_t *__restrict, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
+int asiprintf (char **, const char *, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+char * asniprintf (char *, size_t *, const char *, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+char * asnprintf (char *__restrict, size_t *__restrict, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
#ifndef diprintf
-int _EXFUN(diprintf, (int, const char *, ...)
- _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-#endif
-int _EXFUN(fiprintf, (FILE *, const char *, ...)
- _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int _EXFUN(fiscanf, (FILE *, const char *, ...)
- _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int _EXFUN(iprintf, (const char *, ...)
- _ATTRIBUTE ((__format__ (__printf__, 1, 2))));
-int _EXFUN(iscanf, (const char *, ...)
- _ATTRIBUTE ((__format__ (__scanf__, 1, 2))));
-int _EXFUN(siprintf, (char *, const char *, ...)
- _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int _EXFUN(siscanf, (const char *, const char *, ...)
- _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int _EXFUN(sniprintf, (char *, size_t, const char *, ...)
- _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int _EXFUN(vasiprintf, (char **, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-char * _EXFUN(vasniprintf, (char *, size_t *, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-char * _EXFUN(vasnprintf, (char *, size_t *, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int _EXFUN(vdiprintf, (int, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int _EXFUN(vfiprintf, (FILE *, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int _EXFUN(vfiscanf, (FILE *, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int _EXFUN(viprintf, (const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 1, 0))));
-int _EXFUN(viscanf, (const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__scanf__, 1, 0))));
-int _EXFUN(vsiprintf, (char *, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int _EXFUN(vsiscanf, (const char *, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int _EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
+int diprintf (int, const char *, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+#endif
+int fiprintf (FILE *, const char *, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int fiscanf (FILE *, const char *, ...)
+ _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+int iprintf (const char *, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 1, 2)));
+int iscanf (const char *, ...)
+ _ATTRIBUTE ((__format__ (__scanf__, 1, 2)));
+int siprintf (char *, const char *, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int siscanf (const char *, const char *, ...)
+ _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+int sniprintf (char *, size_t, const char *, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int vasiprintf (char **, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+char * vasniprintf (char *, size_t *, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+char * vasnprintf (char *, size_t *, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int vdiprintf (int, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int vfiprintf (FILE *, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int vfiscanf (FILE *, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
+int viprintf (const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 1, 0)));
+int viscanf (const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__scanf__, 1, 0)));
+int vsiprintf (char *, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int vsiscanf (const char *, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
+int vsniprintf (char *, size_t, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
#endif /* __MISC_VISIBLE */
#endif /* !_REENT_ONLY */
@@ -336,32 +336,32 @@ int _EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST)
#if __POSIX_VISIBLE
#ifndef _REENT_ONLY
-FILE * _EXFUN(fdopen, (int, const char *));
+FILE * fdopen (int, const char *);
#endif
-int _EXFUN(fileno, (FILE *));
+int fileno (FILE *);
#endif
#if __MISC_VISIBLE || __POSIX_VISIBLE >= 199209
-int _EXFUN(pclose, (FILE *));
-FILE * _EXFUN(popen, (const char *, const char *));
+int pclose (FILE *);
+FILE * popen (const char *, const char *);
#endif
#if __BSD_VISIBLE
-void _EXFUN(setbuffer, (FILE *, char *, int));
-int _EXFUN(setlinebuf, (FILE *));
+void setbuffer (FILE *, char *, int);
+int setlinebuf (FILE *);
#endif
#if __MISC_VISIBLE || (__XSI_VISIBLE && __POSIX_VISIBLE < 200112)
-int _EXFUN(getw, (FILE *));
-int _EXFUN(putw, (int, FILE *));
+int getw (FILE *);
+int putw (int, FILE *);
#endif
#if __MISC_VISIBLE || __POSIX_VISIBLE
-int _EXFUN(getc_unlocked, (FILE *));
-int _EXFUN(getchar_unlocked, (void));
-void _EXFUN(flockfile, (FILE *));
-int _EXFUN(ftrylockfile, (FILE *));
-void _EXFUN(funlockfile, (FILE *));
-int _EXFUN(putc_unlocked, (int, FILE *));
-int _EXFUN(putchar_unlocked, (int));
+int getc_unlocked (FILE *);
+int getchar_unlocked (void);
+void flockfile (FILE *);
+int ftrylockfile (FILE *);
+void funlockfile (FILE *);
+int putc_unlocked (int, FILE *);
+int putchar_unlocked (int);
#endif
/*
@@ -371,21 +371,21 @@ int _EXFUN(putchar_unlocked, (int));
#if __POSIX_VISIBLE >= 200809
# ifndef _REENT_ONLY
# ifndef dprintf
-int _EXFUN(dprintf, (int, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
+int dprintf (int, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
# endif
-FILE * _EXFUN(fmemopen, (void *__restrict, size_t, const char *__restrict));
+FILE * fmemopen (void *__restrict, size_t, const char *__restrict);
/* getdelim - see __getdelim for now */
/* getline - see __getline for now */
-FILE * _EXFUN(open_memstream, (char **, size_t *));
-int _EXFUN(vdprintf, (int, const char *__restrict, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
+FILE * open_memstream (char **, size_t *);
+int vdprintf (int, const char *__restrict, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
# endif
#endif
#if __ATFILE_VISIBLE
-int _EXFUN(renameat, (int, const char *, int, const char *));
+int renameat (int, const char *, int, const char *);
# ifdef __CYGWIN__
-int _EXFUN(renameat2, (int, const char *, int, const char *, unsigned int));
+int renameat2 (int, const char *, int, const char *, unsigned int);
# endif
#endif
@@ -393,180 +393,180 @@ int _EXFUN(renameat2, (int, const char *, int, const char *, unsigned int));
* Recursive versions of the above.
*/
-int _EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...)
- _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-char * _EXFUN(_asniprintf_r, (struct _reent *, char *, size_t *, const char *, ...)
- _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
-char * _EXFUN(_asnprintf_r, (struct _reent *, char *__restrict, size_t *__restrict, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
-int _EXFUN(_asprintf_r, (struct _reent *, char **__restrict, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int _EXFUN(_diprintf_r, (struct _reent *, int, const char *, ...)
- _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int _EXFUN(_dprintf_r, (struct _reent *, int, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int _EXFUN(_fclose_r, (struct _reent *, FILE *));
-int _EXFUN(_fcloseall_r, (struct _reent *));
-FILE * _EXFUN(_fdopen_r, (struct _reent *, int, const char *));
-int _EXFUN(_fflush_r, (struct _reent *, FILE *));
-int _EXFUN(_fgetc_r, (struct _reent *, FILE *));
-int _EXFUN(_fgetc_unlocked_r, (struct _reent *, FILE *));
-char * _EXFUN(_fgets_r, (struct _reent *, char *__restrict, int, FILE *__restrict));
-char * _EXFUN(_fgets_unlocked_r, (struct _reent *, char *__restrict, int, FILE *__restrict));
+int _asiprintf_r (struct _reent *, char **, const char *, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+char * _asniprintf_r (struct _reent *, char *, size_t *, const char *, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 4, 5)));
+char * _asnprintf_r (struct _reent *, char *__restrict, size_t *__restrict, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 4, 5)));
+int _asprintf_r (struct _reent *, char **__restrict, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int _diprintf_r (struct _reent *, int, const char *, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int _dprintf_r (struct _reent *, int, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int _fclose_r (struct _reent *, FILE *);
+int _fcloseall_r (struct _reent *);
+FILE * _fdopen_r (struct _reent *, int, const char *);
+int _fflush_r (struct _reent *, FILE *);
+int _fgetc_r (struct _reent *, FILE *);
+int _fgetc_unlocked_r (struct _reent *, FILE *);
+char * _fgets_r (struct _reent *, char *__restrict, int, FILE *__restrict);
+char * _fgets_unlocked_r (struct _reent *, char *__restrict, int, FILE *__restrict);
#ifdef _COMPILING_NEWLIB
-int _EXFUN(_fgetpos_r, (struct _reent *, FILE *__restrict, _fpos_t *__restrict));
-int _EXFUN(_fsetpos_r, (struct _reent *, FILE *, const _fpos_t *));
+int _fgetpos_r (struct _reent *, FILE *__restrict, _fpos_t *__restrict);
+int _fsetpos_r (struct _reent *, FILE *, const _fpos_t *);
#else
-int _EXFUN(_fgetpos_r, (struct _reent *, FILE *, fpos_t *));
-int _EXFUN(_fsetpos_r, (struct _reent *, FILE *, const fpos_t *));
-#endif
-int _EXFUN(_fiprintf_r, (struct _reent *, FILE *, const char *, ...)
- _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int _EXFUN(_fiscanf_r, (struct _reent *, FILE *, const char *, ...)
- _ATTRIBUTE ((__format__ (__scanf__, 3, 4))));
-FILE * _EXFUN(_fmemopen_r, (struct _reent *, void *__restrict, size_t, const char *__restrict));
-FILE * _EXFUN(_fopen_r, (struct _reent *, const char *__restrict, const char *__restrict));
-FILE * _EXFUN(_freopen_r, (struct _reent *, const char *__restrict, const char *__restrict, FILE *__restrict));
-int _EXFUN(_fprintf_r, (struct _reent *, FILE *__restrict, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int _EXFUN(_fpurge_r, (struct _reent *, FILE *));
-int _EXFUN(_fputc_r, (struct _reent *, int, FILE *));
-int _EXFUN(_fputc_unlocked_r, (struct _reent *, int, FILE *));
-int _EXFUN(_fputs_r, (struct _reent *, const char *__restrict, FILE *__restrict));
-int _EXFUN(_fputs_unlocked_r, (struct _reent *, const char *__restrict, FILE *__restrict));
-size_t _EXFUN(_fread_r, (struct _reent *, void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t _EXFUN(_fread_unlocked_r, (struct _reent *, void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-int _EXFUN(_fscanf_r, (struct _reent *, FILE *__restrict, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__scanf__, 3, 4))));
-int _EXFUN(_fseek_r, (struct _reent *, FILE *, long, int));
-int _EXFUN(_fseeko_r,(struct _reent *, FILE *, _off_t, int));
-long _EXFUN(_ftell_r, (struct _reent *, FILE *));
-_off_t _EXFUN(_ftello_r,(struct _reent *, FILE *));
-void _EXFUN(_rewind_r, (struct _reent *, FILE *));
-size_t _EXFUN(_fwrite_r, (struct _reent *, const void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t _EXFUN(_fwrite_unlocked_r, (struct _reent *, const void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-int _EXFUN(_getc_r, (struct _reent *, FILE *));
-int _EXFUN(_getc_unlocked_r, (struct _reent *, FILE *));
-int _EXFUN(_getchar_r, (struct _reent *));
-int _EXFUN(_getchar_unlocked_r, (struct _reent *));
-char * _EXFUN(_gets_r, (struct _reent *, char *));
-int _EXFUN(_iprintf_r, (struct _reent *, const char *, ...)
- _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int _EXFUN(_iscanf_r, (struct _reent *, const char *, ...)
- _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-FILE * _EXFUN(_open_memstream_r, (struct _reent *, char **, size_t *));
-void _EXFUN(_perror_r, (struct _reent *, const char *));
-int _EXFUN(_printf_r, (struct _reent *, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__printf__, 2, 3))));
-int _EXFUN(_putc_r, (struct _reent *, int, FILE *));
-int _EXFUN(_putc_unlocked_r, (struct _reent *, int, FILE *));
-int _EXFUN(_putchar_unlocked_r, (struct _reent *, int));
-int _EXFUN(_putchar_r, (struct _reent *, int));
-int _EXFUN(_puts_r, (struct _reent *, const char *));
-int _EXFUN(_remove_r, (struct _reent *, const char *));
-int _EXFUN(_rename_r, (struct _reent *,
- const char *_old, const char *_new));
-int _EXFUN(_scanf_r, (struct _reent *, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__scanf__, 2, 3))));
-int _EXFUN(_siprintf_r, (struct _reent *, char *, const char *, ...)
- _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int _EXFUN(_siscanf_r, (struct _reent *, const char *, const char *, ...)
- _ATTRIBUTE ((__format__ (__scanf__, 3, 4))));
-int _EXFUN(_sniprintf_r, (struct _reent *, char *, size_t, const char *, ...)
- _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
-int _EXFUN(_snprintf_r, (struct _reent *, char *__restrict, size_t, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__printf__, 4, 5))));
-int _EXFUN(_sprintf_r, (struct _reent *, char *__restrict, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__printf__, 3, 4))));
-int _EXFUN(_sscanf_r, (struct _reent *, const char *__restrict, const char *__restrict, ...)
- _ATTRIBUTE ((__format__ (__scanf__, 3, 4))));
-char * _EXFUN(_tempnam_r, (struct _reent *, const char *, const char *));
-FILE * _EXFUN(_tmpfile_r, (struct _reent *));
-char * _EXFUN(_tmpnam_r, (struct _reent *, char *));
-int _EXFUN(_ungetc_r, (struct _reent *, int, FILE *));
-int _EXFUN(_vasiprintf_r, (struct _reent *, char **, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-char * _EXFUN(_vasniprintf_r, (struct _reent*, char *, size_t *, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
-char * _EXFUN(_vasnprintf_r, (struct _reent*, char *, size_t *, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
-int _EXFUN(_vasprintf_r, (struct _reent *, char **, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int _EXFUN(_vdiprintf_r, (struct _reent *, int, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int _EXFUN(_vdprintf_r, (struct _reent *, int, const char *__restrict, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int _EXFUN(_vfiprintf_r, (struct _reent *, FILE *, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int _EXFUN(_vfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
-int _EXFUN(_vfprintf_r, (struct _reent *, FILE *__restrict, const char *__restrict, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int _EXFUN(_vfscanf_r, (struct _reent *, FILE *__restrict, const char *__restrict, __VALIST)
- _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
-int _EXFUN(_viprintf_r, (struct _reent *, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int _EXFUN(_viscanf_r, (struct _reent *, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int _EXFUN(_vprintf_r, (struct _reent *, const char *__restrict, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 2, 0))));
-int _EXFUN(_vscanf_r, (struct _reent *, const char *__restrict, __VALIST)
- _ATTRIBUTE ((__format__ (__scanf__, 2, 0))));
-int _EXFUN(_vsiprintf_r, (struct _reent *, char *, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int _EXFUN(_vsiscanf_r, (struct _reent *, const char *, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
-int _EXFUN(_vsniprintf_r, (struct _reent *, char *, size_t, const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
-int _EXFUN(_vsnprintf_r, (struct _reent *, char *__restrict, size_t, const char *__restrict, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 4, 0))));
-int _EXFUN(_vsprintf_r, (struct _reent *, char *__restrict, const char *__restrict, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int _EXFUN(_vsscanf_r, (struct _reent *, const char *__restrict, const char *__restrict, __VALIST)
- _ATTRIBUTE ((__format__ (__scanf__, 3, 0))));
+int _fgetpos_r (struct _reent *, FILE *, fpos_t *);
+int _fsetpos_r (struct _reent *, FILE *, const fpos_t *);
+#endif
+int _fiprintf_r (struct _reent *, FILE *, const char *, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int _fiscanf_r (struct _reent *, FILE *, const char *, ...)
+ _ATTRIBUTE ((__format__ (__scanf__, 3, 4)));
+FILE * _fmemopen_r (struct _reent *, void *__restrict, size_t, const char *__restrict);
+FILE * _fopen_r (struct _reent *, const char *__restrict, const char *__restrict);
+FILE * _freopen_r (struct _reent *, const char *__restrict, const char *__restrict, FILE *__restrict);
+int _fprintf_r (struct _reent *, FILE *__restrict, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int _fpurge_r (struct _reent *, FILE *);
+int _fputc_r (struct _reent *, int, FILE *);
+int _fputc_unlocked_r (struct _reent *, int, FILE *);
+int _fputs_r (struct _reent *, const char *__restrict, FILE *__restrict);
+int _fputs_unlocked_r (struct _reent *, const char *__restrict, FILE *__restrict);
+size_t _fread_r (struct _reent *, void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+size_t _fread_unlocked_r (struct _reent *, void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+int _fscanf_r (struct _reent *, FILE *__restrict, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__scanf__, 3, 4)));
+int _fseek_r (struct _reent *, FILE *, long, int);
+int _fseeko_r (struct _reent *, FILE *, _off_t, int);
+long _ftell_r (struct _reent *, FILE *);
+_off_t _ftello_r (struct _reent *, FILE *);
+void _rewind_r (struct _reent *, FILE *);
+size_t _fwrite_r (struct _reent *, const void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+size_t _fwrite_unlocked_r (struct _reent *, const void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+int _getc_r (struct _reent *, FILE *);
+int _getc_unlocked_r (struct _reent *, FILE *);
+int _getchar_r (struct _reent *);
+int _getchar_unlocked_r (struct _reent *);
+char * _gets_r (struct _reent *, char *);
+int _iprintf_r (struct _reent *, const char *, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int _iscanf_r (struct _reent *, const char *, ...)
+ _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+FILE * _open_memstream_r (struct _reent *, char **, size_t *);
+void _perror_r (struct _reent *, const char *);
+int _printf_r (struct _reent *, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 3)));
+int _putc_r (struct _reent *, int, FILE *);
+int _putc_unlocked_r (struct _reent *, int, FILE *);
+int _putchar_unlocked_r (struct _reent *, int);
+int _putchar_r (struct _reent *, int);
+int _puts_r (struct _reent *, const char *);
+int _remove_r (struct _reent *, const char *);
+int _rename_r (struct _reent *,
+ const char *_old, const char *_new);
+int _scanf_r (struct _reent *, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__scanf__, 2, 3)));
+int _siprintf_r (struct _reent *, char *, const char *, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int _siscanf_r (struct _reent *, const char *, const char *, ...)
+ _ATTRIBUTE ((__format__ (__scanf__, 3, 4)));
+int _sniprintf_r (struct _reent *, char *, size_t, const char *, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 4, 5)));
+int _snprintf_r (struct _reent *, char *__restrict, size_t, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 4, 5)));
+int _sprintf_r (struct _reent *, char *__restrict, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 4)));
+int _sscanf_r (struct _reent *, const char *__restrict, const char *__restrict, ...)
+ _ATTRIBUTE ((__format__ (__scanf__, 3, 4)));
+char * _tempnam_r (struct _reent *, const char *, const char *);
+FILE * _tmpfile_r (struct _reent *);
+char * _tmpnam_r (struct _reent *, char *);
+int _ungetc_r (struct _reent *, int, FILE *);
+int _vasiprintf_r (struct _reent *, char **, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+char * _vasniprintf_r (struct _reent*, char *, size_t *, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 4, 0)));
+char * _vasnprintf_r (struct _reent*, char *, size_t *, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 4, 0)));
+int _vasprintf_r (struct _reent *, char **, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int _vdiprintf_r (struct _reent *, int, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int _vdprintf_r (struct _reent *, int, const char *__restrict, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int _vfiprintf_r (struct _reent *, FILE *, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int _vfiscanf_r (struct _reent *, FILE *, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__scanf__, 3, 0)));
+int _vfprintf_r (struct _reent *, FILE *__restrict, const char *__restrict, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int _vfscanf_r (struct _reent *, FILE *__restrict, const char *__restrict, __VALIST)
+ _ATTRIBUTE ((__format__ (__scanf__, 3, 0)));
+int _viprintf_r (struct _reent *, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int _viscanf_r (struct _reent *, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
+int _vprintf_r (struct _reent *, const char *__restrict, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 2, 0)));
+int _vscanf_r (struct _reent *, const char *__restrict, __VALIST)
+ _ATTRIBUTE ((__format__ (__scanf__, 2, 0)));
+int _vsiprintf_r (struct _reent *, char *, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int _vsiscanf_r (struct _reent *, const char *, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__scanf__, 3, 0)));
+int _vsniprintf_r (struct _reent *, char *, size_t, const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 4, 0)));
+int _vsnprintf_r (struct _reent *, char *__restrict, size_t, const char *__restrict, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 4, 0)));
+int _vsprintf_r (struct _reent *, char *__restrict, const char *__restrict, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int _vsscanf_r (struct _reent *, const char *__restrict, const char *__restrict, __VALIST)
+ _ATTRIBUTE ((__format__ (__scanf__, 3, 0)));
/* Other extensions. */
-int _EXFUN(fpurge, (FILE *));
-ssize_t _EXFUN(__getdelim, (char **, size_t *, int, FILE *));
-ssize_t _EXFUN(__getline, (char **, size_t *, FILE *));
+int fpurge (FILE *);
+ssize_t __getdelim (char **, size_t *, int, FILE *);
+ssize_t __getline (char **, size_t *, FILE *);
#if __MISC_VISIBLE
-void _EXFUN(clearerr_unlocked, (FILE *));
-int _EXFUN(feof_unlocked, (FILE *));
-int _EXFUN(ferror_unlocked, (FILE *));
-int _EXFUN(fileno_unlocked, (FILE *));
-int _EXFUN(fflush_unlocked, (FILE *));
-int _EXFUN(fgetc_unlocked, (FILE *));
-int _EXFUN(fputc_unlocked, (int, FILE *));
-size_t _EXFUN(fread_unlocked, (void *__restrict, size_t _size, size_t _n, FILE *__restrict));
-size_t _EXFUN(fwrite_unlocked, (const void *__restrict , size_t _size, size_t _n, FILE *));
+void clearerr_unlocked (FILE *);
+int feof_unlocked (FILE *);
+int ferror_unlocked (FILE *);
+int fileno_unlocked (FILE *);
+int fflush_unlocked (FILE *);
+int fgetc_unlocked (FILE *);
+int fputc_unlocked (int, FILE *);
+size_t fread_unlocked (void *__restrict, size_t _size, size_t _n, FILE *__restrict);
+size_t fwrite_unlocked (const void *__restrict , size_t _size, size_t _n, FILE *);
#endif
#if __GNU_VISIBLE
-char * _EXFUN(fgets_unlocked, (char *__restrict, int, FILE *__restrict));
-int _EXFUN(fputs_unlocked, (const char *__restrict, FILE *__restrict));
+char * fgets_unlocked (char *__restrict, int, FILE *__restrict);
+int fputs_unlocked (const char *__restrict, FILE *__restrict);
#endif
#ifdef __LARGE64_FILES
#if !defined(__CYGWIN__) || defined(_COMPILING_NEWLIB)
-FILE * _EXFUN(fdopen64, (int, const char *));
-FILE * _EXFUN(fopen64, (const char *, const char *));
-FILE * _EXFUN(freopen64, (const char *, const char *, FILE *));
-_off64_t _EXFUN(ftello64, (FILE *));
-_off64_t _EXFUN(fseeko64, (FILE *, _off64_t, int));
-int _EXFUN(fgetpos64, (FILE *, _fpos64_t *));
-int _EXFUN(fsetpos64, (FILE *, const _fpos64_t *));
-FILE * _EXFUN(tmpfile64, (void));
-
-FILE * _EXFUN(_fdopen64_r, (struct _reent *, int, const char *));
-FILE * _EXFUN(_fopen64_r, (struct _reent *,const char *, const char *));
-FILE * _EXFUN(_freopen64_r, (struct _reent *, const char *, const char *, FILE *));
-_off64_t _EXFUN(_ftello64_r, (struct _reent *, FILE *));
-_off64_t _EXFUN(_fseeko64_r, (struct _reent *, FILE *, _off64_t, int));
-int _EXFUN(_fgetpos64_r, (struct _reent *, FILE *, _fpos64_t *));
-int _EXFUN(_fsetpos64_r, (struct _reent *, FILE *, const _fpos64_t *));
-FILE * _EXFUN(_tmpfile64_r, (struct _reent *));
+FILE * fdopen64 (int, const char *);
+FILE * fopen64 (const char *, const char *);
+FILE * freopen64 (const char *, const char *, FILE *);
+_off64_t ftello64 (FILE *);
+_off64_t fseeko64 (FILE *, _off64_t, int);
+int fgetpos64 (FILE *, _fpos64_t *);
+int fsetpos64 (FILE *, const _fpos64_t *);
+FILE * tmpfile64 (void);
+
+FILE * _fdopen64_r (struct _reent *, int, const char *);
+FILE * _fopen64_r (struct _reent *,const char *, const char *);
+FILE * _freopen64_r (struct _reent *, const char *, const char *, FILE *);
+_off64_t _ftello64_r (struct _reent *, FILE *);
+_off64_t _fseeko64_r (struct _reent *, FILE *, _off64_t, int);
+int _fgetpos64_r (struct _reent *, FILE *, _fpos64_t *);
+int _fsetpos64_r (struct _reent *, FILE *, const _fpos64_t *);
+FILE * _tmpfile64_r (struct _reent *);
#endif /* !__CYGWIN__ */
#endif /* __LARGE64_FILES */
@@ -574,8 +574,8 @@ FILE * _EXFUN(_tmpfile64_r, (struct _reent *));
* Routines internal to the implementation.
*/
-int _EXFUN(__srget_r, (struct _reent *, FILE *));
-int _EXFUN(__swbuf_r, (struct _reent *, int, FILE *));
+int __srget_r (struct _reent *, FILE *);
+int __swbuf_r (struct _reent *, int, FILE *);
/*
* Stdio function-access interface.
@@ -583,35 +583,35 @@ int _EXFUN(__swbuf_r, (struct _reent *, int, FILE *));
#if __BSD_VISIBLE
# ifdef __LARGE64_FILES
-FILE *_EXFUN(funopen,(const void *__cookie,
+FILE *funopen (const void *__cookie,
int (*__readfn)(void *__c, char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
int (*__writefn)(void *__c, const char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
_fpos64_t (*__seekfn)(void *__c, _fpos64_t __off, int __whence),
- int (*__closefn)(void *__c)));
-FILE *_EXFUN(_funopen_r,(struct _reent *, const void *__cookie,
+ int (*__closefn)(void *__c));
+FILE *_funopen_r (struct _reent *, const void *__cookie,
int (*__readfn)(void *__c, char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
int (*__writefn)(void *__c, const char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
_fpos64_t (*__seekfn)(void *__c, _fpos64_t __off, int __whence),
- int (*__closefn)(void *__c)));
+ int (*__closefn)(void *__c));
# else
-FILE *_EXFUN(funopen,(const void *__cookie,
+FILE *funopen (const void *__cookie,
int (*__readfn)(void *__cookie, char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
int (*__writefn)(void *__cookie, const char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
fpos_t (*__seekfn)(void *__cookie, fpos_t __off, int __whence),
- int (*__closefn)(void *__cookie)));
-FILE *_EXFUN(_funopen_r,(struct _reent *, const void *__cookie,
+ int (*__closefn)(void *__cookie));
+FILE *_funopen_r (struct _reent *, const void *__cookie,
int (*__readfn)(void *__cookie, char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
int (*__writefn)(void *__cookie, const char *__buf,
_READ_WRITE_BUFSIZE_TYPE __n),
fpos_t (*__seekfn)(void *__cookie, fpos_t __off, int __whence),
- int (*__closefn)(void *__cookie)));
+ int (*__closefn)(void *__cookie));
# endif /* !__LARGE64_FILES */
# define fropen(__cookie, __fn) funopen(__cookie, __fn, (int (*)())0, \
@@ -640,10 +640,10 @@ typedef struct
cookie_seek_function_t *seek;
cookie_close_function_t *close;
} cookie_io_functions_t;
-FILE *_EXFUN(fopencookie,(void *__cookie,
- const char *__mode, cookie_io_functions_t __functions));
-FILE *_EXFUN(_fopencookie_r,(struct _reent *, void *__cookie,
- const char *__mode, cookie_io_functions_t __functions));
+FILE *fopencookie (void *__cookie,
+ const char *__mode, cookie_io_functions_t __functions);
+FILE *_fopencookie_r (struct _reent *, void *__cookie,
+ const char *__mode, cookie_io_functions_t __functions);
#endif /* __GNU_VISIBLE */
#ifndef __CUSTOM_FILE_IO__
diff --git a/newlib/libc/include/stdio_ext.h b/newlib/libc/include/stdio_ext.h
index 029ab0253..231262d47 100644
--- a/newlib/libc/include/stdio_ext.h
+++ b/newlib/libc/include/stdio_ext.h
@@ -19,8 +19,8 @@
_BEGIN_STD_C
-void _EXFUN(__fpurge,(FILE *));
-int _EXFUN(__fsetlocking,(FILE *, int));
+void __fpurge (FILE *);
+int __fsetlocking (FILE *, int);
/* TODO:
@@ -52,13 +52,13 @@ __fpending (FILE *__fp) { return __fp->_p - __fp->_bf._base; }
#else
-size_t _EXFUN(__fbufsize,(FILE *));
-int _EXFUN(__freading,(FILE *));
-int _EXFUN(__fwriting,(FILE *));
-int _EXFUN(__freadable,(FILE *));
-int _EXFUN(__fwritable,(FILE *));
-int _EXFUN(__flbf,(FILE *));
-size_t _EXFUN(__fpending,(FILE *));
+size_t __fbufsize (FILE *);
+int __freading (FILE *);
+int __fwriting (FILE *);
+int __freadable (FILE *);
+int __fwritable (FILE *);
+int __flbf (FILE *);
+size_t __fpending (FILE *);
#ifndef __cplusplus
diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h
index 80f15f4e9..ef0e4bdda 100644
--- a/newlib/libc/include/stdlib.h
+++ b/newlib/libc/include/stdlib.h
@@ -62,102 +62,102 @@ typedef int (*__compar_fn_t) (const void *, const void *);
#define RAND_MAX __RAND_MAX
-int _EXFUN(__locale_mb_cur_max,(void));
+int __locale_mb_cur_max (void);
#define MB_CUR_MAX __locale_mb_cur_max()
-void _EXFUN(abort,(void) _ATTRIBUTE ((__noreturn__)));
-int _EXFUN(abs,(int));
+void abort (void) _ATTRIBUTE ((__noreturn__));
+int abs (int);
#if __BSD_VISIBLE
-__uint32_t _EXFUN(arc4random, (void));
-__uint32_t _EXFUN(arc4random_uniform, (__uint32_t));
-void _EXFUN(arc4random_buf, (void *, size_t));
+__uint32_t arc4random (void);
+__uint32_t arc4random_uniform (__uint32_t);
+void arc4random_buf (void *, size_t);
#endif
-int _EXFUN(atexit,(void (*__func)(void)));
-double _EXFUN(atof,(const char *__nptr));
+int atexit (void (*__func)(void));
+double atof (const char *__nptr);
#if __MISC_VISIBLE
-float _EXFUN(atoff,(const char *__nptr));
+float atoff (const char *__nptr);
#endif
-int _EXFUN(atoi,(const char *__nptr));
-int _EXFUN(_atoi_r,(struct _reent *, const char *__nptr));
-long _EXFUN(atol,(const char *__nptr));
-long _EXFUN(_atol_r,(struct _reent *, const char *__nptr));
-void * _EXFUN(bsearch,(const void *__key,
+int atoi (const char *__nptr);
+int _atoi_r (struct _reent *, const char *__nptr);
+long atol (const char *__nptr);
+long _atol_r (struct _reent *, const char *__nptr);
+void * bsearch (const void *__key,
const void *__base,
size_t __nmemb,
size_t __size,
- __compar_fn_t _compar));
-void * _EXFUN_NOTHROW(calloc,(size_t __nmemb, size_t __size));
-div_t _EXFUN(div,(int __numer, int __denom));
-void _EXFUN(exit,(int __status) _ATTRIBUTE ((__noreturn__)));
-void _EXFUN_NOTHROW(free,(void *));
-char * _EXFUN(getenv,(const char *__string));
-char * _EXFUN(_getenv_r,(struct _reent *, const char *__string));
-char * _EXFUN(_findenv,(const char *, int *));
-char * _EXFUN(_findenv_r,(struct _reent *, const char *, int *));
+ __compar_fn_t _compar);
+void * calloc (size_t __nmemb, size_t __size) _NOTHROW;
+div_t div (int __numer, int __denom);
+void exit (int __status) _ATTRIBUTE ((__noreturn__));
+void free (void *) _NOTHROW;
+char * getenv (const char *__string);
+char * _getenv_r (struct _reent *, const char *__string);
+char * _findenv (const char *, int *);
+char * _findenv_r (struct _reent *, const char *, int *);
#if __POSIX_VISIBLE >= 200809
extern char *suboptarg; /* getsubopt(3) external variable */
-int _EXFUN(getsubopt,(char **, char * const *, char **));
-#endif
-long _EXFUN(labs,(long));
-ldiv_t _EXFUN(ldiv,(long __numer, long __denom));
-void * _EXFUN_NOTHROW(malloc,(size_t __size));
-int _EXFUN(mblen,(const char *, size_t));
-int _EXFUN(_mblen_r,(struct _reent *, const char *, size_t, _mbstate_t *));
-int _EXFUN(mbtowc,(wchar_t *__restrict, const char *__restrict, size_t));
-int _EXFUN(_mbtowc_r,(struct _reent *, wchar_t *__restrict, const char *__restrict, size_t, _mbstate_t *));
-int _EXFUN(wctomb,(char *, wchar_t));
-int _EXFUN(_wctomb_r,(struct _reent *, char *, wchar_t, _mbstate_t *));
-size_t _EXFUN(mbstowcs,(wchar_t *__restrict, const char *__restrict, size_t));
-size_t _EXFUN(_mbstowcs_r,(struct _reent *, wchar_t *__restrict, const char *__restrict, size_t, _mbstate_t *));
-size_t _EXFUN(wcstombs,(char *__restrict, const wchar_t *__restrict, size_t));
-size_t _EXFUN(_wcstombs_r,(struct _reent *, char *__restrict, const wchar_t *__restrict, size_t, _mbstate_t *));
+int getsubopt (char **, char * const *, char **);
+#endif
+long labs (long);
+ldiv_t ldiv (long __numer, long __denom);
+void * malloc (size_t __size) _NOTHROW;
+int mblen (const char *, size_t);
+int _mblen_r (struct _reent *, const char *, size_t, _mbstate_t *);
+int mbtowc (wchar_t *__restrict, const char *__restrict, size_t);
+int _mbtowc_r (struct _reent *, wchar_t *__restrict, const char *__restrict, size_t, _mbstate_t *);
+int wctomb (char *, wchar_t);
+int _wctomb_r (struct _reent *, char *, wchar_t, _mbstate_t *);
+size_t mbstowcs (wchar_t *__restrict, const char *__restrict, size_t);
+size_t _mbstowcs_r (struct _reent *, wchar_t *__restrict, const char *__restrict, size_t, _mbstate_t *);
+size_t wcstombs (char *__restrict, const wchar_t *__restrict, size_t);
+size_t _wcstombs_r (struct _reent *, char *__restrict, const wchar_t *__restrict, size_t, _mbstate_t *);
#ifndef _REENT_ONLY
#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200809
-char * _EXFUN(mkdtemp,(char *));
+char * mkdtemp (char *);
#endif
#if __GNU_VISIBLE
-int _EXFUN(mkostemp,(char *, int));
-int _EXFUN(mkostemps,(char *, int, int));
+int mkostemp (char *, int);
+int mkostemps (char *, int, int);
#endif
#if __MISC_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 4
-int _EXFUN(mkstemp,(char *));
+int mkstemp (char *);
#endif
#if __MISC_VISIBLE
-int _EXFUN(mkstemps,(char *, int));
+int mkstemps (char *, int);
#endif
#if __BSD_VISIBLE || (__XSI_VISIBLE >= 4 && __POSIX_VISIBLE < 200112)
-char * _EXFUN(mktemp,(char *) _ATTRIBUTE ((__deprecated__("the use of `mktemp' is dangerous; use `mkstemp' instead"))));
+char * mktemp (char *) _ATTRIBUTE ((__deprecated__("the use of `mktemp' is dangerous; use `mkstemp' instead")));
#endif
#endif /* !_REENT_ONLY */
-char * _EXFUN(_mkdtemp_r, (struct _reent *, char *));
-int _EXFUN(_mkostemp_r, (struct _reent *, char *, int));
-int _EXFUN(_mkostemps_r, (struct _reent *, char *, int, int));
-int _EXFUN(_mkstemp_r, (struct _reent *, char *));
-int _EXFUN(_mkstemps_r, (struct _reent *, char *, int));
-char * _EXFUN(_mktemp_r, (struct _reent *, char *) _ATTRIBUTE ((__deprecated__("the use of `mktemp' is dangerous; use `mkstemp' instead"))));
-void _EXFUN(qsort,(void *__base, size_t __nmemb, size_t __size, __compar_fn_t _compar));
-int _EXFUN(rand,(void));
-void * _EXFUN_NOTHROW(realloc,(void *__r, size_t __size));
+char * _mkdtemp_r (struct _reent *, char *);
+int _mkostemp_r (struct _reent *, char *, int);
+int _mkostemps_r (struct _reent *, char *, int, int);
+int _mkstemp_r (struct _reent *, char *);
+int _mkstemps_r (struct _reent *, char *, int);
+char * _mktemp_r (struct _reent *, char *) _ATTRIBUTE ((__deprecated__("the use of `mktemp' is dangerous; use `mkstemp' instead")));
+void qsort (void *__base, size_t __nmemb, size_t __size, __compar_fn_t _compar);
+int rand (void);
+void * realloc (void *__r, size_t __size) _NOTHROW;
#if __BSD_VISIBLE
void *reallocarray(void *, size_t, size_t) __result_use_check __alloc_size(2)
__alloc_size(3);
-void * _EXFUN(reallocf,(void *__r, size_t __size));
+void * reallocf (void *__r, size_t __size);
#endif
#if __BSD_VISIBLE || __XSI_VISIBLE >= 4
-char * _EXFUN(realpath, (const char *__restrict path, char *__restrict resolved_path));
+char * realpath (const char *__restrict path, char *__restrict resolved_path);
#endif
#if __BSD_VISIBLE
-int _EXFUN(rpmatch, (const char *response));
+int rpmatch (const char *response);
#endif
#if __XSI_VISIBLE
-void _EXFUN(setkey, (const char *__key));
+void setkey (const char *__key);
#endif
-void _EXFUN(srand,(unsigned __seed));
-double _EXFUN(strtod,(const char *__restrict __n, char **__restrict __end_PTR));
-double _EXFUN(_strtod_r,(struct _reent *,const char *__restrict __n, char **__restrict __end_PTR));
+void srand (unsigned __seed);
+double strtod (const char *__restrict __n, char **__restrict __end_PTR);
+double _strtod_r (struct _reent *,const char *__restrict __n, char **__restrict __end_PTR);
#if __ISO_C_VISIBLE >= 1999
-float _EXFUN(strtof,(const char *__restrict __n, char **__restrict __end_PTR));
+float strtof (const char *__restrict __n, char **__restrict __end_PTR);
#endif
#if __MISC_VISIBLE
/* the following strtodf interface is deprecated...use strtof instead */
@@ -165,10 +165,10 @@ float _EXFUN(strtof,(const char *__restrict __n, char **__restrict __end_PTR));
# define strtodf strtof
# endif
#endif
-long _EXFUN(strtol,(const char *__restrict __n, char **__restrict __end_PTR, int __base));
-long _EXFUN(_strtol_r,(struct _reent *,const char *__restrict __n, char **__restrict __end_PTR, int __base));
-unsigned long _EXFUN(strtoul,(const char *__restrict __n, char **__restrict __end_PTR, int __base));
-unsigned long _EXFUN(_strtoul_r,(struct _reent *,const char *__restrict __n, char **__restrict __end_PTR, int __base));
+long strtol (const char *__restrict __n, char **__restrict __end_PTR, int __base);
+long _strtol_r (struct _reent *,const char *__restrict __n, char **__restrict __end_PTR, int __base);
+unsigned long strtoul (const char *__restrict __n, char **__restrict __end_PTR, int __base);
+unsigned long _strtoul_r (struct _reent *,const char *__restrict __n, char **__restrict __end_PTR, int __base);
#if __GNU_VISIBLE
double strtod_l (const char *__restrict, char **__restrict, locale_t);
@@ -185,130 +185,130 @@ unsigned long long strtoull_l (const char *__restrict, char **__restrict, int,
locale_t __loc);
#endif
-int _EXFUN(system,(const char *__string));
+int system (const char *__string);
#if __SVID_VISIBLE || __XSI_VISIBLE >= 4
-long _EXFUN(a64l,(const char *__input));
-char * _EXFUN(l64a,(long __input));
-char * _EXFUN(_l64a_r,(struct _reent *,long __input));
+long a64l (const char *__input);
+char * l64a (long __input);
+char * _l64a_r (struct _reent *,long __input);
#endif
#if __MISC_VISIBLE
-int _EXFUN(on_exit,(void (*__func)(int, void *),void *__arg));
+int on_exit (void (*__func)(int, void *),void *__arg);
#endif
#if __ISO_C_VISIBLE >= 1999
-void _EXFUN(_Exit,(int __status) _ATTRIBUTE ((__noreturn__)));
+void _Exit (int __status) _ATTRIBUTE ((__noreturn__));
#endif
#if __SVID_VISIBLE || __XSI_VISIBLE
-int _EXFUN(putenv,(char *__string));
+int putenv (char *__string);
#endif
-int _EXFUN(_putenv_r,(struct _reent *, char *__string));
-void * _EXFUN(_reallocf_r,(struct _reent *, void *, size_t));
+int _putenv_r (struct _reent *, char *__string);
+void * _reallocf_r (struct _reent *, void *, size_t);
#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112
-int _EXFUN(setenv,(const char *__string, const char *__value, int __overwrite));
+int setenv (const char *__string, const char *__value, int __overwrite);
#endif
-int _EXFUN(_setenv_r,(struct _reent *, const char *__string, const char *__value, int __overwrite));
+int _setenv_r (struct _reent *, const char *__string, const char *__value, int __overwrite);
#if __XSI_VISIBLE >= 4 && __POSIX_VISIBLE < 200112
-char * _EXFUN(gcvt,(double,int,char *));
-char * _EXFUN(gcvtf,(float,int,char *));
-char * _EXFUN(fcvt,(double,int,int *,int *));
-char * _EXFUN(fcvtf,(float,int,int *,int *));
-char * _EXFUN(ecvt,(double,int,int *,int *));
-char * _EXFUN(ecvtbuf,(double, int, int*, int*, char *));
-char * _EXFUN(fcvtbuf,(double, int, int*, int*, char *));
-char * _EXFUN(ecvtf,(float,int,int *,int *));
-#endif
-char * _EXFUN(__itoa,(int, char *, int));
-char * _EXFUN(__utoa,(unsigned, char *, int));
+char * gcvt (double,int,char *);
+char * gcvtf (float,int,char *);
+char * fcvt (double,int,int *,int *);
+char * fcvtf (float,int,int *,int *);
+char * ecvt (double,int,int *,int *);
+char * ecvtbuf (double, int, int*, int*, char *);
+char * fcvtbuf (double, int, int*, int*, char *);
+char * ecvtf (float,int,int *,int *);
+#endif
+char * __itoa (int, char *, int);
+char * __utoa (unsigned, char *, int);
#if __MISC_VISIBLE
-char * _EXFUN(itoa,(int, char *, int));
-char * _EXFUN(utoa,(unsigned, char *, int));
+char * itoa (int, char *, int);
+char * utoa (unsigned, char *, int);
#endif
#if __POSIX_VISIBLE
-int _EXFUN(rand_r,(unsigned *__seed));
+int rand_r (unsigned *__seed);
#endif
#if __SVID_VISIBLE || __XSI_VISIBLE
-double _EXFUN(drand48,(void));
-double _EXFUN(_drand48_r,(struct _reent *));
-double _EXFUN(erand48,(unsigned short [3]));
-double _EXFUN(_erand48_r,(struct _reent *, unsigned short [3]));
-long _EXFUN(jrand48,(unsigned short [3]));
-long _EXFUN(_jrand48_r,(struct _reent *, unsigned short [3]));
-void _EXFUN(lcong48,(unsigned short [7]));
-void _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7]));
-long _EXFUN(lrand48,(void));
-long _EXFUN(_lrand48_r,(struct _reent *));
-long _EXFUN(mrand48,(void));
-long _EXFUN(_mrand48_r,(struct _reent *));
-long _EXFUN(nrand48,(unsigned short [3]));
-long _EXFUN(_nrand48_r,(struct _reent *, unsigned short [3]));
+double drand48 (void);
+double _drand48_r (struct _reent *);
+double erand48 (unsigned short [3]);
+double _erand48_r (struct _reent *, unsigned short [3]);
+long jrand48 (unsigned short [3]);
+long _jrand48_r (struct _reent *, unsigned short [3]);
+void lcong48 (unsigned short [7]);
+void _lcong48_r (struct _reent *, unsigned short [7]);
+long lrand48 (void);
+long _lrand48_r (struct _reent *);
+long mrand48 (void);
+long _mrand48_r (struct _reent *);
+long nrand48 (unsigned short [3]);
+long _nrand48_r (struct _reent *, unsigned short [3]);
unsigned short *
- _EXFUN(seed48,(unsigned short [3]));
+ seed48 (unsigned short [3]);
unsigned short *
- _EXFUN(_seed48_r,(struct _reent *, unsigned short [3]));
-void _EXFUN(srand48,(long));
-void _EXFUN(_srand48_r,(struct _reent *, long));
+ _seed48_r (struct _reent *, unsigned short [3]);
+void srand48 (long);
+void _srand48_r (struct _reent *, long);
#endif /* __SVID_VISIBLE || __XSI_VISIBLE */
#if __SVID_VISIBLE || __XSI_VISIBLE >= 4 || __BSD_VISIBLE
-char * _EXFUN(initstate,(unsigned, char *, size_t));
-long _EXFUN(random,(void));
-char * _EXFUN(setstate,(char *));
-void _EXFUN(srandom,(unsigned));
+char * initstate (unsigned, char *, size_t);
+long random (void);
+char * setstate (char *);
+void srandom (unsigned);
#endif
#if __ISO_C_VISIBLE >= 1999
-long long _EXFUN(atoll,(const char *__nptr));
+long long atoll (const char *__nptr);
#endif
-long long _EXFUN(_atoll_r,(struct _reent *, const char *__nptr));
+long long _atoll_r (struct _reent *, const char *__nptr);
#if __ISO_C_VISIBLE >= 1999
-long long _EXFUN(llabs,(long long));
-lldiv_t _EXFUN(lldiv,(long long __numer, long long __denom));
-long long _EXFUN(strtoll,(const char *__restrict __n, char **__restrict __end_PTR, int __base));
+long long llabs (long long);
+lldiv_t lldiv (long long __numer, long long __denom);
+long long strtoll (const char *__restrict __n, char **__restrict __end_PTR, int __base);
#endif
-long long _EXFUN(_strtoll_r,(struct _reent *, const char *__restrict __n, char **__restrict __end_PTR, int __base));
+long long _strtoll_r (struct _reent *, const char *__restrict __n, char **__restrict __end_PTR, int __base);
#if __ISO_C_VISIBLE >= 1999
-unsigned long long _EXFUN(strtoull,(const char *__restrict __n, char **__restrict __end_PTR, int __base));
+unsigned long long strtoull (const char *__restrict __n, char **__restrict __end_PTR, int __base);
#endif
-unsigned long long _EXFUN(_strtoull_r,(struct _reent *, const char *__restrict __n, char **__restrict __end_PTR, int __base));
+unsigned long long _strtoull_r (struct _reent *, const char *__restrict __n, char **__restrict __end_PTR, int __base);
#ifndef __CYGWIN__
#if __MISC_VISIBLE
-void _EXFUN(cfree,(void *));
+void cfree (void *);
#endif
#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112
-int _EXFUN(unsetenv,(const char *__string));
+int unsetenv (const char *__string);
#endif
-int _EXFUN(_unsetenv_r,(struct _reent *, const char *__string));
+int _unsetenv_r (struct _reent *, const char *__string);
#endif /* !__CYGWIN__ */
#if __POSIX_VISIBLE >= 200112
-int _EXFUN(__nonnull ((1)) posix_memalign,(void **, size_t, size_t));
+int __nonnull ((1)) posix_memalign (void **, size_t, size_t);
#endif
-char * _EXFUN(_dtoa_r,(struct _reent *, double, int, int, int *, int*, char**));
+char * _dtoa_r (struct _reent *, double, int, int, int *, int*, char**);
#ifndef __CYGWIN__
-void * _EXFUN_NOTHROW(_malloc_r,(struct _reent *, size_t));
-void * _EXFUN_NOTHROW(_calloc_r,(struct _reent *, size_t, size_t));
-void _EXFUN_NOTHROW(_free_r,(struct _reent *, void *));
-void * _EXFUN_NOTHROW(_realloc_r,(struct _reent *, void *, size_t));
-void _EXFUN(_mstats_r,(struct _reent *, char *));
+void * _malloc_r (struct _reent *, size_t) _NOTHROW;
+void * _calloc_r (struct _reent *, size_t, size_t) _NOTHROW;
+void _free_r (struct _reent *, void *) _NOTHROW;
+void * _realloc_r (struct _reent *, void *, size_t) _NOTHROW;
+void _mstats_r (struct _reent *, char *);
#endif
-int _EXFUN(_system_r,(struct _reent *, const char *));
+int _system_r (struct _reent *, const char *);
-void _EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *));
+void __eprintf (const char *, const char *, unsigned int, const char *);
/* There are two common qsort_r variants. If you request
_BSD_SOURCE, you get the BSD version; otherwise you get the GNU
version. We want that #undef qsort_r will still let you
invoke the underlying function, but that requires gcc support. */
#if __GNU_VISIBLE
-void _EXFUN(qsort_r,(void *__base, size_t __nmemb, size_t __size, int (*_compar)(const void *, const void *, void *), void *__thunk));
+void qsort_r (void *__base, size_t __nmemb, size_t __size, int (*_compar)(const void *, const void *, void *), void *__thunk);
#elif __BSD_VISIBLE
# ifdef __GNUC__
-void _EXFUN(qsort_r,(void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *)))
+void qsort_r (void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *))
__asm__ (__ASMNAME ("__bsd_qsort_r"));
# else
-void _EXFUN(__bsd_qsort_r,(void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *)));
+void __bsd_qsort_r (void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *));
# define qsort_r __bsd_qsort_r
# endif
#endif
diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h
index e44ac3079..37febadc0 100644
--- a/newlib/libc/include/string.h
+++ b/newlib/libc/include/string.h
@@ -26,30 +26,30 @@
_BEGIN_STD_C
-void * _EXFUN(memchr,(const void *, int, size_t));
-int _EXFUN(memcmp,(const void *, const void *, size_t));
-void * _EXFUN(memcpy,(void *__restrict, const void *__restrict, size_t));
-void * _EXFUN(memmove,(void *, const void *, size_t));
-void * _EXFUN(memset,(void *, int, size_t));
-char *_EXFUN(strcat,(char *__restrict, const char *__restrict));
-char *_EXFUN(strchr,(const char *, int));
-int _EXFUN(strcmp,(const char *, const char *));
-int _EXFUN(strcoll,(const char *, const char *));
-char *_EXFUN(strcpy,(char *__restrict, const char *__restrict));
-size_t _EXFUN(strcspn,(const char *, const char *));
-char *_EXFUN(strerror,(int));
-size_t _EXFUN(strlen,(const char *));
-char *_EXFUN(strncat,(char *__restrict, const char *__restrict, size_t));
-int _EXFUN(strncmp,(const char *, const char *, size_t));
-char *_EXFUN(strncpy,(char *__restrict, const char *__restrict, size_t));
-char *_EXFUN(strpbrk,(const char *, const char *));
-char *_EXFUN(strrchr,(const char *, int));
-size_t _EXFUN(strspn,(const char *, const char *));
-char *_EXFUN(strstr,(const char *, const char *));
+void * memchr (const void *, int, size_t);
+int memcmp (const void *, const void *, size_t);
+void * memcpy (void *__restrict, const void *__restrict, size_t);
+void * memmove (void *, const void *, size_t);
+void * memset (void *, int, size_t);
+char *strcat (char *__restrict, const char *__restrict);
+char *strchr (const char *, int);
+int strcmp (const char *, const char *);
+int strcoll (const char *, const char *);
+char *strcpy (char *__restrict, const char *__restrict);
+size_t strcspn (const char *, const char *);
+char *strerror (int);
+size_t strlen (const char *);
+char *strncat (char *__restrict, const char *__restrict, size_t);
+int strncmp (const char *, const char *, size_t);
+char *strncpy (char *__restrict, const char *__restrict, size_t);
+char *strpbrk (const char *, const char *);
+char *strrchr (const char *, int);
+size_t strspn (const char *, const char *);
+char *strstr (const char *, const char *);
#ifndef _REENT_ONLY
-char *_EXFUN(strtok,(char *__restrict, const char *__restrict));
+char *strtok (char *__restrict, const char *__restrict);
#endif
-size_t _EXFUN(strxfrm,(char *__restrict, const char *__restrict, size_t));
+size_t strxfrm (char *__restrict, const char *__restrict, size_t);
#if __POSIX_VISIBLE >= 200809
int strcoll_l (const char *, const char *, locale_t);
@@ -57,89 +57,89 @@ char *strerror_l (int, locale_t);
size_t strxfrm_l (char *__restrict, const char *__restrict, size_t, locale_t);
#endif
#if __MISC_VISIBLE || __POSIX_VISIBLE
-char *_EXFUN(strtok_r,(char *__restrict, const char *__restrict, char **__restrict));
+char *strtok_r (char *__restrict, const char *__restrict, char **__restrict);
#endif
#if __BSD_VISIBLE
-int _EXFUN(timingsafe_bcmp,(const void *, const void *, size_t));
-int _EXFUN(timingsafe_memcmp,(const void *, const void *, size_t));
+int timingsafe_bcmp (const void *, const void *, size_t);
+int timingsafe_memcmp (const void *, const void *, size_t);
#endif
#if __MISC_VISIBLE || __POSIX_VISIBLE
-void * _EXFUN(memccpy,(void *__restrict, const void *__restrict, int, size_t));
+void * memccpy (void *__restrict, const void *__restrict, int, size_t);
#endif
#if __GNU_VISIBLE
-void * _EXFUN(mempcpy,(void *, const void *, size_t));
-void * _EXFUN(memmem, (const void *, size_t, const void *, size_t));
-void * _EXFUN(memrchr,(const void *, int, size_t));
-void * _EXFUN(rawmemchr,(const void *, int));
+void * mempcpy (void *, const void *, size_t);
+void * memmem (const void *, size_t, const void *, size_t);
+void * memrchr (const void *, int, size_t);
+void * rawmemchr (const void *, int);
#endif
#if __POSIX_VISIBLE >= 200809
-char *_EXFUN(stpcpy,(char *__restrict, const char *__restrict));
-char *_EXFUN(stpncpy,(char *__restrict, const char *__restrict, size_t));
+char *stpcpy (char *__restrict, const char *__restrict);
+char *stpncpy (char *__restrict, const char *__restrict, size_t);
#endif
#if __GNU_VISIBLE
-char *_EXFUN(strcasestr,(const char *, const char *));
-char *_EXFUN(strchrnul,(const char *, int));
+char *strcasestr (const char *, const char *);
+char *strchrnul (const char *, int);
#endif
#if __MISC_VISIBLE || __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 4
-char *_EXFUN(strdup,(const char *));
+char *strdup (const char *);
#endif
-char *_EXFUN(_strdup_r,(struct _reent *, const char *));
+char *_strdup_r (struct _reent *, const char *);
#if __POSIX_VISIBLE >= 200809
-char *_EXFUN(strndup,(const char *, size_t));
+char *strndup (const char *, size_t);
#endif
-char *_EXFUN(_strndup_r,(struct _reent *, const char *, size_t));
+char *_strndup_r (struct _reent *, const char *, size_t);
/* There are two common strerror_r variants. If you request
_GNU_SOURCE, you get the GNU version; otherwise you get the POSIX
version. POSIX requires that #undef strerror_r will still let you
invoke the underlying function, but that requires gcc support. */
#if __GNU_VISIBLE
-char *_EXFUN(strerror_r,(int, char *, size_t));
+char *strerror_r (int, char *, size_t);
#elif __POSIX_VISIBLE >= 200112
# ifdef __GNUC__
-int _EXFUN(strerror_r,(int, char *, size_t))
+int strerror_r (int, char *, size_t)
#ifdef __ASMNAME
__asm__ (__ASMNAME ("__xpg_strerror_r"))
#endif
;
# else
-int _EXFUN(__xpg_strerror_r,(int, char *, size_t));
+int __xpg_strerror_r (int, char *, size_t);
# define strerror_r __xpg_strerror_r
# endif
#endif
/* Reentrant version of strerror. */
-char * _EXFUN(_strerror_r, (struct _reent *, int, int, int *));
+char * _strerror_r (struct _reent *, int, int, int *);
#if __BSD_VISIBLE
-size_t _EXFUN(strlcat,(char *, const char *, size_t));
-size_t _EXFUN(strlcpy,(char *, const char *, size_t));
+size_t strlcat (char *, const char *, size_t);
+size_t strlcpy (char *, const char *, size_t);
#endif
#if __POSIX_VISIBLE >= 200809
-size_t _EXFUN(strnlen,(const char *, size_t));
+size_t strnlen (const char *, size_t);
#endif
#if __BSD_VISIBLE
-char *_EXFUN(strsep,(char **, const char *));
+char *strsep (char **, const char *);
#endif
#if __BSD_VISIBLE
char *strnstr(const char *, const char *, size_t) __pure;
#endif
#if __MISC_VISIBLE
-char *_EXFUN(strlwr,(char *));
-char *_EXFUN(strupr,(char *));
+char *strlwr (char *);
+char *strupr (char *);
#endif
#ifndef DEFS_H /* Kludge to work around problem compiling in gdb */
-char *_EXFUN(strsignal, (int __signo));
+char *strsignal (int __signo);
#endif
#ifdef __CYGWIN__
-int _EXFUN(strtosigno, (const char *__name));
+int strtosigno (const char *__name);
#endif
#if __GNU_VISIBLE
-int _EXFUN(strverscmp,(const char *, const char *));
+int strverscmp (const char *, const char *);
#endif
#if __GNU_VISIBLE && defined(__GNUC__)
@@ -169,7 +169,7 @@ int _EXFUN(strverscmp,(const char *, const char *));
sure here. */
#if __GNU_VISIBLE && !defined(basename)
# define basename basename
-char *_EXFUN(__nonnull ((1)) basename,(const char *)) __asm__(__ASMNAME("__gnu_basename"));
+char *__nonnull ((1)) basename (const char *) __asm__(__ASMNAME("__gnu_basename"));
#endif
#include <sys/string.h>
diff --git a/newlib/libc/include/sys/iconvnls.h b/newlib/libc/include/sys/iconvnls.h
index aa0b78441..d4ee0b7c9 100644
--- a/newlib/libc/include/sys/iconvnls.h
+++ b/newlib/libc/include/sys/iconvnls.h
@@ -45,33 +45,33 @@
#define ICONV_NLS_TO 1
void
-_EXFUN(_iconv_nls_get_state, (iconv_t cd, mbstate_t *ps, int direction));
+_iconv_nls_get_state (iconv_t cd, mbstate_t *ps, int direction);
int
-_EXFUN(_iconv_nls_set_state, (iconv_t cd, mbstate_t *ps, int direction));
+_iconv_nls_set_state (iconv_t cd, mbstate_t *ps, int direction);
int
-_EXFUN(_iconv_nls_is_stateful, (iconv_t cd, int direction));
+_iconv_nls_is_stateful (iconv_t cd, int direction);
int
-_EXFUN(_iconv_nls_get_mb_cur_max, (iconv_t cd, int direction));
+_iconv_nls_get_mb_cur_max (iconv_t cd, int direction);
size_t
-_EXFUN(_iconv_nls_conv, (struct _reent *rptr, iconv_t cd,
+_iconv_nls_conv (struct _reent *rptr, iconv_t cd,
const char **inbuf, size_t *inbytesleft,
- char **outbuf, size_t *outbytesleft));
+ char **outbuf, size_t *outbytesleft);
const char *
-_EXFUN(_iconv_nls_construct_filename, (struct _reent *rptr, const char *file,
- const char *dir, const char *ext));
+_iconv_nls_construct_filename (struct _reent *rptr, const char *file,
+ const char *dir, const char *ext);
int
-_EXFUN(_iconv_nls_open, (struct _reent *rptr, const char *encoding,
- iconv_t *towc, iconv_t *fromwc, int flag));
+_iconv_nls_open (struct _reent *rptr, const char *encoding,
+ iconv_t *towc, iconv_t *fromwc, int flag);
char *
-_EXFUN(_iconv_resolve_encoding_name, (struct _reent *rptr, const char *ca));
+_iconv_resolve_encoding_name (struct _reent *rptr, const char *ca);
#endif /* __SYS_ICONVNLS_H__ */
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index 54fdf96f1..1ef226194 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -165,7 +165,7 @@ struct __sFILE_fake {
/* Following is needed both in libc/stdio and libc/stdlib so we put it
* here instead of libc/stdio/local.h where it was previously. */
-extern void _EXFUN(__sinit,(struct _reent *));
+extern void __sinit (struct _reent *);
# define _REENT_SMALL_CHECK_INIT(ptr) \
do \
@@ -781,7 +781,7 @@ void _reclaim_reent (struct _reent *);
#if defined(__DYNAMIC_REENT__) && !defined(__SINGLE_THREAD__)
#ifndef __getreent
- struct _reent * _EXFUN(__getreent, (void));
+ struct _reent * __getreent (void);
#endif
# define _REENT (__getreent())
#else /* __SINGLE_THREAD__ || !__DYNAMIC_REENT__ */
diff --git a/newlib/libc/include/sys/resource.h b/newlib/libc/include/sys/resource.h
index c35ac2a46..b99506bd8 100644
--- a/newlib/libc/include/sys/resource.h
+++ b/newlib/libc/include/sys/resource.h
@@ -11,7 +11,7 @@ struct rusage {
struct timeval ru_stime; /* system time used */
};
-int _EXFUN(getrusage, (int, struct rusage*));
+int getrusage (int, struct rusage*);
#endif
diff --git a/newlib/libc/include/sys/signal.h b/newlib/libc/include/sys/signal.h
index ab35718ae..ffb7beccb 100644
--- a/newlib/libc/include/sys/signal.h
+++ b/newlib/libc/include/sys/signal.h
@@ -161,36 +161,36 @@ typedef struct sigaltstack {
#define SIG_BLOCK 1 /* set of signals to block */
#define SIG_UNBLOCK 2 /* set of signals to, well, unblock */
-int _EXFUN(sigprocmask, (int how, const sigset_t *set, sigset_t *oset));
+int sigprocmask (int how, const sigset_t *set, sigset_t *oset);
#endif
#if __POSIX_VISIBLE >= 199506
-int _EXFUN(pthread_sigmask, (int how, const sigset_t *set, sigset_t *oset));
+int pthread_sigmask (int how, const sigset_t *set, sigset_t *oset);
#endif
#if defined(__CYGWIN__) || defined(__rtems__)
#ifdef _COMPILING_NEWLIB
-int _EXFUN(_kill, (pid_t, int));
+int _kill (pid_t, int);
#endif /* _COMPILING_NEWLIB */
#endif /* __CYGWIN__ || __rtems__ */
#if __POSIX_VISIBLE
-int _EXFUN(kill, (pid_t, int));
+int kill (pid_t, int);
#endif
#if __BSD_VISIBLE || __XSI_VISIBLE >= 4
-int _EXFUN(killpg, (pid_t, int));
+int killpg (pid_t, int);
#endif
#if __POSIX_VISIBLE
-int _EXFUN(sigaction, (int, const struct sigaction *, struct sigaction *));
-int _EXFUN(sigaddset, (sigset_t *, const int));
-int _EXFUN(sigdelset, (sigset_t *, const int));
-int _EXFUN(sigismember, (const sigset_t *, int));
-int _EXFUN(sigfillset, (sigset_t *));
-int _EXFUN(sigemptyset, (sigset_t *));
-int _EXFUN(sigpending, (sigset_t *));
-int _EXFUN(sigsuspend, (const sigset_t *));
-int _EXFUN(sigwait, (const sigset_t *set, int *sig));
+int sigaction (int, const struct sigaction *, struct sigaction *);
+int sigaddset (sigset_t *, const int);
+int sigdelset (sigset_t *, const int);
+int sigismember (const sigset_t *, int);
+int sigfillset (sigset_t *);
+int sigemptyset (sigset_t *);
+int sigpending (sigset_t *);
+int sigsuspend (const sigset_t *);
+int sigwait (const sigset_t *set, int *sig);
#if !defined(__CYGWIN__) && !defined(__rtems__)
/* These depend upon the type of sigset_t, which right now
@@ -211,21 +211,21 @@ int _EXFUN(sigwait, (const sigset_t *set, int *sig));
value. */
#if __XSI_VISIBLE && !defined(__INSIDE_CYGWIN__)
# ifdef __GNUC__
-int _EXFUN(sigpause, (int)) __asm__ (__ASMNAME ("__xpg_sigpause"));
+int sigpause (int) __asm__ (__ASMNAME ("__xpg_sigpause"));
# else
-int _EXFUN(__xpg_sigpause, (int));
+int __xpg_sigpause (int);
# define sigpause __xpg_sigpause
# endif
#elif __BSD_VISIBLE
-int _EXFUN(sigpause, (int));
+int sigpause (int);
#endif
#if __BSD_VISIBLE || __XSI_VISIBLE >= 4 || __POSIX_VISIBLE >= 200809
-int _EXFUN(sigaltstack, (const stack_t *__restrict, stack_t *__restrict));
+int sigaltstack (const stack_t *__restrict, stack_t *__restrict);
#endif
#if __POSIX_VISIBLE >= 199506
-int _EXFUN(pthread_kill, (pthread_t thread, int sig));
+int pthread_kill (pthread_t thread, int sig);
#endif
#if __POSIX_VISIBLE >= 199309
@@ -233,12 +233,11 @@ int _EXFUN(pthread_kill, (pthread_t thread, int sig));
/* 3.3.8 Synchronously Accept a Signal, P1003.1b-1993, p. 76
NOTE: P1003.1c/D10, p. 39 adds sigwait(). */
-int _EXFUN(sigwaitinfo, (const sigset_t *set, siginfo_t *info));
-int _EXFUN(sigtimedwait,
- (const sigset_t *set, siginfo_t *info, const struct timespec *timeout)
-);
+int sigwaitinfo (const sigset_t *set, siginfo_t *info);
+int sigtimedwait (const sigset_t *set, siginfo_t *info,
+ const struct timespec *timeout);
/* 3.3.9 Queue a Signal to a Process, P1003.1b-1993, p. 78 */
-int _EXFUN(sigqueue, (pid_t pid, int signo, const union sigval value));
+int sigqueue (pid_t pid, int signo, const union sigval value);
#endif /* __POSIX_VISIBLE >= 199309 */
diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
index 94a90c0dd..eee98db64 100644
--- a/newlib/libc/include/sys/stat.h
+++ b/newlib/libc/include/sys/stat.h
@@ -144,41 +144,41 @@ struct stat
#define UTIME_OMIT -1L
#endif
-int _EXFUN(chmod,( const char *__path, mode_t __mode ));
-int _EXFUN(fchmod,(int __fd, mode_t __mode));
-int _EXFUN(fstat,( int __fd, struct stat *__sbuf ));
-int _EXFUN(mkdir,( const char *_path, mode_t __mode ));
-int _EXFUN(mkfifo,( const char *__path, mode_t __mode ));
-int _EXFUN(stat,( const char *__restrict __path, struct stat *__restrict __sbuf ));
-mode_t _EXFUN(umask,( mode_t __mask ));
+int chmod (const char *__path, mode_t __mode );
+int fchmod (int __fd, mode_t __mode);
+int fstat (int __fd, struct stat *__sbuf );
+int mkdir (const char *_path, mode_t __mode );
+int mkfifo (const char *__path, mode_t __mode );
+int stat (const char *__restrict __path, struct stat *__restrict __sbuf );
+mode_t umask (mode_t __mask );
#if defined (__SPU__) || defined(__rtems__) || defined(__CYGWIN__) && !defined(__INSIDE_CYGWIN__)
-int _EXFUN(lstat,( const char *__restrict __path, struct stat *__restrict __buf ));
-int _EXFUN(mknod,( const char *__path, mode_t __mode, dev_t __dev ));
+int lstat (const char *__restrict __path, struct stat *__restrict __buf );
+int mknod (const char *__path, mode_t __mode, dev_t __dev );
#endif
#if __ATFILE_VISIBLE && !defined(__INSIDE_CYGWIN__)
-int _EXFUN(fchmodat, (int, const char *, mode_t, int));
-int _EXFUN(fstatat, (int, const char *__restrict , struct stat *__restrict, int));
-int _EXFUN(mkdirat, (int, const char *, mode_t));
-int _EXFUN(mkfifoat, (int, const char *, mode_t));
-int _EXFUN(mknodat, (int, const char *, mode_t, dev_t));
-int _EXFUN(utimensat, (int, const char *, const struct timespec *, int));
+int fchmodat (int, const char *, mode_t, int);
+int fstatat (int, const char *__restrict , struct stat *__restrict, int);
+int mkdirat (int, const char *, mode_t);
+int mkfifoat (int, const char *, mode_t);
+int mknodat (int, const char *, mode_t, dev_t);
+int utimensat (int, const char *, const struct timespec *, int);
#endif
#if __POSIX_VISIBLE >= 200809 && !defined(__INSIDE_CYGWIN__)
-int _EXFUN(futimens, (int, const struct timespec *));
+int futimens (int, const struct timespec *);
#endif
/* Provide prototypes for most of the _<systemcall> names that are
provided in newlib for some compilers. */
#ifdef _COMPILING_NEWLIB
-int _EXFUN(_fstat,( int __fd, struct stat *__sbuf ));
-int _EXFUN(_stat,( const char *__restrict __path, struct stat *__restrict __sbuf ));
-int _EXFUN(_mkdir,( const char *_path, mode_t __mode ));
+int _fstat (int __fd, struct stat *__sbuf );
+int _stat (const char *__restrict __path, struct stat *__restrict __sbuf );
+int _mkdir (const char *_path, mode_t __mode );
#ifdef __LARGE64_FILES
struct stat64;
-int _EXFUN(_stat64,( const char *__restrict __path, struct stat64 *__restrict __sbuf ));
-int _EXFUN(_fstat64,( int __fd, struct stat64 *__sbuf ));
+int _stat64 (const char *__restrict __path, struct stat64 *__restrict __sbuf );
+int _fstat64 (int __fd, struct stat64 *__sbuf );
#endif
#endif
diff --git a/newlib/libc/include/sys/time.h b/newlib/libc/include/sys/time.h
index 5fdb6673b..ce2e667f7 100644
--- a/newlib/libc/include/sys/time.h
+++ b/newlib/libc/include/sys/time.h
@@ -268,30 +268,30 @@ struct itimerval {
#include <time.h>
__BEGIN_DECLS
-int _EXFUN(utimes, (const char *__path, const struct timeval *__tvp));
+int utimes (const char *__path, const struct timeval *__tvp);
#if __BSD_VISIBLE
-int _EXFUN(adjtime, (const struct timeval *, struct timeval *));
-int _EXFUN(futimes, (int, const struct timeval *));
-int _EXFUN(lutimes, (const char *, const struct timeval *));
-int _EXFUN(settimeofday, (const struct timeval *, const struct timezone *));
+int adjtime (const struct timeval *, struct timeval *);
+int futimes (int, const struct timeval *);
+int lutimes (const char *, const struct timeval *);
+int settimeofday (const struct timeval *, const struct timezone *);
#endif
#if __MISC_VISIBLE || __XSI_VISIBLE
-int _EXFUN(getitimer, (int __which, struct itimerval *__value));
-int _EXFUN(setitimer, (int __which, const struct itimerval *__restrict __value,
- struct itimerval *__restrict __ovalue));
+int getitimer (int __which, struct itimerval *__value);
+int setitimer (int __which, const struct itimerval *__restrict __value,
+ struct itimerval *__restrict __ovalue);
#endif
-int _EXFUN(gettimeofday, (struct timeval *__restrict __p,
- void *__restrict __tz));
+int gettimeofday (struct timeval *__restrict __p,
+ void *__restrict __tz);
#if __GNU_VISIBLE
-int _EXFUN(futimesat, (int, const char *, const struct timeval [2]));
+int futimesat (int, const char *, const struct timeval [2]);
#endif
#ifdef _COMPILING_NEWLIB
-int _EXFUN(_gettimeofday, (struct timeval *__p, void *__tz));
+int _gettimeofday (struct timeval *__p, void *__tz);
#endif
__END_DECLS
diff --git a/newlib/libc/include/sys/times.h b/newlib/libc/include/sys/times.h
index b1f1dc699..05b254714 100644
--- a/newlib/libc/include/sys/times.h
+++ b/newlib/libc/include/sys/times.h
@@ -21,9 +21,9 @@ struct tms {
clock_t tms_cstime; /* system time, children */
};
-clock_t _EXFUN(times,(struct tms *));
+clock_t times (struct tms *);
#ifdef _COMPILING_NEWLIB
-clock_t _EXFUN(_times,(struct tms *));
+clock_t _times (struct tms *);
#endif
#ifdef __cplusplus
diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h
index 05962219a..f216fb95c 100644
--- a/newlib/libc/include/sys/unistd.h
+++ b/newlib/libc/include/sys/unistd.h
@@ -15,234 +15,234 @@ extern "C" {
extern char **environ;
-void _EXFUN(_exit, (int __status ) _ATTRIBUTE ((__noreturn__)));
+void _exit (int __status) _ATTRIBUTE ((__noreturn__));
-int _EXFUN(access,(const char *__path, int __amode ));
-unsigned _EXFUN(alarm, (unsigned __secs ));
-int _EXFUN(chdir, (const char *__path ));
-int _EXFUN(chmod, (const char *__path, mode_t __mode ));
+int access (const char *__path, int __amode);
+unsigned alarm (unsigned __secs);
+int chdir (const char *__path);
+int chmod (const char *__path, mode_t __mode);
#if !defined(__INSIDE_CYGWIN__)
-int _EXFUN(chown, (const char *__path, uid_t __owner, gid_t __group ));
+int chown (const char *__path, uid_t __owner, gid_t __group);
#endif
#if __BSD_VISIBLE || (__XSI_VISIBLE >= 4 && __POSIX_VISIBLE < 200112)
-int _EXFUN(chroot, (const char *__path ));
+int chroot (const char *__path);
#endif
-int _EXFUN(close, (int __fildes ));
+int close (int __fildes);
#if __POSIX_VISIBLE >= 199209
-size_t _EXFUN(confstr, (int __name, char *__buf, size_t __len));
+size_t confstr (int __name, char *__buf, size_t __len);
#endif
#if __XSI_VISIBLE
-char * _EXFUN(crypt, (const char *__key, const char *__salt));
+char * crypt (const char *__key, const char *__salt);
#endif
#if __XSI_VISIBLE && __XSI_VISIBLE < 700
-char * _EXFUN(ctermid, (char *__s ));
+char * ctermid (char *__s);
#endif
#if __XSI_VISIBLE && __XSI_VISIBLE < 600
-char * _EXFUN(cuserid, (char *__s ));
+char * cuserid (char *__s);
#endif
#if __BSD_VISIBLE || (__XSI_VISIBLE && __XSI_VISIBLE < 500)
-int _EXFUN(daemon, (int nochdir, int noclose));
+int daemon (int nochdir, int noclose);
#endif
-int _EXFUN(dup, (int __fildes ));
-int _EXFUN(dup2, (int __fildes, int __fildes2 ));
+int dup (int __fildes);
+int dup2 (int __fildes, int __fildes2);
#if __GNU_VISIBLE
-int _EXFUN(dup3, (int __fildes, int __fildes2, int flags));
-int _EXFUN(eaccess, (const char *__path, int __mode));
+int dup3 (int __fildes, int __fildes2, int flags);
+int eaccess (const char *__path, int __mode);
#endif
#if __XSI_VISIBLE
-void _EXFUN(encrypt, (char *__block, int __edflag));
+void encrypt (char *__block, int __edflag);
#endif
#if __BSD_VISIBLE || (__XSI_VISIBLE && __XSI_VISIBLE < 500)
-void _EXFUN(endusershell, (void));
+void endusershell (void);
#endif
#if __GNU_VISIBLE
-int _EXFUN(euidaccess, (const char *__path, int __mode));
+int euidaccess (const char *__path, int __mode);
#endif
-int _EXFUN(execl, (const char *__path, const char *, ... ));
-int _EXFUN(execle, (const char *__path, const char *, ... ));
-int _EXFUN(execlp, (const char *__file, const char *, ... ));
+int execl (const char *__path, const char *, ...);
+int execle (const char *__path, const char *, ...);
+int execlp (const char *__file, const char *, ...);
#if __MISC_VISIBLE
-int _EXFUN(execlpe, (const char *__file, const char *, ... ));
+int execlpe (const char *__file, const char *, ...);
#endif
-int _EXFUN(execv, (const char *__path, char * const __argv[] ));
-int _EXFUN(execve, (const char *__path, char * const __argv[], char * const __envp[] ));
-int _EXFUN(execvp, (const char *__file, char * const __argv[] ));
+int execv (const char *__path, char * const __argv[]);
+int execve (const char *__path, char * const __argv[], char * const __envp[]);
+int execvp (const char *__file, char * const __argv[]);
#if __GNU_VISIBLE
-int _EXFUN(execvpe, (const char *__file, char * const __argv[], char * const __envp[] ));
+int execvpe (const char *__file, char * const __argv[], char * const __envp[]);
#endif
#if __ATFILE_VISIBLE
-int _EXFUN(faccessat, (int __dirfd, const char *__path, int __mode, int __flags));
+int faccessat (int __dirfd, const char *__path, int __mode, int __flags);
#endif
#if __BSD_VISIBLE || __XSI_VISIBLE >= 4 || __POSIX_VISIBLE >= 200809
-int _EXFUN(fchdir, (int __fildes));
+int fchdir (int __fildes);
#endif
#if __POSIX_VISIBLE >= 199309
-int _EXFUN(fchmod, (int __fildes, mode_t __mode ));
+int fchmod (int __fildes, mode_t __mode);
#endif
#if !defined(__INSIDE_CYGWIN__)
#if __BSD_VISIBLE || __XSI_VISIBLE >= 4 || __POSIX_VISIBLE >= 200809
-int _EXFUN(fchown, (int __fildes, uid_t __owner, gid_t __group ));
+int fchown (int __fildes, uid_t __owner, gid_t __group);
#endif
#endif
#if __ATFILE_VISIBLE
-int _EXFUN(fchownat, (int __dirfd, const char *__path, uid_t __owner, gid_t __group, int __flags));
+int fchownat (int __dirfd, const char *__path, uid_t __owner, gid_t __group, int __flags);
#endif
#if __POSIX_VISIBLE >= 200809
-int _EXFUN(fexecve, (int __fd, char * const __argv[], char * const __envp[] ));
+int fexecve (int __fd, char * const __argv[], char * const __envp[]);
#endif
-pid_t _EXFUN(fork, (void ));
-long _EXFUN(fpathconf, (int __fd, int __name ));
-int _EXFUN(fsync, (int __fd));
+pid_t fork (void);
+long fpathconf (int __fd, int __name);
+int fsync (int __fd);
#if __POSIX_VISIBLE >= 199309
-int _EXFUN(fdatasync, (int __fd));
+int fdatasync (int __fd);
#endif
#if __GNU_VISIBLE
-char * _EXFUN(get_current_dir_name, (void));
+char * get_current_dir_name (void);
#endif
-char * _EXFUN(getcwd, (char *__buf, size_t __size ));
+char * getcwd (char *__buf, size_t __size);
#if __BSD_VISIBLE || (__XSI_VISIBLE && __XSI_VISIBLE < 500)
-int _EXFUN(getdomainname ,(char *__name, size_t __len));
+int getdomainname (char *__name, size_t __len);
#endif
#if __BSD_VISIBLE
-int _EXFUN(getentropy, (void *, size_t));
+int getentropy (void *, size_t);
#endif
#if !defined(__INSIDE_CYGWIN__)
-gid_t _EXFUN(getegid, (void ));
-uid_t _EXFUN(geteuid, (void ));
-gid_t _EXFUN(getgid, (void ));
+gid_t getegid (void);
+uid_t geteuid (void);
+gid_t getgid (void);
#endif
-int _EXFUN(getgroups, (int __gidsetsize, gid_t __grouplist[] ));
+int getgroups (int __gidsetsize, gid_t __grouplist[]);
#if __BSD_VISIBLE || __XSI_VISIBLE >= 4
-long _EXFUN(gethostid, (void));
+long gethostid (void);
#endif
-char * _EXFUN(getlogin, (void ));
+char * getlogin (void);
#if defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-int _EXFUN(getlogin_r, (char *name, size_t namesize) );
+int getlogin_r (char *name, size_t namesize) ;
#endif
#if __BSD_VISIBLE || (__XSI_VISIBLE && __POSIX_VISIBLE < 200112)
-char * _EXFUN(getpass, (const char *__prompt));
-int _EXFUN(getpagesize, (void));
+char * getpass (const char *__prompt);
+int getpagesize (void);
#endif
#if __BSD_VISIBLE
-int _EXFUN(getpeereid, (int, uid_t *, gid_t *));
+int getpeereid (int, uid_t *, gid_t *);
#endif
#if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 4
-pid_t _EXFUN(getpgid, (pid_t));
+pid_t getpgid (pid_t);
#endif
-pid_t _EXFUN(getpgrp, (void ));
-pid_t _EXFUN(getpid, (void ));
-pid_t _EXFUN(getppid, (void ));
+pid_t getpgrp (void);
+pid_t getpid (void);
+pid_t getppid (void);
#if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 4
-pid_t _EXFUN(getsid, (pid_t));
+pid_t getsid (pid_t);
#endif
#if !defined(__INSIDE_CYGWIN__)
-uid_t _EXFUN(getuid, (void ));
+uid_t getuid (void);
#endif
#if __BSD_VISIBLE || (__XSI_VISIBLE && __XSI_VISIBLE < 500)
-char * _EXFUN(getusershell, (void));
+char * getusershell (void);
#endif
#if __BSD_VISIBLE || (__XSI_VISIBLE >= 4 && __POSIX_VISIBLE < 200809)
-char * _EXFUN(getwd, (char *__buf ));
+char * getwd (char *__buf);
#endif
#if __BSD_VISIBLE
-int _EXFUN(iruserok, (unsigned long raddr, int superuser, const char *ruser, const char *luser));
+int iruserok (unsigned long raddr, int superuser, const char *ruser, const char *luser);
#endif
-int _EXFUN(isatty, (int __fildes ));
+int isatty (int __fildes);
#if __BSD_VISIBLE
-int _EXFUN(issetugid, (void));
+int issetugid (void);
#endif
#if !defined(__INSIDE_CYGWIN__)
#if __BSD_VISIBLE || __XSI_VISIBLE >= 4 || __POSIX_VISIBLE >= 200809
-int _EXFUN(lchown, (const char *__path, uid_t __owner, gid_t __group ));
+int lchown (const char *__path, uid_t __owner, gid_t __group);
#endif
#endif
-int _EXFUN(link, (const char *__path1, const char *__path2 ));
+int link (const char *__path1, const char *__path2);
#if __ATFILE_VISIBLE
-int _EXFUN(linkat, (int __dirfd1, const char *__path1, int __dirfd2, const char *__path2, int __flags ));
+int linkat (int __dirfd1, const char *__path1, int __dirfd2, const char *__path2, int __flags);
#endif
#if __MISC_VISIBLE || __XSI_VISIBLE
-int _EXFUN(nice, (int __nice_value ));
+int nice (int __nice_value);
#endif
#if !defined(__INSIDE_CYGWIN__)
-off_t _EXFUN(lseek, (int __fildes, off_t __offset, int __whence ));
+off_t lseek (int __fildes, off_t __offset, int __whence);
#endif
#if __MISC_VISIBLE || __XSI_VISIBLE >= 4
#define F_ULOCK 0
#define F_LOCK 1
#define F_TLOCK 2
#define F_TEST 3
-int _EXFUN(lockf, (int __fd, int __cmd, off_t __len));
+int lockf (int __fd, int __cmd, off_t __len);
#endif
-long _EXFUN(pathconf, (const char *__path, int __name ));
-int _EXFUN(pause, (void ));
+long pathconf (const char *__path, int __name);
+int pause (void);
#if __POSIX_VISIBLE >= 199506
-int _EXFUN(pthread_atfork, (void (*)(void), void (*)(void), void (*)(void)));
+int pthread_atfork (void (*)(void), void (*)(void), void (*)(void));
#endif
-int _EXFUN(pipe, (int __fildes[2] ));
+int pipe (int __fildes[2]);
#if __GNU_VISIBLE
-int _EXFUN(pipe2, (int __fildes[2], int flags));
+int pipe2 (int __fildes[2], int flags);
#endif
#if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 500
-ssize_t _EXFUN(pread, (int __fd, void *__buf, size_t __nbytes, off_t __offset));
-ssize_t _EXFUN(pwrite, (int __fd, const void *__buf, size_t __nbytes, off_t __offset));
+ssize_t pread (int __fd, void *__buf, size_t __nbytes, off_t __offset);
+ssize_t pwrite (int __fd, const void *__buf, size_t __nbytes, off_t __offset);
#endif
-_READ_WRITE_RETURN_TYPE _EXFUN(read, (int __fd, void *__buf, size_t __nbyte ));
+_READ_WRITE_RETURN_TYPE read (int __fd, void *__buf, size_t __nbyte);
#if __BSD_VISIBLE
-int _EXFUN(rresvport, (int *__alport));
-int _EXFUN(revoke, (char *__path));
+int rresvport (int *__alport);
+int revoke (char *__path);
#endif
-int _EXFUN(rmdir, (const char *__path ));
+int rmdir (const char *__path);
#if __BSD_VISIBLE
-int _EXFUN(ruserok, (const char *rhost, int superuser, const char *ruser, const char *luser));
+int ruserok (const char *rhost, int superuser, const char *ruser, const char *luser);
#endif
#if __BSD_VISIBLE || (__XSI_VISIBLE >= 4 && __POSIX_VISIBLE < 200112)
-void * _EXFUN(sbrk, (ptrdiff_t __incr));
+void * sbrk (ptrdiff_t __incr);
#endif
#if !defined(__INSIDE_CYGWIN__)
#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112
-int _EXFUN(setegid, (gid_t __gid ));
-int _EXFUN(seteuid, (uid_t __uid ));
+int setegid (gid_t __gid);
+int seteuid (uid_t __uid);
#endif
-int _EXFUN(setgid, (gid_t __gid ));
+int setgid (gid_t __gid);
#endif
#if __BSD_VISIBLE
-int _EXFUN(setgroups, (int ngroups, const gid_t *grouplist ));
+int setgroups (int ngroups, const gid_t *grouplist);
#endif
#if __BSD_VISIBLE || (__XSI_VISIBLE && __XSI_VISIBLE < 500)
-int _EXFUN(sethostname, (const char *, size_t));
+int sethostname (const char *, size_t);
#endif
-int _EXFUN(setpgid, (pid_t __pid, pid_t __pgid ));
+int setpgid (pid_t __pid, pid_t __pgid);
#if __SVID_VISIBLE || __XSI_VISIBLE >= 500
-int _EXFUN(setpgrp, (void ));
+int setpgrp (void);
#endif
#if (__BSD_VISIBLE || __XSI_VISIBLE >= 4) && !defined(__INSIDE_CYGWIN__)
-int _EXFUN(setregid, (gid_t __rgid, gid_t __egid));
-int _EXFUN(setreuid, (uid_t __ruid, uid_t __euid));
+int setregid (gid_t __rgid, gid_t __egid);
+int setreuid (uid_t __ruid, uid_t __euid);
#endif
-pid_t _EXFUN(setsid, (void ));
+pid_t setsid (void);
#if !defined(__INSIDE_CYGWIN__)
-int _EXFUN(setuid, (uid_t __uid ));
+int setuid (uid_t __uid);
#endif
#if __BSD_VISIBLE || (__XSI_VISIBLE && __XSI_VISIBLE < 500)
-void _EXFUN(setusershell, (void));
+void setusershell (void);
#endif
-unsigned _EXFUN(sleep, (unsigned int __seconds ));
+unsigned sleep (unsigned int __seconds);
#if __XSI_VISIBLE
-void _EXFUN(swab, (const void *__restrict, void *__restrict, ssize_t));
-#endif
-long _EXFUN(sysconf, (int __name ));
-pid_t _EXFUN(tcgetpgrp, (int __fildes ));
-int _EXFUN(tcsetpgrp, (int __fildes, pid_t __pgrp_id ));
-char * _EXFUN(ttyname, (int __fildes ));
-int _EXFUN(ttyname_r, (int, char *, size_t));
-int _EXFUN(unlink, (const char *__path ));
+void swab (const void *__restrict, void *__restrict, ssize_t);
+#endif
+long sysconf (int __name);
+pid_t tcgetpgrp (int __fildes);
+int tcsetpgrp (int __fildes, pid_t __pgrp_id);
+char * ttyname (int __fildes);
+int ttyname_r (int, char *, size_t);
+int unlink (const char *__path);
#if __XSI_VISIBLE >= 500 && __POSIX_VISIBLE < 200809 || __BSD_VISIBLE
-int _EXFUN(usleep, (useconds_t __useconds));
+int usleep (useconds_t __useconds);
#endif
#if __BSD_VISIBLE
-int _EXFUN(vhangup, (void ));
+int vhangup (void);
#endif
-_READ_WRITE_RETURN_TYPE _EXFUN(write, (int __fd, const void *__buf, size_t __nbyte ));
+_READ_WRITE_RETURN_TYPE write (int __fd, const void *__buf, size_t __nbyte);
#ifdef __CYGWIN__
# define __UNISTD_GETOPT__
@@ -256,69 +256,69 @@ extern int optreset; /* getopt(3) external variable */
#endif
#if __BSD_VISIBLE || (__XSI_VISIBLE >= 4 && __POSIX_VISIBLE < 200809)
-pid_t _EXFUN(vfork, (void ));
+pid_t vfork (void);
#endif
#ifdef _COMPILING_NEWLIB
/* Provide prototypes for most of the _<systemcall> names that are
provided in newlib for some compilers. */
-int _EXFUN(_close, (int __fildes ));
-pid_t _EXFUN(_fork, (void ));
-pid_t _EXFUN(_getpid, (void ));
-int _EXFUN(_isatty, (int __fildes ));
-int _EXFUN(_link, (const char *__path1, const char *__path2 ));
-_off_t _EXFUN(_lseek, (int __fildes, _off_t __offset, int __whence ));
+int _close (int __fildes);
+pid_t _fork (void);
+pid_t _getpid (void);
+int _isatty (int __fildes);
+int _link (const char *__path1, const char *__path2);
+_off_t _lseek (int __fildes, _off_t __offset, int __whence);
#ifdef __LARGE64_FILES
-_off64_t _EXFUN(_lseek64, (int __filedes, _off64_t __offset, int __whence ));
+_off64_t _lseek64 (int __filedes, _off64_t __offset, int __whence);
#endif
-_READ_WRITE_RETURN_TYPE _EXFUN(_read, (int __fd, void *__buf, size_t __nbyte ));
-void * _EXFUN(_sbrk, (ptrdiff_t __incr));
-int _EXFUN(_unlink, (const char *__path ));
-_READ_WRITE_RETURN_TYPE _EXFUN(_write, (int __fd, const void *__buf, size_t __nbyte ));
-int _EXFUN(_execve, (const char *__path, char * const __argv[], char * const __envp[] ));
+_READ_WRITE_RETURN_TYPE _read (int __fd, void *__buf, size_t __nbyte);
+void * _sbrk (ptrdiff_t __incr);
+int _unlink (const char *__path);
+_READ_WRITE_RETURN_TYPE _write (int __fd, const void *__buf, size_t __nbyte);
+int _execve (const char *__path, char * const __argv[], char * const __envp[]);
#endif
#if !defined(__INSIDE_CYGWIN__)
#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 500
-int _EXFUN(ftruncate, (int __fd, off_t __length));
+int ftruncate (int __fd, off_t __length);
#endif
#if __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 500
-int _EXFUN(truncate, (const char *, off_t __length));
+int truncate (const char *, off_t __length);
#endif
#endif
#if __BSD_VISIBLE || __POSIX_VISIBLE < 200112
-int _EXFUN(getdtablesize, (void));
+int getdtablesize (void);
#endif
#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200809 || __XSI_VISIBLE >= 500
-useconds_t _EXFUN(ualarm, (useconds_t __useconds, useconds_t __interval));
+useconds_t ualarm (useconds_t __useconds, useconds_t __interval);
#endif
#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 500
#if !(defined (_WINSOCK_H) || defined (_WINSOCKAPI_) || defined (__USE_W32_SOCKETS))
/* winsock[2].h defines as __stdcall, and with int as 2nd arg */
- int _EXFUN(gethostname, (char *__name, size_t __len));
+ int gethostname (char *__name, size_t __len);
#endif
#endif
#if __MISC_VISIBLE
-int _EXFUN(setdtablesize, (int));
+int setdtablesize (int);
#endif
#if __BSD_VISIBLE || __XSI_VISIBLE >= 500
-void _EXFUN(sync, (void));
+void sync (void);
#endif
#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE >= 4
-ssize_t _EXFUN(readlink, (const char *__restrict __path,
- char *__restrict __buf, size_t __buflen));
-int _EXFUN(symlink, (const char *__name1, const char *__name2));
+ssize_t readlink (const char *__restrict __path,
+ char *__restrict __buf, size_t __buflen);
+int symlink (const char *__name1, const char *__name2);
#endif
#if __ATFILE_VISIBLE
-ssize_t _EXFUN(readlinkat, (int __dirfd1, const char *__restrict __path,
- char *__restrict __buf, size_t __buflen));
-int _EXFUN(symlinkat, (const char *, int, const char *));
-int _EXFUN(unlinkat, (int, const char *, int));
+ssize_t readlinkat (int __dirfd1, const char *__restrict __path,
+ char *__restrict __buf, size_t __buflen);
+int symlinkat (const char *, int, const char *);
+int unlinkat (int, const char *, int);
#endif
#define F_OK 0
diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h
index 6f6ff86c8..a2efcc15e 100644
--- a/newlib/libc/include/time.h
+++ b/newlib/libc/include/time.h
@@ -53,19 +53,19 @@ struct tm
#endif
};
-clock_t _EXFUN(clock, (void));
-double _EXFUN(difftime, (time_t _time2, time_t _time1));
-time_t _EXFUN(mktime, (struct tm *_timeptr));
-time_t _EXFUN(time, (time_t *_timer));
+clock_t clock (void);
+double difftime (time_t _time2, time_t _time1);
+time_t mktime (struct tm *_timeptr);
+time_t time (time_t *_timer);
#ifndef _REENT_ONLY
-char *_EXFUN(asctime, (const struct tm *_tblock));
-char *_EXFUN(ctime, (const time_t *_time));
-struct tm *_EXFUN(gmtime, (const time_t *_timer));
-struct tm *_EXFUN(localtime,(const time_t *_timer));
+char *asctime (const struct tm *_tblock);
+char *ctime (const time_t *_time);
+struct tm *gmtime (const time_t *_timer);
+struct tm *localtime (const time_t *_timer);
#endif
-size_t _EXFUN(strftime, (char *__restrict _s,
+size_t strftime (char *__restrict _s,
size_t _maxsize, const char *__restrict _fmt,
- const struct tm *__restrict _t));
+ const struct tm *__restrict _t);
#if __POSIX_VISIBLE >= 200809
extern size_t strftime_l (char *__restrict _s, size_t _maxsize,
@@ -73,13 +73,13 @@ extern size_t strftime_l (char *__restrict _s, size_t _maxsize,
const struct tm *__restrict _t, locale_t _l);
#endif
-char *_EXFUN(asctime_r, (const struct tm *__restrict,
- char *__restrict));
-char *_EXFUN(ctime_r, (const time_t *, char *));
-struct tm *_EXFUN(gmtime_r, (const time_t *__restrict,
- struct tm *__restrict));
-struct tm *_EXFUN(localtime_r, (const time_t *__restrict,
- struct tm *__restrict));
+char *asctime_r (const struct tm *__restrict,
+ char *__restrict);
+char *ctime_r (const time_t *, char *);
+struct tm *gmtime_r (const time_t *__restrict,
+ struct tm *__restrict);
+struct tm *localtime_r (const time_t *__restrict,
+ struct tm *__restrict);
_END_STD_C
@@ -88,9 +88,9 @@ extern "C" {
#endif
#if __XSI_VISIBLE
-char *_EXFUN(strptime, (const char *__restrict,
+char *strptime (const char *__restrict,
const char *__restrict,
- struct tm *__restrict));
+ struct tm *__restrict);
#endif
#if __GNU_VISIBLE
char *strptime_l (const char *__restrict, const char *__restrict,
@@ -98,9 +98,9 @@ char *strptime_l (const char *__restrict, const char *__restrict,
#endif
#if __POSIX_VISIBLE
-void _EXFUN(tzset, (void));
+void tzset (void);
#endif
-void _EXFUN(_tzset_r, (struct _reent *));
+void _tzset_r (struct _reent *);
typedef struct __tzrule_struct
{
@@ -120,7 +120,7 @@ typedef struct __tzinfo_struct
__tzrule_type __tzrule[2];
} __tzinfo_type;
-__tzinfo_type *_EXFUN (__gettzinfo, (void));
+__tzinfo_type *__gettzinfo (void);
/* getdate functions */
@@ -128,9 +128,9 @@ __tzinfo_type *_EXFUN (__gettzinfo, (void));
#if __XSI_VISIBLE >= 4
#ifndef _REENT_ONLY
#define getdate_err (*__getdate_err())
-int *_EXFUN(__getdate_err,(void));
+int *__getdate_err (void);
-struct tm * _EXFUN(getdate, (const char *));
+struct tm * getdate (const char *);
/* getdate_err is set to one of the following values to indicate the error.
1 the DATEMSK environment variable is null or undefined,
2 the template file cannot be opened for reading,
@@ -145,7 +145,7 @@ struct tm * _EXFUN(getdate, (const char *));
#if __GNU_VISIBLE
/* getdate_r returns the error code as above */
-int _EXFUN(getdate_r, (const char *, struct tm *));
+int getdate_r (const char *, struct tm *);
#endif /* __GNU_VISIBLE */
#endif /* HAVE_GETDATE */
@@ -183,33 +183,31 @@ extern "C" {
/* Clocks, P1003.1b-1993, p. 263 */
-int _EXFUN(clock_settime, (clockid_t clock_id, const struct timespec *tp));
-int _EXFUN(clock_gettime, (clockid_t clock_id, struct timespec *tp));
-int _EXFUN(clock_getres, (clockid_t clock_id, struct timespec *res));
+int clock_settime (clockid_t clock_id, const struct timespec *tp);
+int clock_gettime (clockid_t clock_id, struct timespec *tp);
+int clock_getres (clockid_t clock_id, struct timespec *res);
/* Create a Per-Process Timer, P1003.1b-1993, p. 264 */
-int _EXFUN(timer_create,
- (clockid_t clock_id,
+int timer_create (clockid_t clock_id,
struct sigevent *__restrict evp,
- timer_t *__restrict timerid));
+ timer_t *__restrict timerid);
/* Delete a Per_process Timer, P1003.1b-1993, p. 266 */
-int _EXFUN(timer_delete, (timer_t timerid));
+int timer_delete (timer_t timerid);
/* Per-Process Timers, P1003.1b-1993, p. 267 */
-int _EXFUN(timer_settime,
- (timer_t timerid, int flags,
+int timer_settime (timer_t timerid, int flags,
const struct itimerspec *__restrict value,
- struct itimerspec *__restrict ovalue));
-int _EXFUN(timer_gettime, (timer_t timerid, struct itimerspec *value));
-int _EXFUN(timer_getoverrun, (timer_t timerid));
+ struct itimerspec *__restrict ovalue);
+int timer_gettime (timer_t timerid, struct itimerspec *value);
+int timer_getoverrun (timer_t timerid);
/* High Resolution Sleep, P1003.1b-1993, p. 269 */
-int _EXFUN(nanosleep, (const struct timespec *rqtp, struct timespec *rmtp));
+int nanosleep (const struct timespec *rqtp, struct timespec *rmtp);
#ifdef __cplusplus
}
@@ -222,9 +220,8 @@ int _EXFUN(nanosleep, (const struct timespec *rqtp, struct timespec *rmtp));
extern "C" {
#endif
-int _EXFUN(clock_nanosleep,
- (clockid_t clock_id, int flags, const struct timespec *rqtp,
- struct timespec *rmtp));
+int clock_nanosleep (clockid_t clock_id, int flags,
+ const struct timespec *rqtp, struct timespec *rmtp);
#ifdef __cplusplus
}
@@ -297,7 +294,7 @@ extern "C" {
/* Accessing a Process CPU-time CLock, P1003.4b/D8, p. 55 */
-int _EXFUN(clock_getcpuclockid, (pid_t pid, clockid_t *clock_id));
+int clock_getcpuclockid (pid_t pid, clockid_t *clock_id);
#endif /* _POSIX_CPUTIME */
@@ -305,8 +302,8 @@ int _EXFUN(clock_getcpuclockid, (pid_t pid, clockid_t *clock_id));
/* CPU-time Clock Attribute Access, P1003.4b/D8, p. 56 */
-int _EXFUN(clock_setenable_attr, (clockid_t clock_id, int attr));
-int _EXFUN(clock_getenable_attr, (clockid_t clock_id, int *attr));
+int clock_setenable_attr (clockid_t clock_id, int attr);
+int clock_getenable_attr (clockid_t clock_id, int *attr);
#endif /* _POSIX_CPUTIME or _POSIX_THREAD_CPUTIME */
diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
index dccc10627..c84834277 100644
--- a/newlib/libc/include/wchar.h
+++ b/newlib/libc/include/wchar.h
@@ -86,90 +86,90 @@ struct tm;
typedef _mbstate_t mbstate_t;
#endif /* _MBSTATE_T */
-wint_t _EXFUN(btowc, (int));
-int _EXFUN(wctob, (wint_t));
-size_t _EXFUN(mbrlen, (const char *__restrict, size_t, mbstate_t *__restrict));
-size_t _EXFUN(mbrtowc, (wchar_t *__restrict, const char *__restrict, size_t,
- mbstate_t *__restrict));
-size_t _EXFUN(_mbrtowc_r, (struct _reent *, wchar_t * , const char * ,
- size_t, mbstate_t *));
-int _EXFUN(mbsinit, (const mbstate_t *));
+wint_t btowc (int);
+int wctob (wint_t);
+size_t mbrlen (const char *__restrict, size_t, mbstate_t *__restrict);
+size_t mbrtowc (wchar_t *__restrict, const char *__restrict, size_t,
+ mbstate_t *__restrict);
+size_t _mbrtowc_r (struct _reent *, wchar_t * , const char * ,
+ size_t, mbstate_t *);
+int mbsinit (const mbstate_t *);
#if __POSIX_VISIBLE >= 200809
-size_t _EXFUN(mbsnrtowcs, (wchar_t *__restrict, const char **__restrict,
- size_t, size_t, mbstate_t *__restrict));
-#endif
-size_t _EXFUN(_mbsnrtowcs_r, (struct _reent *, wchar_t * , const char ** ,
- size_t, size_t, mbstate_t *));
-size_t _EXFUN(mbsrtowcs, (wchar_t *__restrict, const char **__restrict, size_t,
- mbstate_t *__restrict));
-size_t _EXFUN(_mbsrtowcs_r, (struct _reent *, wchar_t * , const char ** , size_t, mbstate_t *));
-size_t _EXFUN(wcrtomb, (char *__restrict, wchar_t, mbstate_t *__restrict));
-size_t _EXFUN(_wcrtomb_r, (struct _reent *, char * , wchar_t, mbstate_t *));
+size_t mbsnrtowcs (wchar_t *__restrict, const char **__restrict,
+ size_t, size_t, mbstate_t *__restrict);
+#endif
+size_t _mbsnrtowcs_r (struct _reent *, wchar_t * , const char ** ,
+ size_t, size_t, mbstate_t *);
+size_t mbsrtowcs (wchar_t *__restrict, const char **__restrict, size_t,
+ mbstate_t *__restrict);
+size_t _mbsrtowcs_r (struct _reent *, wchar_t * , const char ** , size_t, mbstate_t *);
+size_t wcrtomb (char *__restrict, wchar_t, mbstate_t *__restrict);
+size_t _wcrtomb_r (struct _reent *, char * , wchar_t, mbstate_t *);
#if __POSIX_VISIBLE >= 200809
-size_t _EXFUN(wcsnrtombs, (char *__restrict, const wchar_t **__restrict,
- size_t, size_t, mbstate_t *__restrict));
-#endif
-size_t _EXFUN(_wcsnrtombs_r, (struct _reent *, char * , const wchar_t ** ,
- size_t, size_t, mbstate_t *));
-size_t _EXFUN(wcsrtombs, (char *__restrict, const wchar_t **__restrict,
- size_t, mbstate_t *__restrict));
-size_t _EXFUN(_wcsrtombs_r, (struct _reent *, char * , const wchar_t ** ,
- size_t, mbstate_t *));
+size_t wcsnrtombs (char *__restrict, const wchar_t **__restrict,
+ size_t, size_t, mbstate_t *__restrict);
+#endif
+size_t _wcsnrtombs_r (struct _reent *, char * , const wchar_t ** ,
+ size_t, size_t, mbstate_t *);
+size_t wcsrtombs (char *__restrict, const wchar_t **__restrict,
+ size_t, mbstate_t *__restrict);
+size_t _wcsrtombs_r (struct _reent *, char * , const wchar_t ** ,
+ size_t, mbstate_t *);
#if __POSIX_VISIBLE >= 200809
-int _EXFUN(wcscasecmp, (const wchar_t *, const wchar_t *));
+int wcscasecmp (const wchar_t *, const wchar_t *);
#endif
-wchar_t *_EXFUN(wcscat, (wchar_t *__restrict, const wchar_t *__restrict));
-wchar_t *_EXFUN(wcschr, (const wchar_t *, wchar_t));
-int _EXFUN(wcscmp, (const wchar_t *, const wchar_t *));
-int _EXFUN(wcscoll, (const wchar_t *, const wchar_t *));
-wchar_t *_EXFUN(wcscpy, (wchar_t *__restrict, const wchar_t *__restrict));
+wchar_t *wcscat (wchar_t *__restrict, const wchar_t *__restrict);
+wchar_t *wcschr (const wchar_t *, wchar_t);
+int wcscmp (const wchar_t *, const wchar_t *);
+int wcscoll (const wchar_t *, const wchar_t *);
+wchar_t *wcscpy (wchar_t *__restrict, const wchar_t *__restrict);
#if __POSIX_VISIBLE >= 200809
-wchar_t *_EXFUN(wcpcpy, (wchar_t *__restrict,
- const wchar_t *__restrict));
-wchar_t *_EXFUN(wcsdup, (const wchar_t *));
-#endif
-wchar_t *_EXFUN(_wcsdup_r, (struct _reent *, const wchar_t * ));
-size_t _EXFUN(wcscspn, (const wchar_t *, const wchar_t *));
-size_t _EXFUN(wcsftime, (wchar_t *__restrict, size_t,
- const wchar_t *__restrict, const struct tm *__restrict));
+wchar_t *wcpcpy (wchar_t *__restrict,
+ const wchar_t *__restrict);
+wchar_t *wcsdup (const wchar_t *);
+#endif
+wchar_t *_wcsdup_r (struct _reent *, const wchar_t * );
+size_t wcscspn (const wchar_t *, const wchar_t *);
+size_t wcsftime (wchar_t *__restrict, size_t,
+ const wchar_t *__restrict, const struct tm *__restrict);
#if __GNU_VISIBLE
size_t wcsftime_l (wchar_t *__restrict, size_t, const wchar_t *__restrict,
const struct tm *__restrict, locale_t);
#endif
-size_t _EXFUN(wcslcat, (wchar_t *, const wchar_t *, size_t));
-size_t _EXFUN(wcslcpy, (wchar_t *, const wchar_t *, size_t));
-size_t _EXFUN(wcslen, (const wchar_t *));
+size_t wcslcat (wchar_t *, const wchar_t *, size_t);
+size_t wcslcpy (wchar_t *, const wchar_t *, size_t);
+size_t wcslen (const wchar_t *);
#if __POSIX_VISIBLE >= 200809
-int _EXFUN(wcsncasecmp, (const wchar_t *, const wchar_t *, size_t));
+int wcsncasecmp (const wchar_t *, const wchar_t *, size_t);
#endif
-wchar_t *_EXFUN(wcsncat, (wchar_t *__restrict,
- const wchar_t *__restrict, size_t));
-int _EXFUN(wcsncmp, (const wchar_t *, const wchar_t *, size_t));
-wchar_t *_EXFUN(wcsncpy, (wchar_t *__restrict,
- const wchar_t *__restrict, size_t));
+wchar_t *wcsncat (wchar_t *__restrict,
+ const wchar_t *__restrict, size_t);
+int wcsncmp (const wchar_t *, const wchar_t *, size_t);
+wchar_t *wcsncpy (wchar_t *__restrict,
+ const wchar_t *__restrict, size_t);
#if __POSIX_VISIBLE >= 200809
-wchar_t *_EXFUN(wcpncpy, (wchar_t *__restrict,
- const wchar_t *__restrict, size_t));
-size_t _EXFUN(wcsnlen, (const wchar_t *, size_t));
-#endif
-wchar_t *_EXFUN(wcspbrk, (const wchar_t *, const wchar_t *));
-wchar_t *_EXFUN(wcsrchr, (const wchar_t *, wchar_t));
-size_t _EXFUN(wcsspn, (const wchar_t *, const wchar_t *));
-wchar_t *_EXFUN(wcsstr, (const wchar_t *__restrict,
- const wchar_t *__restrict));
-wchar_t *_EXFUN(wcstok, (wchar_t *__restrict, const wchar_t *__restrict,
- wchar_t **__restrict));
-double _EXFUN(wcstod, (const wchar_t *__restrict, wchar_t **__restrict));
-double _EXFUN(_wcstod_r, (struct _reent *, const wchar_t *, wchar_t **));
+wchar_t *wcpncpy (wchar_t *__restrict,
+ const wchar_t *__restrict, size_t);
+size_t wcsnlen (const wchar_t *, size_t);
+#endif
+wchar_t *wcspbrk (const wchar_t *, const wchar_t *);
+wchar_t *wcsrchr (const wchar_t *, wchar_t);
+size_t wcsspn (const wchar_t *, const wchar_t *);
+wchar_t *wcsstr (const wchar_t *__restrict,
+ const wchar_t *__restrict);
+wchar_t *wcstok (wchar_t *__restrict, const wchar_t *__restrict,
+ wchar_t **__restrict);
+double wcstod (const wchar_t *__restrict, wchar_t **__restrict);
+double _wcstod_r (struct _reent *, const wchar_t *, wchar_t **);
#if __ISO_C_VISIBLE >= 1999
-float _EXFUN(wcstof, (const wchar_t *__restrict, wchar_t **__restrict));
+float wcstof (const wchar_t *__restrict, wchar_t **__restrict);
#endif
-float _EXFUN(_wcstof_r, (struct _reent *, const wchar_t *, wchar_t **));
+float _wcstof_r (struct _reent *, const wchar_t *, wchar_t **);
#if __XSI_VISIBLE
-int _EXFUN(wcswidth, (const wchar_t *, size_t));
+int wcswidth (const wchar_t *, size_t);
#endif
-size_t _EXFUN(wcsxfrm, (wchar_t *__restrict, const wchar_t *__restrict,
- size_t));
+size_t wcsxfrm (wchar_t *__restrict, const wchar_t *__restrict,
+ size_t);
#if __POSIX_VISIBLE >= 200809
extern int wcscasecmp_l (const wchar_t *, const wchar_t *, locale_t);
extern int wcsncasecmp_l (const wchar_t *, const wchar_t *, size_t, locale_t);
@@ -179,36 +179,36 @@ extern size_t wcsxfrm_l (wchar_t *__restrict, const wchar_t *__restrict, size_t,
#endif
#if __XSI_VISIBLE
-int _EXFUN(wcwidth, (const wchar_t));
+int wcwidth (const wchar_t);
#endif
-wchar_t *_EXFUN(wmemchr, (const wchar_t *, wchar_t, size_t));
-int _EXFUN(wmemcmp, (const wchar_t *, const wchar_t *, size_t));
-wchar_t *_EXFUN(wmemcpy, (wchar_t *__restrict, const wchar_t *__restrict,
- size_t));
-wchar_t *_EXFUN(wmemmove, (wchar_t *, const wchar_t *, size_t));
+wchar_t *wmemchr (const wchar_t *, wchar_t, size_t);
+int wmemcmp (const wchar_t *, const wchar_t *, size_t);
+wchar_t *wmemcpy (wchar_t *__restrict, const wchar_t *__restrict,
+ size_t);
+wchar_t *wmemmove (wchar_t *, const wchar_t *, size_t);
#if __GNU_VISIBLE
-wchar_t *_EXFUN(wmempcpy, (wchar_t *__restrict, const wchar_t *__restrict,
- size_t));
+wchar_t *wmempcpy (wchar_t *__restrict, const wchar_t *__restrict,
+ size_t);
#endif
-wchar_t *_EXFUN(wmemset, (wchar_t *, wchar_t, size_t));
+wchar_t *wmemset (wchar_t *, wchar_t, size_t);
-long _EXFUN(wcstol, (const wchar_t *__restrict, wchar_t **__restrict, int));
+long wcstol (const wchar_t *__restrict, wchar_t **__restrict, int);
#if __ISO_C_VISIBLE >= 1999
-long long _EXFUN(wcstoll, (const wchar_t *__restrict, wchar_t **__restrict,
- int));
+long long wcstoll (const wchar_t *__restrict, wchar_t **__restrict,
+ int);
#endif
-unsigned long _EXFUN(wcstoul, (const wchar_t *__restrict, wchar_t **__restrict,
- int));
+unsigned long wcstoul (const wchar_t *__restrict, wchar_t **__restrict,
+ int);
#if __ISO_C_VISIBLE >= 1999
-unsigned long long _EXFUN(wcstoull, (const wchar_t *__restrict,
- wchar_t **__restrict, int));
+unsigned long long wcstoull (const wchar_t *__restrict,
+ wchar_t **__restrict, int);
#endif
-long _EXFUN(_wcstol_r, (struct _reent *, const wchar_t *, wchar_t **, int));
-long long _EXFUN(_wcstoll_r, (struct _reent *, const wchar_t *, wchar_t **, int));
-unsigned long _EXFUN(_wcstoul_r, (struct _reent *, const wchar_t *, wchar_t **, int));
-unsigned long long _EXFUN(_wcstoull_r, (struct _reent *, const wchar_t *, wchar_t **, int));
+long _wcstol_r (struct _reent *, const wchar_t *, wchar_t **, int);
+long long _wcstoll_r (struct _reent *, const wchar_t *, wchar_t **, int);
+unsigned long _wcstoul_r (struct _reent *, const wchar_t *, wchar_t **, int);
+unsigned long long _wcstoull_r (struct _reent *, const wchar_t *, wchar_t **, int);
#if __ISO_C_VISIBLE >= 1999
-long double _EXFUN(wcstold, (const wchar_t *, wchar_t **));
+long double wcstold (const wchar_t *, wchar_t **);
#endif
#if __GNU_VISIBLE
@@ -224,53 +224,53 @@ float wcstof_l (const wchar_t *, wchar_t **, locale_t);
long double wcstold_l (const wchar_t *, wchar_t **, locale_t);
#endif
-wint_t _EXFUN(fgetwc, (__FILE *));
-wchar_t *_EXFUN(fgetws, (wchar_t *__restrict, int, __FILE *__restrict));
-wint_t _EXFUN(fputwc, (wchar_t, __FILE *));
-int _EXFUN(fputws, (const wchar_t *__restrict, __FILE *__restrict));
+wint_t fgetwc (__FILE *);
+wchar_t *fgetws (wchar_t *__restrict, int, __FILE *__restrict);
+wint_t fputwc (wchar_t, __FILE *);
+int fputws (const wchar_t *__restrict, __FILE *__restrict);
#if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500
-int _EXFUN (fwide, (__FILE *, int));
-#endif
-wint_t _EXFUN (getwc, (__FILE *));
-wint_t _EXFUN (getwchar, (void));
-wint_t _EXFUN(putwc, (wchar_t, __FILE *));
-wint_t _EXFUN(putwchar, (wchar_t));
-wint_t _EXFUN (ungetwc, (wint_t wc, __FILE *));
-
-wint_t _EXFUN(_fgetwc_r, (struct _reent *, __FILE *));
-wint_t _EXFUN(_fgetwc_unlocked_r, (struct _reent *, __FILE *));
-wchar_t *_EXFUN(_fgetws_r, (struct _reent *, wchar_t *, int, __FILE *));
-wchar_t *_EXFUN(_fgetws_unlocked_r, (struct _reent *, wchar_t *, int, __FILE *));
-wint_t _EXFUN(_fputwc_r, (struct _reent *, wchar_t, __FILE *));
-wint_t _EXFUN(_fputwc_unlocked_r, (struct _reent *, wchar_t, __FILE *));
-int _EXFUN(_fputws_r, (struct _reent *, const wchar_t *, __FILE *));
-int _EXFUN(_fputws_unlocked_r, (struct _reent *, const wchar_t *, __FILE *));
-int _EXFUN (_fwide_r, (struct _reent *, __FILE *, int));
-wint_t _EXFUN (_getwc_r, (struct _reent *, __FILE *));
-wint_t _EXFUN (_getwc_unlocked_r, (struct _reent *, __FILE *));
-wint_t _EXFUN (_getwchar_r, (struct _reent *ptr));
-wint_t _EXFUN (_getwchar_unlocked_r, (struct _reent *ptr));
-wint_t _EXFUN(_putwc_r, (struct _reent *, wchar_t, __FILE *));
-wint_t _EXFUN(_putwc_unlocked_r, (struct _reent *, wchar_t, __FILE *));
-wint_t _EXFUN(_putwchar_r, (struct _reent *, wchar_t));
-wint_t _EXFUN(_putwchar_unlocked_r, (struct _reent *, wchar_t));
-wint_t _EXFUN (_ungetwc_r, (struct _reent *, wint_t wc, __FILE *));
+int fwide (__FILE *, int);
+#endif
+wint_t getwc (__FILE *);
+wint_t getwchar (void);
+wint_t putwc (wchar_t, __FILE *);
+wint_t putwchar (wchar_t);
+wint_t ungetwc (wint_t wc, __FILE *);
+
+wint_t _fgetwc_r (struct _reent *, __FILE *);
+wint_t _fgetwc_unlocked_r (struct _reent *, __FILE *);
+wchar_t *_fgetws_r (struct _reent *, wchar_t *, int, __FILE *);
+wchar_t *_fgetws_unlocked_r (struct _reent *, wchar_t *, int, __FILE *);
+wint_t _fputwc_r (struct _reent *, wchar_t, __FILE *);
+wint_t _fputwc_unlocked_r (struct _reent *, wchar_t, __FILE *);
+int _fputws_r (struct _reent *, const wchar_t *, __FILE *);
+int _fputws_unlocked_r (struct _reent *, const wchar_t *, __FILE *);
+int _fwide_r (struct _reent *, __FILE *, int);
+wint_t _getwc_r (struct _reent *, __FILE *);
+wint_t _getwc_unlocked_r (struct _reent *, __FILE *);
+wint_t _getwchar_r (struct _reent *ptr);
+wint_t _getwchar_unlocked_r (struct _reent *ptr);
+wint_t _putwc_r (struct _reent *, wchar_t, __FILE *);
+wint_t _putwc_unlocked_r (struct _reent *, wchar_t, __FILE *);
+wint_t _putwchar_r (struct _reent *, wchar_t);
+wint_t _putwchar_unlocked_r (struct _reent *, wchar_t);
+wint_t _ungetwc_r (struct _reent *, wint_t wc, __FILE *);
#if __GNU_VISIBLE
-wint_t _EXFUN(fgetwc_unlocked, (__FILE *));
-wchar_t *_EXFUN(fgetws_unlocked, (wchar_t *__restrict, int, __FILE *__restrict));
-wint_t _EXFUN(fputwc_unlocked, (wchar_t, __FILE *));
-int _EXFUN(fputws_unlocked, (const wchar_t *__restrict, __FILE *__restrict));
-wint_t _EXFUN(getwc_unlocked, (__FILE *));
-wint_t _EXFUN(getwchar_unlocked, (void));
-wint_t _EXFUN(putwc_unlocked, (wchar_t, __FILE *));
-wint_t _EXFUN(putwchar_unlocked, (wchar_t));
+wint_t fgetwc_unlocked (__FILE *);
+wchar_t *fgetws_unlocked (wchar_t *__restrict, int, __FILE *__restrict);
+wint_t fputwc_unlocked (wchar_t, __FILE *);
+int fputws_unlocked (const wchar_t *__restrict, __FILE *__restrict);
+wint_t getwc_unlocked (__FILE *);
+wint_t getwchar_unlocked (void);
+wint_t putwc_unlocked (wchar_t, __FILE *);
+wint_t putwchar_unlocked (wchar_t);
#endif
#if __POSIX_VISIBLE >= 200809
-__FILE *_EXFUN (open_wmemstream, (wchar_t **, size_t *));
+__FILE *open_wmemstream (wchar_t **, size_t *);
#endif
-__FILE *_EXFUN (_open_wmemstream_r, (struct _reent *, wchar_t **, size_t *));
+__FILE *_open_wmemstream_r (struct _reent *, wchar_t **, size_t *);
#ifndef __VALIST
#ifdef __GNUC__
@@ -281,42 +281,42 @@ __FILE *_EXFUN (_open_wmemstream_r, (struct _reent *, wchar_t **, size_t *));
#endif
#if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500
-int _EXFUN(fwprintf, (__FILE *__restrict, const wchar_t *__restrict, ...));
-int _EXFUN(swprintf, (wchar_t *__restrict, size_t,
- const wchar_t *__restrict, ...));
-int _EXFUN(vfwprintf, (__FILE *__restrict, const wchar_t *__restrict,
- __VALIST));
-int _EXFUN(vswprintf, (wchar_t *__restrict, size_t,
- const wchar_t *__restrict, __VALIST));
-int _EXFUN(vwprintf, (const wchar_t *__restrict, __VALIST));
-int _EXFUN(wprintf, (const wchar_t *__restrict, ...));
-#endif
-
-int _EXFUN(_fwprintf_r, (struct _reent *, __FILE *, const wchar_t *, ...));
-int _EXFUN(_swprintf_r, (struct _reent *, wchar_t *, size_t, const wchar_t *, ...));
-int _EXFUN(_vfwprintf_r, (struct _reent *, __FILE *, const wchar_t *, __VALIST));
-int _EXFUN(_vswprintf_r, (struct _reent *, wchar_t *, size_t, const wchar_t *, __VALIST));
-int _EXFUN(_vwprintf_r, (struct _reent *, const wchar_t *, __VALIST));
-int _EXFUN(_wprintf_r, (struct _reent *, const wchar_t *, ...));
+int fwprintf (__FILE *__restrict, const wchar_t *__restrict, ...);
+int swprintf (wchar_t *__restrict, size_t,
+ const wchar_t *__restrict, ...);
+int vfwprintf (__FILE *__restrict, const wchar_t *__restrict,
+ __VALIST);
+int vswprintf (wchar_t *__restrict, size_t,
+ const wchar_t *__restrict, __VALIST);
+int vwprintf (const wchar_t *__restrict, __VALIST);
+int wprintf (const wchar_t *__restrict, ...);
+#endif
+
+int _fwprintf_r (struct _reent *, __FILE *, const wchar_t *, ...);
+int _swprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, ...);
+int _vfwprintf_r (struct _reent *, __FILE *, const wchar_t *, __VALIST);
+int _vswprintf_r (struct _reent *, wchar_t *, size_t, const wchar_t *, __VALIST);
+int _vwprintf_r (struct _reent *, const wchar_t *, __VALIST);
+int _wprintf_r (struct _reent *, const wchar_t *, ...);
#if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500
-int _EXFUN(fwscanf, (__FILE *__restrict, const wchar_t *__restrict, ...));
-int _EXFUN(swscanf, (const wchar_t *__restrict,
- const wchar_t *__restrict, ...));
-int _EXFUN(vfwscanf, (__FILE *__restrict, const wchar_t *__restrict,
- __VALIST));
-int _EXFUN(vswscanf, (const wchar_t *__restrict, const wchar_t *__restrict,
- __VALIST));
-int _EXFUN(vwscanf, (const wchar_t *__restrict, __VALIST));
-int _EXFUN(wscanf, (const wchar_t *__restrict, ...));
-#endif
-
-int _EXFUN(_fwscanf_r, (struct _reent *, __FILE *, const wchar_t *, ...));
-int _EXFUN(_swscanf_r, (struct _reent *, const wchar_t *, const wchar_t *, ...));
-int _EXFUN(_vfwscanf_r, (struct _reent *, __FILE *, const wchar_t *, __VALIST));
-int _EXFUN(_vswscanf_r, (struct _reent *, const wchar_t *, const wchar_t *, __VALIST));
-int _EXFUN(_vwscanf_r, (struct _reent *, const wchar_t *, __VALIST));
-int _EXFUN(_wscanf_r, (struct _reent *, const wchar_t *, ...));
+int fwscanf (__FILE *__restrict, const wchar_t *__restrict, ...);
+int swscanf (const wchar_t *__restrict,
+ const wchar_t *__restrict, ...);
+int vfwscanf (__FILE *__restrict, const wchar_t *__restrict,
+ __VALIST);
+int vswscanf (const wchar_t *__restrict, const wchar_t *__restrict,
+ __VALIST);
+int vwscanf (const wchar_t *__restrict, __VALIST);
+int wscanf (const wchar_t *__restrict, ...);
+#endif
+
+int _fwscanf_r (struct _reent *, __FILE *, const wchar_t *, ...);
+int _swscanf_r (struct _reent *, const wchar_t *, const wchar_t *, ...);
+int _vfwscanf_r (struct _reent *, __FILE *, const wchar_t *, __VALIST);
+int _vswscanf_r (struct _reent *, const wchar_t *, const wchar_t *, __VALIST);
+int _vwscanf_r (struct _reent *, const wchar_t *, __VALIST);
+int _wscanf_r (struct _reent *, const wchar_t *, ...);
#define getwc(fp) fgetwc(fp)
#define putwc(wc,fp) fputwc((wc), (fp))
diff --git a/newlib/libc/include/wctype.h b/newlib/libc/include/wctype.h
index 3d36d5a92..9b710900d 100644
--- a/newlib/libc/include/wctype.h
+++ b/newlib/libc/include/wctype.h
@@ -27,26 +27,26 @@ typedef int wctype_t;
typedef int wctrans_t;
#endif
-int _EXFUN(iswalpha, (wint_t));
-int _EXFUN(iswalnum, (wint_t));
+int iswalpha (wint_t);
+int iswalnum (wint_t);
#if __ISO_C_VISIBLE >= 1999
-int _EXFUN(iswblank, (wint_t));
+int iswblank (wint_t);
#endif
-int _EXFUN(iswcntrl, (wint_t));
-int _EXFUN(iswctype, (wint_t, wctype_t));
-int _EXFUN(iswdigit, (wint_t));
-int _EXFUN(iswgraph, (wint_t));
-int _EXFUN(iswlower, (wint_t));
-int _EXFUN(iswprint, (wint_t));
-int _EXFUN(iswpunct, (wint_t));
-int _EXFUN(iswspace, (wint_t));
-int _EXFUN(iswupper, (wint_t));
-int _EXFUN(iswxdigit, (wint_t));
-wint_t _EXFUN(towctrans, (wint_t, wctrans_t));
-wint_t _EXFUN(towupper, (wint_t));
-wint_t _EXFUN(towlower, (wint_t));
-wctrans_t _EXFUN(wctrans, (const char *));
-wctype_t _EXFUN(wctype, (const char *));
+int iswcntrl (wint_t);
+int iswctype (wint_t, wctype_t);
+int iswdigit (wint_t);
+int iswgraph (wint_t);
+int iswlower (wint_t);
+int iswprint (wint_t);
+int iswpunct (wint_t);
+int iswspace (wint_t);
+int iswupper (wint_t);
+int iswxdigit (wint_t);
+wint_t towctrans (wint_t, wctrans_t);
+wint_t towupper (wint_t);
+wint_t towlower (wint_t);
+wctrans_t wctrans (const char *);
+wctype_t wctype (const char *);
#if __POSIX_VISIBLE >= 200809
extern int iswalpha_l (wint_t, locale_t);
diff --git a/newlib/libc/machine/powerpc/machine/malloc.h b/newlib/libc/machine/powerpc/machine/malloc.h
index 394ad4e4e..32fbb268b 100644
--- a/newlib/libc/machine/powerpc/machine/malloc.h
+++ b/newlib/libc/machine/powerpc/machine/malloc.h
@@ -3,14 +3,14 @@
# if defined(__ALTIVEC__)
-void *_EXFUN(vec_calloc,(size_t __nmemb, size_t __size));
-void *_EXFUN(_vec_calloc_r,(struct _reent *, size_t __nmemb, size_t __size));
-void _EXFUN(vec_free,(void *));
+void *vec_calloc (size_t __nmemb, size_t __size);
+void *_vec_calloc_r (struct _reent *, size_t __nmemb, size_t __size);
+void vec_free (void *);
#define _vec_freer _freer
-void *_EXFUN(vec_malloc,(size_t __size));
+void *vec_malloc (size_t __size);
#define _vec_mallocr _memalign_r
-void *_EXFUN(vec_realloc,(void *__r, size_t __size));
-void *_EXFUN(_vec_realloc_r,(struct _reent *, void *__r, size_t __size));
+void *vec_realloc (void *__r, size_t __size);
+void *_vec_realloc_r (struct _reent *, void *__r, size_t __size);
# endif /* __ALTIVEC__ */
diff --git a/newlib/libc/machine/powerpc/machine/stdlib.h b/newlib/libc/machine/powerpc/machine/stdlib.h
index ea597102b..2db801092 100644
--- a/newlib/libc/machine/powerpc/machine/stdlib.h
+++ b/newlib/libc/machine/powerpc/machine/stdlib.h
@@ -5,14 +5,14 @@
# if defined(__ALTIVEC__)
-void *_EXFUN(vec_calloc,(size_t __nmemb, size_t __size));
-void *_EXFUN(_vec_calloc_r,(struct _reent *, size_t __nmemb, size_t __size));
-void _EXFUN(vec_free,(void *));
+void *vec_calloc (size_t __nmemb, size_t __size);
+void *_vec_calloc_r (struct _reent *, size_t __nmemb, size_t __size);
+void vec_free (void *);
#define _vec_freer _freer
-void *_EXFUN(vec_malloc,(size_t __size));
+void *vec_malloc (size_t __size);
#define _vec_mallocr _memalign_r
-void *_EXFUN(vec_realloc,(void *__r, size_t __size));
-void *_EXFUN(_vec_realloc_r,(struct _reent *, void *__r, size_t __size));
+void *vec_realloc (void *__r, size_t __size);
+void *_vec_realloc_r (struct _reent *, void *__r, size_t __size);
# endif /* __ALTIVEC__ */
@@ -24,39 +24,39 @@ void *_EXFUN(_vec_realloc_r,(struct _reent *, void *__r, size_t __size));
#ifdef __cplusplus
extern "C" {
#endif
-__int16_t _EXFUN(atosfix16,(const char *__str));
-__int16_t _EXFUN(_atosfix16_r,(struct _reent *, const char *__str));
-__int32_t _EXFUN(atosfix32,(const char *__str));
-__int32_t _EXFUN(_atosfix32_r,(struct _reent *, const char *__str));
-__int64_t _EXFUN(atosfix64,(const char *__str));
-__int64_t _EXFUN(_atosfix64_r,(struct _reent *, const char *__str));
-
-__uint16_t _EXFUN(atoufix16,(const char *__str));
-__uint16_t _EXFUN(_atoufix16_r,(struct _reent *, const char *__str));
-__uint32_t _EXFUN(atoufix32,(const char *__str));
-__uint32_t _EXFUN(_atoufix32_r,(struct _reent *, const char *__str));
-__uint64_t _EXFUN(atoufix64,(const char *__str));
-__uint64_t _EXFUN(_atoufix64_r,(struct _reent *, const char *__str));
-
-__int16_t _EXFUN(strtosfix16,(const char *__str, char **__endptr));
-__int16_t _EXFUN(_strtosfix16_r,(struct _reent *, const char *__str,
- char **__endptr));
-__int32_t _EXFUN(strtosfix32,(const char *__str, char **__endptr));
-__int32_t _EXFUN(_strtosfix32_r,(struct _reent *, const char *__str,
- char **__endptr));
-__int64_t _EXFUN(strtosfix64,(const char *__str, char **__endptr));
-__int64_t _EXFUN(_strtosfix64_r,(struct _reent *, const char *__str,
- char **__endptr));
-
-__uint16_t _EXFUN(strtoufix16,(const char *__str, char **__endptr));
-__uint16_t _EXFUN(_strtoufix16_r,(struct _reent *, const char *__str,
- char **__endptr));
-__uint32_t _EXFUN(strtoufix32,(const char *__str, char **__endptr));
-__uint32_t _EXFUN(_strtoufix32_r,(struct _reent *, const char *__str,
- char **__endptr));
-__uint64_t _EXFUN(strtoufix64,(const char *__str, char **__endptr));
-__uint64_t _EXFUN(_strtoufix64_r,(struct _reent *, const char *__str,
- char **__endptr));
+__int16_t atosfix16 (const char *__str);
+__int16_t _atosfix16_r (struct _reent *, const char *__str);
+__int32_t atosfix32 (const char *__str);
+__int32_t _atosfix32_r (struct _reent *, const char *__str);
+__int64_t atosfix64 (const char *__str);
+__int64_t _atosfix64_r (struct _reent *, const char *__str);
+
+__uint16_t atoufix16 (const char *__str);
+__uint16_t _atoufix16_r (struct _reent *, const char *__str);
+__uint32_t atoufix32 (const char *__str);
+__uint32_t _atoufix32_r (struct _reent *, const char *__str);
+__uint64_t atoufix64 (const char *__str);
+__uint64_t _atoufix64_r (struct _reent *, const char *__str);
+
+__int16_t strtosfix16 (const char *__str, char **__endptr);
+__int16_t _strtosfix16_r (struct _reent *, const char *__str,
+ char **__endptr);
+__int32_t strtosfix32 (const char *__str, char **__endptr);
+__int32_t _strtosfix32_r (struct _reent *, const char *__str,
+ char **__endptr);
+__int64_t strtosfix64 (const char *__str, char **__endptr);
+__int64_t _strtosfix64_r (struct _reent *, const char *__str,
+ char **__endptr);
+
+__uint16_t strtoufix16 (const char *__str, char **__endptr);
+__uint16_t _strtoufix16_r (struct _reent *, const char *__str,
+ char **__endptr);
+__uint32_t strtoufix32 (const char *__str, char **__endptr);
+__uint32_t _strtoufix32_r (struct _reent *, const char *__str,
+ char **__endptr);
+__uint64_t strtoufix64 (const char *__str, char **__endptr);
+__uint64_t _strtoufix64_r (struct _reent *, const char *__str,
+ char **__endptr);
#ifdef __cplusplus
}
#endif
diff --git a/newlib/libc/machine/spu/c99ppe.h b/newlib/libc/machine/spu/c99ppe.h
index b0ccf2dc0..ccd2d257c 100644
--- a/newlib/libc/machine/spu/c99ppe.h
+++ b/newlib/libc/machine/spu/c99ppe.h
@@ -99,8 +99,8 @@ struct spe_reg128{
unsigned int slot[4];
};
-void _EXFUN(__sinit,(struct _reent *));
-FILE *_EXFUN(__sfp,(struct _reent *));
+void __sinit (struct _reent *);
+FILE *__sfp (struct _reent *);
#define __sfp_free(fp) ( (fp)->_fp = 0 )
#define CHECK_INIT(ptr) \
diff --git a/newlib/libc/misc/__dprintf.c b/newlib/libc/misc/__dprintf.c
index 592d714c2..31454f4c2 100644
--- a/newlib/libc/misc/__dprintf.c
+++ b/newlib/libc/misc/__dprintf.c
@@ -20,10 +20,10 @@
static char *parse_number ();
#endif
-static long _EXFUN(get_number, (char *, long, int));
-static void _EXFUN(print_number, (int, int, long));
-static void _EXFUN(write_char, (char c));
-static void _EXFUN(write_string, (const char *s));
+static long get_number (char *, long, int);
+static void print_number (int, int, long);
+static void write_char (char c);
+static void write_string (const char *s);
/* Non-zero for big-endian systems. */
static int big_endian_p;
diff --git a/newlib/libc/stdio/asnprintf.c b/newlib/libc/stdio/asnprintf.c
index 34639dc09..f657f9ec9 100644
--- a/newlib/libc/stdio/asnprintf.c
+++ b/newlib/libc/stdio/asnprintf.c
@@ -59,8 +59,8 @@ _asnprintf_r (struct _reent *__restrict ptr,
#ifdef _NANO_FORMATTED_IO
char *
-_EXFUN(_asniprintf_r, (struct _reent *, char *, size_t *, const char *, ...)
- _ATTRIBUTE ((__alias__("_asnprintf_r"))));
+_asniprintf_r (struct _reent *, char *, size_t *, const char *, ...)
+ _ATTRIBUTE ((__alias__("_asnprintf_r")));
#endif
#ifndef _REENT_ONLY
@@ -111,7 +111,7 @@ asnprintf (char *__restrict buf,
#ifdef _NANO_FORMATTED_IO
char *
-_EXFUN(asniprintf, (char *, size_t *, const char *, ...)
- _ATTRIBUTE ((__alias__("asnprintf"))));
+asniprintf (char *, size_t *, const char *, ...)
+ _ATTRIBUTE ((__alias__("asnprintf")));
#endif
#endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/asprintf.c b/newlib/libc/stdio/asprintf.c
index 330491ebe..25696c575 100644
--- a/newlib/libc/stdio/asprintf.c
+++ b/newlib/libc/stdio/asprintf.c
@@ -51,8 +51,8 @@ _asprintf_r (struct _reent *ptr,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...)
- _ATTRIBUTE ((__alias__("_asprintf_r"))));
+_asiprintf_r (struct _reent *, char **, const char *, ...)
+ _ATTRIBUTE ((__alias__("_asprintf_r")));
#endif
#ifndef _REENT_ONLY
@@ -83,7 +83,7 @@ asprintf (char **__restrict strp,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(asiprintf, (char **, const char *, ...)
- _ATTRIBUTE ((__alias__("asprintf"))));
+asiprintf (char **, const char *, ...)
+ _ATTRIBUTE ((__alias__("asprintf")));
#endif
#endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/dprintf.c b/newlib/libc/stdio/dprintf.c
index 1493e1f18..ae9f86d18 100644
--- a/newlib/libc/stdio/dprintf.c
+++ b/newlib/libc/stdio/dprintf.c
@@ -68,8 +68,8 @@ _dprintf_r (struct _reent *ptr,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_diprintf_r, (struct _reent *, int, const char *, ...)
- _ATTRIBUTE ((__alias__("_dprintf_r"))));
+_diprintf_r (struct _reent *, int, const char *, ...)
+ _ATTRIBUTE ((__alias__("_dprintf_r")));
#endif
#ifndef _REENT_ONLY
@@ -91,7 +91,7 @@ dprintf (int fd,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(diprintf, (int, const char *, ...)
- _ATTRIBUTE ((__alias__("dprintf"))));
+diprintf (int, const char *, ...)
+ _ATTRIBUTE ((__alias__("dprintf")));
#endif
#endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/fprintf.c b/newlib/libc/stdio/fprintf.c
index 4c03b1a02..efb97ad20 100644
--- a/newlib/libc/stdio/fprintf.c
+++ b/newlib/libc/stdio/fprintf.c
@@ -37,8 +37,8 @@ _fprintf_r (struct _reent *ptr,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_fiprintf_r, (struct _reent *, FILE *, const char *, ...)
- _ATTRIBUTE ((__alias__("_fprintf_r"))));
+_fiprintf_r (struct _reent *, FILE *, const char *, ...)
+ _ATTRIBUTE ((__alias__("_fprintf_r")));
#endif
#ifndef _REENT_ONLY
@@ -58,7 +58,7 @@ fprintf (FILE *__restrict fp,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(fiprintf, (FILE *, const char *, ...)
- _ATTRIBUTE ((__alias__("fprintf"))));
+fiprintf (FILE *, const char *, ...)
+ _ATTRIBUTE ((__alias__("fprintf")));
#endif
#endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/fscanf.c b/newlib/libc/stdio/fscanf.c
index 40705a5e7..94096a22b 100644
--- a/newlib/libc/stdio/fscanf.c
+++ b/newlib/libc/stdio/fscanf.c
@@ -52,8 +52,8 @@ fscanf(FILE *fp, fmt, va_alist)
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(fiscanf, (FILE *, const char *, ...)
- _ATTRIBUTE ((__alias__("fscanf"))));
+fiscanf (FILE *, const char *, ...)
+ _ATTRIBUTE ((__alias__("fscanf")));
#endif
#endif /* !_REENT_ONLY */
@@ -84,6 +84,6 @@ _fscanf_r(ptr, FILE *fp, fmt, va_alist)
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_fiscanf_r, (struct _reent *, FILE *, const char *, ...)
- _ATTRIBUTE ((__alias__("_fscanf_r"))));
+_fiscanf_r (struct _reent *, FILE *, const char *, ...)
+ _ATTRIBUTE ((__alias__("_fscanf_r")));
#endif
diff --git a/newlib/libc/stdio/fvwrite.h b/newlib/libc/stdio/fvwrite.h
index 91cabc890..139d83737 100644
--- a/newlib/libc/stdio/fvwrite.h
+++ b/newlib/libc/stdio/fvwrite.h
@@ -32,5 +32,5 @@ struct __suio {
};
-extern int _EXFUN(__sfvwrite_r,(struct _reent *, FILE *, struct __suio *));
-extern int _EXFUN(__swsetup_r,(struct _reent *, FILE *));
+extern int __sfvwrite_r (struct _reent *, FILE *, struct __suio *);
+extern int __swsetup_r (struct _reent *, FILE *);
diff --git a/newlib/libc/stdio/getline.c b/newlib/libc/stdio/getline.c
index 857e980ad..1c59afd2a 100644
--- a/newlib/libc/stdio/getline.c
+++ b/newlib/libc/stdio/getline.c
@@ -34,7 +34,7 @@ No supporting OS subroutines are directly required.
#include <_ansi.h>
#include <stdio.h>
-extern ssize_t _EXFUN(__getdelim, (char **, size_t *, int, FILE *));
+extern ssize_t __getdelim (char **, size_t *, int, FILE *);
ssize_t
__getline (char **lptr,
diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h
index 68a36e054..5f56792de 100644
--- a/newlib/libc/stdio/local.h
+++ b/newlib/libc/stdio/local.h
@@ -140,59 +140,59 @@
#endif /* __SINGLE_THREAD__ || __IMPL_UNLOCKED__ */
-extern wint_t _EXFUN(__fgetwc, (struct _reent *, FILE *));
-extern wint_t _EXFUN(__fputwc, (struct _reent *, wchar_t, FILE *));
-extern u_char *_EXFUN(__sccl, (char *, u_char *fmt));
-extern int _EXFUN(__svfscanf_r,(struct _reent *,FILE *, const char *,va_list));
-extern int _EXFUN(__ssvfscanf_r,(struct _reent *,FILE *, const char *,va_list));
-extern int _EXFUN(__svfiscanf_r,(struct _reent *,FILE *, const char *,va_list));
-extern int _EXFUN(__ssvfiscanf_r,(struct _reent *,FILE *, const char *,va_list));
-extern int _EXFUN(__svfwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
-extern int _EXFUN(__ssvfwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
-extern int _EXFUN(__svfiwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
-extern int _EXFUN(__ssvfiwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
-int _EXFUN(_svfprintf_r,(struct _reent *, FILE *, const char *,
+extern wint_t __fgetwc (struct _reent *, FILE *);
+extern wint_t __fputwc (struct _reent *, wchar_t, FILE *);
+extern u_char *__sccl (char *, u_char *fmt);
+extern int __svfscanf_r (struct _reent *,FILE *, const char *,va_list);
+extern int __ssvfscanf_r (struct _reent *,FILE *, const char *,va_list);
+extern int __svfiscanf_r (struct _reent *,FILE *, const char *,va_list);
+extern int __ssvfiscanf_r (struct _reent *,FILE *, const char *,va_list);
+extern int __svfwscanf_r (struct _reent *,FILE *, const wchar_t *,va_list);
+extern int __ssvfwscanf_r (struct _reent *,FILE *, const wchar_t *,va_list);
+extern int __svfiwscanf_r (struct _reent *,FILE *, const wchar_t *,va_list);
+extern int __ssvfiwscanf_r (struct _reent *,FILE *, const wchar_t *,va_list);
+int _svfprintf_r (struct _reent *, FILE *, const char *,
va_list)
- _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int _EXFUN(_svfiprintf_r,(struct _reent *, FILE *, const char *,
+ _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int _svfiprintf_r (struct _reent *, FILE *, const char *,
va_list)
- _ATTRIBUTE ((__format__ (__printf__, 3, 0))));
-int _EXFUN(_svfwprintf_r,(struct _reent *, FILE *, const wchar_t *,
- va_list));
-int _EXFUN(_svfiwprintf_r,(struct _reent *, FILE *, const wchar_t *,
- va_list));
-extern FILE *_EXFUN(__sfp,(struct _reent *));
-extern int _EXFUN(__sflags,(struct _reent *,const char*, int*));
-extern int _EXFUN(__sflush_r,(struct _reent *,FILE *));
+ _ATTRIBUTE ((__format__ (__printf__, 3, 0)));
+int _svfwprintf_r (struct _reent *, FILE *, const wchar_t *,
+ va_list);
+int _svfiwprintf_r (struct _reent *, FILE *, const wchar_t *,
+ va_list);
+extern FILE *__sfp (struct _reent *);
+extern int __sflags (struct _reent *,const char*, int*);
+extern int __sflush_r (struct _reent *,FILE *);
#ifdef _STDIO_BSD_SEMANTICS
-extern int _EXFUN(__sflushw_r,(struct _reent *,FILE *));
+extern int __sflushw_r (struct _reent *,FILE *);
#endif
-extern int _EXFUN(__srefill_r,(struct _reent *,FILE *));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__sread,(struct _reent *, void *, char *,
- _READ_WRITE_BUFSIZE_TYPE));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__seofread,(struct _reent *, void *,
+extern int __srefill_r (struct _reent *,FILE *);
+extern _READ_WRITE_RETURN_TYPE __sread (struct _reent *, void *, char *,
+ _READ_WRITE_BUFSIZE_TYPE);
+extern _READ_WRITE_RETURN_TYPE __seofread (struct _reent *, void *,
char *,
- _READ_WRITE_BUFSIZE_TYPE));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite,(struct _reent *, void *,
+ _READ_WRITE_BUFSIZE_TYPE);
+extern _READ_WRITE_RETURN_TYPE __swrite (struct _reent *, void *,
const char *,
- _READ_WRITE_BUFSIZE_TYPE));
-extern _fpos_t _EXFUN(__sseek,(struct _reent *, void *, _fpos_t, int));
-extern int _EXFUN(__sclose,(struct _reent *, void *));
-extern int _EXFUN(__stextmode,(int));
-extern void _EXFUN(__sinit,(struct _reent *));
-extern void _EXFUN(_cleanup_r,(struct _reent *));
-extern void _EXFUN(__smakebuf_r,(struct _reent *, FILE *));
-extern int _EXFUN(__swhatbuf_r,(struct _reent *, FILE *, size_t *, int *));
-extern int _EXFUN(_fwalk,(struct _reent *, int (*)(FILE *)));
-extern int _EXFUN(_fwalk_reent,(struct _reent *, int (*)(struct _reent *, FILE *)));
-struct _glue * _EXFUN(__sfmoreglue,(struct _reent *,int n));
-extern int _EXFUN(__submore, (struct _reent *, FILE *));
+ _READ_WRITE_BUFSIZE_TYPE);
+extern _fpos_t __sseek (struct _reent *, void *, _fpos_t, int);
+extern int __sclose (struct _reent *, void *);
+extern int __stextmode (int);
+extern void __sinit (struct _reent *);
+extern void _cleanup_r (struct _reent *);
+extern void __smakebuf_r (struct _reent *, FILE *);
+extern int __swhatbuf_r (struct _reent *, FILE *, size_t *, int *);
+extern int _fwalk (struct _reent *, int (*)(FILE *));
+extern int _fwalk_reent (struct _reent *, int (*)(struct _reent *, FILE *));
+struct _glue * __sfmoreglue (struct _reent *,int n);
+extern int __submore (struct _reent *, FILE *);
#ifdef __LARGE64_FILES
-extern _fpos64_t _EXFUN(__sseek64,(struct _reent *, void *, _fpos64_t, int));
-extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite64,(struct _reent *, void *,
+extern _fpos64_t __sseek64 (struct _reent *, void *, _fpos64_t, int);
+extern _READ_WRITE_RETURN_TYPE __swrite64 (struct _reent *, void *,
const char *,
- _READ_WRITE_BUFSIZE_TYPE));
+ _READ_WRITE_BUFSIZE_TYPE);
#endif
/* Called by the main entry point fns to ensure stdio has been initialized. */
@@ -279,12 +279,12 @@ extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite64,(struct _reent *, void *,
/* WARNING: _dcvt is defined in the stdlib directory, not here! */
-char *_EXFUN(_dcvt,(struct _reent *, char *, double, int, int, char, int));
-char *_EXFUN(_sicvt,(char *, short, char));
-char *_EXFUN(_icvt,(char *, int, char));
-char *_EXFUN(_licvt,(char *, long, char));
+char *_dcvt (struct _reent *, char *, double, int, int, char, int);
+char *_sicvt (char *, short, char);
+char *_icvt (char *, int, char);
+char *_licvt (char *, long, char);
#ifdef __GNUC__
-char *_EXFUN(_llicvt,(char *, long long, char));
+char *_llicvt (char *, long long, char);
#endif
#define CVT_BUF_SIZE 128
@@ -297,10 +297,10 @@ char *_EXFUN(_llicvt,(char *, long long, char));
#define __sinit_lock_acquire()
#define __sinit_lock_release()
#else
-void _EXFUN(__sfp_lock_acquire,(void));
-void _EXFUN(__sfp_lock_release,(void));
-void _EXFUN(__sinit_lock_acquire,(void));
-void _EXFUN(__sinit_lock_release,(void));
+void __sfp_lock_acquire (void);
+void __sfp_lock_release (void);
+void __sinit_lock_acquire (void);
+void __sinit_lock_release (void);
#endif
/* Types used in positional argument support in vfprinf/vfwprintf.
diff --git a/newlib/libc/stdio/nano-vfprintf.c b/newlib/libc/stdio/nano-vfprintf.c
index 623afb732..908fd8e32 100644
--- a/newlib/libc/stdio/nano-vfprintf.c
+++ b/newlib/libc/stdio/nano-vfprintf.c
@@ -433,7 +433,7 @@ __sfputs_r (struct _reent *ptr,
}
#endif /* STRING_ONLY. */
-int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, const char *, va_list));
+int _VFPRINTF_R (struct _reent *, FILE *, const char *, va_list);
#ifndef STRING_ONLY
int
@@ -447,8 +447,8 @@ VFPRINTF (FILE * fp,
}
int
-_EXFUN(vfiprintf, (FILE *, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("vfprintf"))));
+vfiprintf (FILE *, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("vfprintf")));
#endif
#ifdef STRING_ONLY
@@ -649,10 +649,10 @@ error:
#ifdef STRING_ONLY
int
-_EXFUN(_svfiprintf_r, (struct _reent *, FILE *, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("_svfprintf_r"))));
+_svfiprintf_r (struct _reent *, FILE *, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("_svfprintf_r")));
#else
int
-_EXFUN(_vfiprintf_r, (struct _reent *, FILE *, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("_vfprintf_r"))));
+_vfiprintf_r (struct _reent *, FILE *, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("_vfprintf_r")));
#endif
diff --git a/newlib/libc/stdio/nano-vfscanf.c b/newlib/libc/stdio/nano-vfscanf.c
index fe4845264..8caf3dfee 100644
--- a/newlib/libc/stdio/nano-vfscanf.c
+++ b/newlib/libc/stdio/nano-vfscanf.c
@@ -144,8 +144,8 @@ VFSCANF (register FILE *fp,
}
int
-_EXFUN(vfiscanf, (FILE *, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("vfscanf"))));
+vfiscanf (FILE *, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("vfscanf")));
int
__SVFSCANF (register FILE *fp,
@@ -168,8 +168,8 @@ _VFSCANF_R (struct _reent *data,
}
int
-_EXFUN(_vfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("_vfscanf_r"))));
+_vfiscanf_r (struct _reent *, FILE *, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("_vfscanf_r")));
#endif /* !STRING_ONLY. */
#if defined (STRING_ONLY)
@@ -248,9 +248,9 @@ __ssrefill_r (struct _reent * ptr,
}
#else
-int _EXFUN (_sungetc_r, (struct _reent *, int, register FILE *));
-int _EXFUN (__ssrefill_r, (struct _reent *, register FILE *));
-size_t _EXFUN (_sfread_r, (struct _reent *, void *buf, size_t, size_t, FILE *));
+int _sungetc_r (struct _reent *, int, register FILE *);
+int __ssrefill_r (struct _reent *, register FILE *);
+size_t _sfread_r (struct _reent *, void *buf, size_t, size_t, FILE *);
#endif /* !STRING_ONLY. */
int
@@ -448,11 +448,11 @@ all_done:
#ifdef STRING_ONLY
int
-_EXFUN(__ssvfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("__ssvfscanf_r"))));
+__ssvfiscanf_r (struct _reent *, FILE *, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("__ssvfscanf_r")));
#else
int
-_EXFUN(__svfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("__svfscanf_r"))));
+__svfiscanf_r (struct _reent *, FILE *, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("__svfscanf_r")));
#endif
diff --git a/newlib/libc/stdio/printf.c b/newlib/libc/stdio/printf.c
index a323f5ad0..a9ba6118e 100644
--- a/newlib/libc/stdio/printf.c
+++ b/newlib/libc/stdio/printf.c
@@ -38,8 +38,8 @@ _printf_r (struct _reent *ptr,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_iprintf_r, (struct _reent *, const char *, ...)
- _ATTRIBUTE ((__alias__("_printf_r"))));
+_iprintf_r (struct _reent *, const char *, ...)
+ _ATTRIBUTE ((__alias__("_printf_r")));
#endif
#ifndef _REENT_ONLY
@@ -60,7 +60,7 @@ printf (const char *__restrict fmt, ...)
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(iprintf, (const char *, ...)
- _ATTRIBUTE ((__alias__("printf"))));
+iprintf (const char *, ...)
+ _ATTRIBUTE ((__alias__("printf")));
#endif
#endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/scanf.c b/newlib/libc/stdio/scanf.c
index 87cbeb7b8..a5a9391c0 100644
--- a/newlib/libc/stdio/scanf.c
+++ b/newlib/libc/stdio/scanf.c
@@ -53,8 +53,8 @@ scanf(fmt, va_alist)
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(iscanf, (const char *, ...)
- _ATTRIBUTE ((__alias__("scanf"))));
+iscanf (const char *, ...)
+ _ATTRIBUTE ((__alias__("scanf")));
#endif
#endif /* !_REENT_ONLY */
@@ -85,6 +85,6 @@ _scanf_r(ptr, fmt, va_alist)
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_iscanf_r, (struct _reent *, const char *, ...)
- _ATTRIBUTE ((__alias__("_scanf_r"))));
+_iscanf_r (struct _reent *, const char *, ...)
+ _ATTRIBUTE ((__alias__("_scanf_r")));
#endif
diff --git a/newlib/libc/stdio/snprintf.c b/newlib/libc/stdio/snprintf.c
index d5ba7085c..d73cdbf3a 100644
--- a/newlib/libc/stdio/snprintf.c
+++ b/newlib/libc/stdio/snprintf.c
@@ -73,8 +73,8 @@ _snprintf_r(ptr, str, size, fmt, va_alist)
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_sniprintf_r, (struct _reent *, char *, size_t, const char *, ...)
- _ATTRIBUTE ((__alias__("_snprintf_r"))));
+_sniprintf_r (struct _reent *, char *, size_t, const char *, ...)
+ _ATTRIBUTE ((__alias__("_snprintf_r")));
#endif
#ifndef _REENT_ONLY
@@ -122,7 +122,7 @@ snprintf(str, size, fmt, va_alist)
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(sniprintf, (char *, size_t, const char *, ...)
- _ATTRIBUTE ((__alias__("snprintf"))));
+sniprintf (char *, size_t, const char *, ...)
+ _ATTRIBUTE ((__alias__("snprintf")));
#endif
#endif
diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index bbb9753b9..37d92f93e 100644
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -612,8 +612,8 @@ _sprintf_r(ptr, str, fmt, va_alist)
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_siprintf_r, (struct _reent *, char *, const char *, ...)
- _ATTRIBUTE ((__alias__("_sprintf_r"))));
+_siprintf_r (struct _reent *, char *, const char *, ...)
+ _ATTRIBUTE ((__alias__("_sprintf_r")));
#endif
#ifndef _REENT_ONLY
@@ -650,7 +650,7 @@ sprintf(str, fmt, va_alist)
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(siprintf, (char *, const char *, ...)
- _ATTRIBUTE ((__alias__("sprintf"))));
+siprintf (char *, const char *, ...)
+ _ATTRIBUTE ((__alias__("sprintf")));
#endif
#endif
diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index a04f9b65c..971db439d 100644
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -459,8 +459,8 @@ sscanf(str, fmt, va_alist)
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(siscanf, (const char *, const char *, ...)
- _ATTRIBUTE ((__alias__("sscanf"))));
+siscanf (const char *, const char *, ...)
+ _ATTRIBUTE ((__alias__("sscanf")));
#endif
#endif /* !_REENT_ONLY */
@@ -502,6 +502,6 @@ _sscanf_r(ptr, str, fmt, va_alist)
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_siscanf_r, (struct _reent *, const char *, const char *, ...)
- _ATTRIBUTE ((__alias__("_sscanf_r"))));
+_siscanf_r (struct _reent *, const char *, const char *, ...)
+ _ATTRIBUTE ((__alias__("_sscanf_r")));
#endif
diff --git a/newlib/libc/stdio/vasnprintf.c b/newlib/libc/stdio/vasnprintf.c
index 5bc0ec634..1fbf5a171 100644
--- a/newlib/libc/stdio/vasnprintf.c
+++ b/newlib/libc/stdio/vasnprintf.c
@@ -57,9 +57,9 @@ _vasnprintf_r (struct _reent *ptr,
#ifdef _NANO_FORMATTED_IO
char *
-_EXFUN(_vasniprintf_r, (struct _reent*, char *, size_t *,
+_vasniprintf_r (struct _reent*, char *, size_t *,
const char *, __VALIST)
- _ATTRIBUTE ((__alias__("_vasnprintf_r"))));
+ _ATTRIBUTE ((__alias__("_vasnprintf_r")));
#endif
#ifndef _REENT_ONLY
@@ -75,7 +75,7 @@ vasnprintf (char *buf,
#ifdef _NANO_FORMATTED_IO
char *
-_EXFUN(vasniprintf, (char *, size_t *, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("vasnprintf"))));
+vasniprintf (char *, size_t *, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("vasnprintf")));
#endif
#endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/vasprintf.c b/newlib/libc/stdio/vasprintf.c
index 4acbc0479..8fe635462 100644
--- a/newlib/libc/stdio/vasprintf.c
+++ b/newlib/libc/stdio/vasprintf.c
@@ -40,8 +40,8 @@ vasprintf (char **strp,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(vasiprintf, (char **, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("vasprintf"))));
+vasiprintf (char **, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("vasprintf")));
#endif
#endif /* !_REENT_ONLY */
@@ -70,6 +70,6 @@ _vasprintf_r (struct _reent *ptr,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_vasiprintf_r, (struct _reent *, char **, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("_vasprintf_r"))));
+_vasiprintf_r (struct _reent *, char **, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("_vasprintf_r")));
#endif
diff --git a/newlib/libc/stdio/vdprintf.c b/newlib/libc/stdio/vdprintf.c
index 6261f6217..d22463e49 100644
--- a/newlib/libc/stdio/vdprintf.c
+++ b/newlib/libc/stdio/vdprintf.c
@@ -34,8 +34,8 @@ _vdprintf_r (struct _reent *ptr,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_vdiprintf_r, (struct _reent *, int, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("_vdprintf_r"))));
+_vdiprintf_r (struct _reent *, int, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("_vdprintf_r")));
#endif
#ifndef _REENT_ONLY
@@ -50,7 +50,7 @@ vdprintf (int fd,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(vdiprintf, (int, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("vdprintf"))));
+vdiprintf (int, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("vdprintf")));
#endif
#endif /* ! _REENT_ONLY */
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index c2e59fc4a..e04358967 100644
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -517,7 +517,7 @@ extern char *_dtoa_r (struct _reent *, double, int,
extern char *_ldtoa_r (struct _reent *, _LONG_DOUBLE, int,
int, int *, int *, char **);
-extern int _EXFUN(_ldcheck,(_LONG_DOUBLE *));
+extern int _ldcheck (_LONG_DOUBLE *);
# define _PRINTF_FLOAT_TYPE _LONG_DOUBLE
# define _DTOA_R _ldtoa_r
@@ -600,9 +600,9 @@ union arg_val
};
static union arg_val *
-_EXFUN(get_arg, (struct _reent *data, int n, char *fmt,
+get_arg (struct _reent *data, int n, char *fmt,
va_list *ap, int *numargs, union arg_val *args,
- int *arg_type, char **last_fmt));
+ int *arg_type, char **last_fmt);
#endif /* !_NO_POS_ARGS */
/*
@@ -639,7 +639,7 @@ _EXFUN(get_arg, (struct _reent *data, int n, char *fmt,
# define GROUPING 0x400 /* use grouping ("'" flag) */
#endif
-int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, const char *, va_list));
+int _VFPRINTF_R (struct _reent *, FILE *, const char *, va_list);
#ifndef STRING_ONLY
int
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index 097fd801c..b97235559 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -378,9 +378,9 @@ _sfread_r (struct _reent * ptr,
return count;
}
#else /* !STRING_ONLY || !INTEGER_ONLY */
-int _EXFUN (_sungetc_r, (struct _reent *, int, register FILE *));
-int _EXFUN (__ssrefill_r, (struct _reent *, register FILE *));
-size_t _EXFUN (_sfread_r, (struct _reent *, void *buf, size_t, size_t, FILE *));
+int _sungetc_r (struct _reent *, int, register FILE *);
+int __ssrefill_r (struct _reent *, register FILE *);
+size_t _sfread_r (struct _reent *, void *buf, size_t, size_t, FILE *);
#endif /* !STRING_ONLY || !INTEGER_ONLY */
static inline int
diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
index dd78eb015..980b31e3b 100644
--- a/newlib/libc/stdio/vfwprintf.c
+++ b/newlib/libc/stdio/vfwprintf.c
@@ -149,7 +149,7 @@ SEEALSO
# undef _NO_LONGLONG
#endif
-int _EXFUN(_VFWPRINTF_R, (struct _reent *, FILE *, const wchar_t *, va_list));
+int _VFWPRINTF_R (struct _reent *, FILE *, const wchar_t *, va_list);
/* Defined in vfprintf.c. */
#ifdef _FVWRITE_IN_STREAMIO
# ifdef STRING_ONLY
@@ -157,14 +157,14 @@ int _EXFUN(_VFWPRINTF_R, (struct _reent *, FILE *, const wchar_t *, va_list));
# else
# define __SPRINT __sprint_r
# endif
-int _EXFUN(__SPRINT, (struct _reent *, FILE *, register struct __suio *));
+int __SPRINT (struct _reent *, FILE *, register struct __suio *);
#else
# ifdef STRING_ONLY
# define __SPRINT __ssputs_r
# else
# define __SPRINT __sfputs_r
# endif
-int _EXFUN(__SPRINT, (struct _reent *, FILE *, const char *, size_t));
+int __SPRINT (struct _reent *, FILE *, const char *, size_t);
#endif
#ifndef STRING_ONLY
#ifdef _UNBUF_STREAM_OPT
@@ -239,7 +239,7 @@ extern char *_dtoa_r (struct _reent *, double, int,
extern char *_ldtoa_r (struct _reent *, _LONG_DOUBLE, int,
int, int *, int *, char **);
-extern int _EXFUN(_ldcheck,(_LONG_DOUBLE *));
+extern int _ldcheck (_LONG_DOUBLE *);
# define _PRINTF_FLOAT_TYPE _LONG_DOUBLE
# define _DTOA_R _ldtoa_r
@@ -324,9 +324,9 @@ union arg_val
};
static union arg_val *
-_EXFUN(get_arg, (struct _reent *data, int n, wchar_t *fmt,
+get_arg (struct _reent *data, int n, wchar_t *fmt,
va_list *ap, int *numargs, union arg_val *args,
- int *arg_type, wchar_t **last_fmt));
+ int *arg_type, wchar_t **last_fmt);
#endif /* !_NO_POS_ARGS */
/*
diff --git a/newlib/libc/stdio/vprintf.c b/newlib/libc/stdio/vprintf.c
index 79c324d55..fb46c1c1a 100644
--- a/newlib/libc/stdio/vprintf.c
+++ b/newlib/libc/stdio/vprintf.c
@@ -40,7 +40,7 @@ vprintf (const char *fmt,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(viprintf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vprintf"))));
+viprintf (const char *, __VALIST) _ATTRIBUTE ((__alias__("vprintf")));
#endif
#endif /* !_REENT_ONLY */
@@ -56,6 +56,6 @@ _vprintf_r (struct _reent *ptr,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_viprintf_r, (struct _reent *, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("_vprintf_r"))));
+_viprintf_r (struct _reent *, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("_vprintf_r")));
#endif
diff --git a/newlib/libc/stdio/vscanf.c b/newlib/libc/stdio/vscanf.c
index be329ded4..bbbbd0a83 100644
--- a/newlib/libc/stdio/vscanf.c
+++ b/newlib/libc/stdio/vscanf.c
@@ -41,7 +41,7 @@ vscanf (const char *fmt,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(viscanf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vscanf"))));
+viscanf (const char *, __VALIST) _ATTRIBUTE ((__alias__("vscanf")));
#endif
#endif /* !_REENT_ONLY */
@@ -57,6 +57,6 @@ _vscanf_r (struct _reent *ptr,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_viscanf_r, (struct _reent *, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("_vscanf_r"))));
+_viscanf_r (struct _reent *, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("_vscanf_r")));
#endif
diff --git a/newlib/libc/stdio/vsnprintf.c b/newlib/libc/stdio/vsnprintf.c
index 02b5443bf..bcaffa30f 100644
--- a/newlib/libc/stdio/vsnprintf.c
+++ b/newlib/libc/stdio/vsnprintf.c
@@ -42,8 +42,8 @@ vsnprintf (char *__restrict str,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("vsnprintf"))));
+vsniprintf (char *, size_t, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("vsnprintf")));
#endif
#endif /* !_REENT_ONLY */
@@ -77,6 +77,6 @@ _vsnprintf_r (struct _reent *ptr,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_vsniprintf_r, (struct _reent *, char *, size_t, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("_vsnprintf_r"))));
+_vsniprintf_r (struct _reent *, char *, size_t, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("_vsnprintf_r")));
#endif
diff --git a/newlib/libc/stdio/vsprintf.c b/newlib/libc/stdio/vsprintf.c
index 7344a3854..823cacb56 100644
--- a/newlib/libc/stdio/vsprintf.c
+++ b/newlib/libc/stdio/vsprintf.c
@@ -40,8 +40,8 @@ vsprintf (char *__restrict str,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(vsiprintf, (char *, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("vsprintf"))));
+vsiprintf (char *, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("vsprintf")));
#endif
#endif /* !_REENT_ONLY */
@@ -66,6 +66,6 @@ _vsprintf_r (struct _reent *ptr,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_vsiprintf_r, (struct _reent *, char *, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("_vsprintf_r"))));
+_vsiprintf_r (struct _reent *, char *, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("_vsprintf_r")));
#endif
diff --git a/newlib/libc/stdio/vsscanf.c b/newlib/libc/stdio/vsscanf.c
index 61c65cd5e..97c7bae80 100644
--- a/newlib/libc/stdio/vsscanf.c
+++ b/newlib/libc/stdio/vsscanf.c
@@ -44,8 +44,8 @@ vsscanf (const char *__restrict str,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(vsiscanf, (const char *, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("vsscanf"))));
+vsiscanf (const char *, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("vsscanf")));
#endif
#endif /* !_REENT_ONLY */
@@ -70,6 +70,6 @@ _vsscanf_r (struct _reent *ptr,
#ifdef _NANO_FORMATTED_IO
int
-_EXFUN(_vsiscanf_r, (struct _reent *, const char *, const char *, __VALIST)
- _ATTRIBUTE ((__alias__("_vsscanf_r"))));
+_vsiscanf_r (struct _reent *, const char *, const char *, __VALIST)
+ _ATTRIBUTE ((__alias__("_vsscanf_r")));
#endif
diff --git a/newlib/libc/stdlib/local.h b/newlib/libc/stdlib/local.h
index 0b950d2f4..a96ed2cc4 100644
--- a/newlib/libc/stdlib/local.h
+++ b/newlib/libc/stdlib/local.h
@@ -3,7 +3,7 @@
#ifndef _LOCAL_H_
#define _LOCAL_H_
-char * _EXFUN(_gcvt,(struct _reent *, double , int , char *, char, int));
+char * _gcvt (struct _reent *, double , int , char *, char, int);
#include "../locale/setlocale.h"
diff --git a/newlib/libc/stdlib/mbctype.h b/newlib/libc/stdlib/mbctype.h
index 65cf24c34..359c83c77 100644
--- a/newlib/libc/stdlib/mbctype.h
+++ b/newlib/libc/stdlib/mbctype.h
@@ -7,10 +7,10 @@
/* functions used to support SHIFT_JIS, EUC-JP, and JIS multibyte encodings */
-int _EXFUN(_issjis1, (int c));
-int _EXFUN(_issjis2, (int c));
-int _EXFUN(_iseucjp, (int c));
-int _EXFUN(_isjis, (int c));
+int _issjis1 (int c);
+int _issjis2 (int c);
+int _iseucjp (int c);
+int _isjis (int c);
#define _issjis1(c) (((c) >= 0x81 && (c) <= 0x9f) || ((c) >= 0xe0 && (c) <= 0xef))
#define _issjis2(c) (((c) >= 0x40 && (c) <= 0x7e) || ((c) >= 0x80 && (c) <= 0xfc))
diff --git a/newlib/libc/stdlib/mprec.h b/newlib/libc/stdlib/mprec.h
index a98120aa4..7baec835c 100644
--- a/newlib/libc/stdlib/mprec.h
+++ b/newlib/libc/stdlib/mprec.h
@@ -385,26 +385,26 @@ typedef struct _Bigint _Bigint;
struct _reent ;
struct FPI;
-double _EXFUN(ulp,(double x));
-double _EXFUN(b2d,(_Bigint *a , int *e));
-_Bigint * _EXFUN(Balloc,(struct _reent *p, int k));
-void _EXFUN(Bfree,(struct _reent *p, _Bigint *v));
-_Bigint * _EXFUN(multadd,(struct _reent *p, _Bigint *, int, int));
-_Bigint * _EXFUN(s2b,(struct _reent *, const char*, int, int, __ULong));
-_Bigint * _EXFUN(i2b,(struct _reent *,int));
-_Bigint * _EXFUN(mult, (struct _reent *, _Bigint *, _Bigint *));
-_Bigint * _EXFUN(pow5mult, (struct _reent *, _Bigint *, int k));
-int _EXFUN(hi0bits,(__ULong));
-int _EXFUN(lo0bits,(__ULong *));
-_Bigint * _EXFUN(d2b,(struct _reent *p, double d, int *e, int *bits));
-_Bigint * _EXFUN(lshift,(struct _reent *p, _Bigint *b, int k));
-int _EXFUN(match,(const char**, char*));
-_Bigint * _EXFUN(diff,(struct _reent *p, _Bigint *a, _Bigint *b));
-int _EXFUN(cmp,(_Bigint *a, _Bigint *b));
-int _EXFUN(gethex,(struct _reent *p, const char **sp, const struct FPI *fpi, Long *exp, _Bigint **bp, int sign, locale_t loc));
-double _EXFUN(ratio,(_Bigint *a, _Bigint *b));
-__ULong _EXFUN(any_on,(_Bigint *b, int k));
-void _EXFUN(copybits,(__ULong *c, int n, _Bigint *b));
+double ulp (double x);
+double b2d (_Bigint *a , int *e);
+_Bigint * Balloc (struct _reent *p, int k);
+void Bfree (struct _reent *p, _Bigint *v);
+_Bigint * multadd (struct _reent *p, _Bigint *, int, int);
+_Bigint * s2b (struct _reent *, const char*, int, int, __ULong);
+_Bigint * i2b (struct _reent *,int);
+_Bigint * mult (struct _reent *, _Bigint *, _Bigint *);
+_Bigint * pow5mult (struct _reent *, _Bigint *, int k);
+int hi0bits (__ULong);
+int lo0bits (__ULong *);
+_Bigint * d2b (struct _reent *p, double d, int *e, int *bits);
+_Bigint * lshift (struct _reent *p, _Bigint *b, int k);
+int match (const char**, char*);
+_Bigint * diff (struct _reent *p, _Bigint *a, _Bigint *b);
+int cmp (_Bigint *a, _Bigint *b);
+int gethex (struct _reent *p, const char **sp, const struct FPI *fpi, Long *exp, _Bigint **bp, int sign, locale_t loc);
+double ratio (_Bigint *a, _Bigint *b);
+__ULong any_on (_Bigint *b, int k);
+void copybits (__ULong *c, int n, _Bigint *b);
double _strtod_l (struct _reent *ptr, const char *__restrict s00,
char **__restrict se, locale_t loc);
#if defined (_HAVE_LONG_DOUBLE) && !defined (_LDBL_EQ_DBL)
@@ -416,10 +416,10 @@ int _strtodg_l (struct _reent *p, const char *s00, char **se,
#endif /* _HAVE_LONG_DOUBLE && !_LDBL_EQ_DBL */
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__) || defined(_SMALL_HEXDIG)
-unsigned char _EXFUN(__hexdig_fun,(unsigned char));
+unsigned char __hexdig_fun (unsigned char);
#endif /* !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG) */
#ifdef INFNAN_CHECK
-int _EXFUN(hexnan,(const char **sp, const struct FPI *fpi, __ULong *x0));
+int hexnan (const char **sp, const struct FPI *fpi, __ULong *x0);
#endif
#define Bcopy(x,y) memcpy((char *)&x->_sign, (char *)&y->_sign, y->_wds*sizeof(__Long) + 2*sizeof(int))
@@ -432,4 +432,4 @@ extern const unsigned char __hexdig[];
#endif /* !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG) */
-double _EXFUN(_mprec_log10,(int));
+double _mprec_log10 (int);
diff --git a/newlib/libc/stdlib/rand48.h b/newlib/libc/stdlib/rand48.h
index a6cb479ef..26455e35a 100644
--- a/newlib/libc/stdlib/rand48.h
+++ b/newlib/libc/stdlib/rand48.h
@@ -17,7 +17,7 @@
#include <math.h>
#include <stdlib.h>
-extern void _EXFUN(__dorand48,(struct _reent *r, unsigned short[3]));
+extern void __dorand48 (struct _reent *r, unsigned short[3]);
#define __rand48_seed _REENT_RAND48_SEED(r)
#define __rand48_mult _REENT_RAND48_MULT(r)
#define __rand48_add _REENT_RAND48_ADD(r)
diff --git a/newlib/libc/stdlib/system.c b/newlib/libc/stdlib/system.c
index 34be6cd8f..f30b7df80 100644
--- a/newlib/libc/stdlib/system.c
+++ b/newlib/libc/stdlib/system.c
@@ -53,7 +53,7 @@ Supporting OS subroutines required: <<_exit>>, <<_execve>>, <<_fork_r>>,
#include <reent.h>
#if defined (unix) || defined (__CYGWIN__)
-static int _EXFUN(do_system, (struct _reent *ptr, const char *s));
+static int do_system (struct _reent *ptr, const char *s);
#endif
int
diff --git a/newlib/libc/string/local.h b/newlib/libc/string/local.h
index afef7e34a..8d364fdaa 100644
--- a/newlib/libc/string/local.h
+++ b/newlib/libc/string/local.h
@@ -2,7 +2,7 @@
#include <../ctype/local.h>
/* internal function to compute width of wide char. */
-int _EXFUN (__wcwidth, (wint_t));
+int __wcwidth (wint_t);
/*
Taken from glibc:
diff --git a/newlib/libc/sys/arm/syscalls.c b/newlib/libc/sys/arm/syscalls.c
index 474618dd7..68f1185dd 100644
--- a/newlib/libc/sys/arm/syscalls.c
+++ b/newlib/libc/sys/arm/syscalls.c
@@ -55,7 +55,7 @@ register char * stack_ptr asm ("sp");
/* following is copied from libc/stdio/local.h to check std streams */
-extern void _EXFUN(__sinit,(struct _reent *));
+extern void __sinit (struct _reent *);
#define CHECK_INIT(ptr) \
do \
{ \
diff --git a/newlib/libc/sys/linux/include/setjmp.h b/newlib/libc/sys/linux/include/setjmp.h
index f07dbab6d..f77a45708 100644
--- a/newlib/libc/sys/linux/include/setjmp.h
+++ b/newlib/libc/sys/linux/include/setjmp.h
@@ -22,10 +22,10 @@ typedef struct __sigjmpbuf
typedef __jmp_buf jmp_buf;
-void _EXFUN(longjmp,(jmp_buf __jmpb, int __retval));
-int _EXFUN(setjmp,(jmp_buf __jmpb));
-void _EXFUN(siglongjmp,(sigjmp_buf __jmpb, int __retval));
-int _EXFUN(sigsetjmp,(sigjmp_buf __jmpb, int __savemask));
+void longjmp (jmp_buf __jmpb, int __retval);
+int setjmp (jmp_buf __jmpb);
+void siglongjmp (sigjmp_buf __jmpb, int __retval);
+int sigsetjmp (sigjmp_buf __jmpb, int __savemask);
/* sigsetjmp is implemented as macro using setjmp */
diff --git a/newlib/libc/sys/linux/include/time.h b/newlib/libc/sys/linux/include/time.h
index e5456766e..5e61d2b65 100644
--- a/newlib/libc/sys/linux/include/time.h
+++ b/newlib/libc/sys/linux/include/time.h
@@ -62,27 +62,27 @@ struct tm
typedef __timer_t timer_t;
#endif
-clock_t _EXFUN(clock, (void));
-double _EXFUN(difftime, (time_t _time2, time_t _time1));
-time_t _EXFUN(mktime, (struct tm *_timeptr));
-time_t _EXFUN(time, (time_t *_timer));
+clock_t clock (void);
+double difftime (time_t _time2, time_t _time1);
+time_t mktime (struct tm *_timeptr);
+time_t time (time_t *_timer);
#ifndef _REENT_ONLY
-char *_EXFUN(asctime, (const struct tm *_tblock));
-char *_EXFUN(ctime, (const time_t *_time));
-struct tm *_EXFUN(gmtime, (const time_t *_timer));
-struct tm *_EXFUN(localtime,(const time_t *_timer));
+char *asctime (const struct tm *_tblock);
+char *ctime (const time_t *_time);
+struct tm *gmtime (const time_t *_timer);
+struct tm *localtime (const time_t *_timer);
#endif
-size_t _EXFUN(strftime, (char *_s, size_t _maxsize, const char *_fmt, const struct tm *_t));
+size_t strftime (char *_s, size_t _maxsize, const char *_fmt, const struct tm *_t);
-char *_EXFUN(asctime_r, (const struct tm *, char *));
-char *_EXFUN(ctime_r, (const time_t *, char *));
-struct tm *_EXFUN(gmtime_r, (const time_t *, struct tm *));
-struct tm *_EXFUN(localtime_r, (const time_t *, struct tm *));
+char *asctime_r (const struct tm *, char *);
+char *ctime_r (const time_t *, char *);
+struct tm *gmtime_r (const time_t *, struct tm *);
+struct tm *localtime_r (const time_t *, struct tm *);
#ifndef __STRICT_ANSI__
-char *_EXFUN(strptime, (const char *, const char *, struct tm *));
-void _EXFUN(tzset, (void));
-void _EXFUN(_tzset_r, (struct _reent *));
+char *strptime (const char *, const char *, struct tm *);
+void tzset (void);
+void _tzset_r (struct _reent *);
typedef struct __tzrule_struct
{
@@ -102,15 +102,15 @@ typedef struct __tzinfo_struct
__tzrule_type __tzrule[2];
} __tzinfo_type;
-__tzinfo_type *_EXFUN (__gettzinfo, (void));
+__tzinfo_type *__gettzinfo (void);
/* getdate functions */
#ifndef _REENT_ONLY
#define getdate_err (*__getdate_err())
-int *_EXFUN(__getdate_err,(void));
+int *__getdate_err (void);
-struct tm * _EXFUN(getdate, (const char *));
+struct tm * getdate (const char *);
/* getdate_err is set to one of the following values to indicate the error.
1 the DATEMSK environment variable is null or undefined,
2 the template file cannot be opened for reading,
@@ -123,7 +123,7 @@ struct tm * _EXFUN(getdate, (const char *));
#endif /* !_REENT_ONLY */
/* getdate_r returns the error code as above */
-int _EXFUN(getdate_r, (const char *, struct tm *));
+int getdate_r (const char *, struct tm *);
/* defines for the opengroup specifications Derived from Issue 1 of the SVID. */
extern __IMPORT long _timezone;
@@ -145,30 +145,28 @@ extern __IMPORT char *_tzname[2];
/* Clocks, P1003.1b-1993, p. 263 */
-int _EXFUN(clock_settime, (clockid_t clock_id, const struct timespec *tp));
-int _EXFUN(clock_gettime, (clockid_t clock_id, struct timespec *tp));
-int _EXFUN(clock_getres, (clockid_t clock_id, struct timespec *res));
+int clock_settime (clockid_t clock_id, const struct timespec *tp);
+int clock_gettime (clockid_t clock_id, struct timespec *tp);
+int clock_getres (clockid_t clock_id, struct timespec *res);
/* Create a Per-Process Timer, P1003.1b-1993, p. 264 */
-int _EXFUN(timer_create,
- (clockid_t clock_id, struct sigevent *evp, timer_t *timerid));
+int timer_create (clockid_t clock_id, struct sigevent *evp, timer_t *timerid);
/* Delete a Per_process Timer, P1003.1b-1993, p. 266 */
-int _EXFUN(timer_delete, (timer_t timerid));
+int timer_delete (timer_t timerid);
/* Per-Process Timers, P1003.1b-1993, p. 267 */
-int _EXFUN(timer_settime,
- (timer_t timerid, int flags, const struct itimerspec *value,
- struct itimerspec *ovalue));
-int _EXFUN(timer_gettime, (timer_t timerid, struct itimerspec *value));
-int _EXFUN(timer_getoverrun, (timer_t timerid));
+int timer_settime (timer_t timerid, int flags, const struct itimerspec *value,
+ struct itimerspec *ovalue);
+int timer_gettime (timer_t timerid, struct itimerspec *value);
+int timer_getoverrun (timer_t timerid);
/* High Resolution Sleep, P1003.1b-1993, p. 269 */
-int _EXFUN(nanosleep, (const struct timespec *rqtp, struct timespec *rmtp));
+int nanosleep (const struct timespec *rqtp, struct timespec *rmtp);
#endif /* _POSIX_TIMERS */
@@ -223,7 +221,7 @@ int _EXFUN(nanosleep, (const struct timespec *rqtp, struct timespec *rmtp));
/* Accessing a Process CPU-time CLock, P1003.4b/D8, p. 55 */
-int _EXFUN(clock_getcpuclockid, (pid_t pid, clockid_t *clock_id));
+int clock_getcpuclockid (pid_t pid, clockid_t *clock_id);
#endif /* _POSIX_CPUTIME */
@@ -231,8 +229,8 @@ int _EXFUN(clock_getcpuclockid, (pid_t pid, clockid_t *clock_id));
/* CPU-time Clock Attribute Access, P1003.4b/D8, p. 56 */
-int _EXFUN(clock_setenable_attr, (clockid_t clock_id, int attr));
-int _EXFUN(clock_getenable_attr, (clockid_t clock_id, int *attr));
+int clock_setenable_attr (clockid_t clock_id, int attr);
+int clock_getenable_attr (clockid_t clock_id, int *attr);
#endif /* _POSIX_CPUTIME or _POSIX_THREAD_CPUTIME */
diff --git a/newlib/libc/sys/linux/sys/signal.h b/newlib/libc/sys/linux/sys/signal.h
index 092798bb4..2797426d1 100644
--- a/newlib/libc/sys/linux/sys/signal.h
+++ b/newlib/libc/sys/linux/sys/signal.h
@@ -36,16 +36,16 @@ typedef _sig_func_ptr __sighandler_t;
#include <_ansi.h>
-int _EXFUN(kill, (int, int));
-int _EXFUN(sigaction, (int, const struct sigaction *, struct sigaction *));
-int _EXFUN(sigaddset, (sigset_t *, const int));
-int _EXFUN(sigdelset, (sigset_t *, const int));
-int _EXFUN(sigismember, (const sigset_t *, int));
-int _EXFUN(sigfillset, (sigset_t *));
-int _EXFUN(sigemptyset, (sigset_t *));
-int _EXFUN(sigpending, (sigset_t *));
-int _EXFUN(sigsuspend, (const sigset_t *));
-int _EXFUN(sigpause, (int));
+int kill (int, int);
+int sigaction (int, const struct sigaction *, struct sigaction *);
+int sigaddset (sigset_t *, const int);
+int sigdelset (sigset_t *, const int);
+int sigismember (const sigset_t *, int);
+int sigfillset (sigset_t *);
+int sigemptyset (sigset_t *);
+int sigpending (sigset_t *);
+int sigsuspend (const sigset_t *);
+int sigpause (int);
#ifndef _POSIX_SOURCE
extern const char *const sys_siglist[];
diff --git a/newlib/libc/sys/linux/sys/stat.h b/newlib/libc/sys/linux/sys/stat.h
index c04142c45..c94bb8b94 100644
--- a/newlib/libc/sys/linux/sys/stat.h
+++ b/newlib/libc/sys/linux/sys/stat.h
@@ -17,17 +17,17 @@
/* --- redundant stuff below --- */
-int _EXFUN(fstat,( int __fd, struct stat *__sbuf ));
-int _EXFUN(mkdir,( const char *_path, mode_t __mode ));
-int _EXFUN(mkfifo,( const char *__path, mode_t __mode ));
-int _EXFUN(stat,( const char *__restrict __path, struct stat *__restrict __sbuf ));
-mode_t _EXFUN(umask,( mode_t __mask ));
+int fstat (int __fd, struct stat *__sbuf);
+int mkdir (const char *_path, mode_t __mode);
+int mkfifo (const char *__path, mode_t __mode);
+int stat (const char *__restrict __path, struct stat *__restrict __sbuf);
+mode_t umask (mode_t __mask);
#ifndef _POSIX_SOURCE
-int _EXFUN(fstat64,( int __fd, struct stat64 *__sbuf ));
-int _EXFUN(lstat,( const char *__restrict file_name, struct stat64 *__restrict buf));
-int _EXFUN(lstat64,( const char *__restrict file_name, struct stat64 *__restrict buf));
-int _EXFUN(stat64,( const char *__restrict __path, struct stat64 *__restrict __sbuf ));
+int fstat64 (int __fd, struct stat64 *__sbuf);
+int lstat (const char *__restrict file_name, struct stat64 *__restrict buf);
+int lstat64 (const char *__restrict file_name, struct stat64 *__restrict buf);
+int stat64 (const char *__restrict __path, struct stat64 *__restrict __sbuf);
#endif /* _POSIX_SOURCE */
#endif /* _SYS_STAT_H */
diff --git a/newlib/libc/sys/linux/sys/stdio.h b/newlib/libc/sys/linux/sys/stdio.h
index a99308161..e1cd22e55 100644
--- a/newlib/libc/sys/linux/sys/stdio.h
+++ b/newlib/libc/sys/linux/sys/stdio.h
@@ -16,6 +16,6 @@
#define getline __getline
#define getdelim __getdelim
-char * _EXFUN(ctermid, (char *));
+char * ctermid (char *);
#endif /* _NEWLIB_STDIO_H */
diff --git a/newlib/libc/sys/linux/sys/string.h b/newlib/libc/sys/linux/sys/string.h
index 25489caea..dd88a8d00 100644
--- a/newlib/libc/sys/linux/sys/string.h
+++ b/newlib/libc/sys/linux/sys/string.h
@@ -2,7 +2,7 @@
#define _SYS_STRING_H
#ifndef __STRICT_ANSI__
-char *_EXFUN(strsignal, (int __signo));
+char *strsignal (int __signo);
#endif
#endif /* _SYS_STRING_H */
diff --git a/newlib/libc/sys/linux/sys/time.h b/newlib/libc/sys/linux/sys/time.h
index f2c656e5a..ca462fa8d 100644
--- a/newlib/libc/sys/linux/sys/time.h
+++ b/newlib/libc/sys/linux/sys/time.h
@@ -85,10 +85,10 @@
#include <_ansi.h>
-int _EXFUN(gettimeofday, (struct timeval *__p, struct timezone *__z));
-int _EXFUN(settimeofday, (const struct timeval *, const struct timezone *));
-int _EXFUN(utimes, (const char *__path, const struct timeval __tvp[2]));
-int _EXFUN(getitimer, (int __which, struct itimerval *__value));
-int _EXFUN(setitimer, (int __which, const struct itimerval *__value,
- struct itimerval *__ovalue));
+int gettimeofday (struct timeval *__p, struct timezone *__z);
+int settimeofday (const struct timeval *, const struct timezone *);
+int utimes (const char *__path, const struct timeval __tvp[2]);
+int getitimer (int __which, struct itimerval *__value);
+int setitimer (int __which, const struct itimerval *__value,
+ struct itimerval *__ovalue);
#endif
diff --git a/newlib/libc/sys/linux/sys/unistd.h b/newlib/libc/sys/linux/sys/unistd.h
index 6b5a93e0c..2b3e6131f 100644
--- a/newlib/libc/sys/linux/sys/unistd.h
+++ b/newlib/libc/sys/linux/sys/unistd.h
@@ -16,86 +16,86 @@ extern "C" {
extern char **environ;
-void _EXFUN(_exit, (int __status ) _ATTRIBUTE ((__noreturn__)));
-
-int _EXFUN(access,(const char *__path, int __amode ));
-unsigned _EXFUN(alarm, (unsigned __secs ));
-int _EXFUN(chdir, (const char *__path ));
-int _EXFUN(chmod, (const char *__path, mode_t __mode ));
-int _EXFUN(chown, (const char *__path, uid_t __owner, gid_t __group ));
-int _EXFUN(chroot, (const char *__path ));
-int _EXFUN(close, (int __fildes ));
-char _EXFUN(*ctermid, (char *__s ));
-char _EXFUN(*cuserid, (char *__s ));
-int _EXFUN(dup, (int __fildes ));
-int _EXFUN(dup2, (int __fildes, int __fildes2 ));
-int _EXFUN(execl, (const char *__path, const char *, ... ));
-int _EXFUN(execle, (const char *__path, const char *, ... ));
-int _EXFUN(execlp, (const char *__file, const char *, ... ));
-int _EXFUN(execv, (const char *__path, char * const __argv[] ));
-int _EXFUN(execve, (const char *__path, char * const __argv[], char * const __envp[] ));
-int _EXFUN(execvp, (const char *__file, char * const __argv[] ));
-int _EXFUN(fchdir, (int __fildes));
-int _EXFUN(fchmod, (int __fildes, mode_t __mode ));
-int _EXFUN(fchown, (int __fildes, uid_t __owner, gid_t __group ));
-pid_t _EXFUN(fork, (void ));
-long _EXFUN(fpathconf, (int __fd, int __name ));
-int _EXFUN(fsync, (int __fd));
-int _EXFUN(ftruncate, (int __fd, off_t __length));
-char _EXFUN(*getcwd, (char *__buf, size_t __size ));
-int _EXFUN(getdomainname ,(char *__name, size_t __len));
-gid_t _EXFUN(getegid, (void ));
-uid_t _EXFUN(geteuid, (void ));
-gid_t _EXFUN(getgid, (void ));
-int _EXFUN(getgroups, (int __gidsetsize, gid_t __grouplist[] ));
-int _EXFUN(__gethostname, (char *__name, size_t __len));
-char _EXFUN(*getlogin, (void ));
+void _exit (int __status) _ATTRIBUTE ((__noreturn__));
+
+int access (const char *__path, int __amode);
+unsigned alarm (unsigned __secs);
+int chdir (const char *__path);
+int chmod (const char *__path, mode_t __mode);
+int chown (const char *__path, uid_t __owner, gid_t __group);
+int chroot (const char *__path);
+int close (int __fildes);
+char *ctermid (char *__s);
+char *cuserid (char *__s);
+int dup (int __fildes);
+int dup2 (int __fildes, int __fildes2);
+int execl (const char *__path, const char *, ...);
+int execle (const char *__path, const char *, ...);
+int execlp (const char *__file, const char *, ...);
+int execv (const char *__path, char * const __argv[]);
+int execve (const char *__path, char * const __argv[], char * const __envp[]);
+int execvp (const char *__file, char * const __argv[]);
+int fchdir (int __fildes);
+int fchmod (int __fildes, mode_t __mode);
+int fchown (int __fildes, uid_t __owner, gid_t __group);
+pid_t fork (void);
+long fpathconf (int __fd, int __name);
+int fsync (int __fd);
+int ftruncate (int __fd, off_t __length);
+char *getcwd (char *__buf, size_t __size);
+int getdomainname (char *__name, size_t __len);
+gid_t getegid (void);
+uid_t geteuid (void);
+gid_t getgid (void);
+int getgroups (int __gidsetsize, gid_t __grouplist[]);
+int __gethostname (char *__name, size_t __len);
+char *getlogin (void);
#if defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-int _EXFUN(getlogin_r, (char *name, size_t namesize) );
+int getlogin_r (char *name, size_t namesize) ;
#endif
-char _EXFUN(*getpass, (__const char *__prompt));
-int _EXFUN(getpagesize, (void));
-pid_t _EXFUN(getpgid, (pid_t));
-pid_t _EXFUN(getpgrp, (void ));
-pid_t _EXFUN(getpid, (void ));
-pid_t _EXFUN(getppid, (void ));
-uid_t _EXFUN(getuid, (void ));
-char * _EXFUN(getusershell, (void));
-char _EXFUN(*getwd, (char *__buf ));
-int _EXFUN(isatty, (int __fildes ));
-int _EXFUN(lchown, (const char *__path, uid_t __owner, gid_t __group ));
-int _EXFUN(link, (const char *__path1, const char *__path2 ));
-int _EXFUN(nice, (int __nice_value ));
-off_t _EXFUN(lseek, (int __fildes, off_t __offset, int __whence ));
-long _EXFUN(pathconf, (const char *__path, int __name ));
-int _EXFUN(pause, (void ));
-int _EXFUN(pipe, (int __fildes[2] ));
-ssize_t _EXFUN(pread, (int __fd, void *__buf, size_t __nbytes, off_t __offset));
-ssize_t _EXFUN(pwrite, (int __fd, const void *__buf, size_t __nbytes, off_t __offset));
-_READ_WRITE_RETURN_TYPE _EXFUN(read, (int __fd, void *__buf, size_t __nbyte ));
-int _EXFUN(readlink, (const char *path, char *buf, size_t bufsiz));
-int _EXFUN(rmdir, (const char *__path ));
-void * _EXFUN(sbrk, (ptrdiff_t __incr));
-int _EXFUN(setegid, (gid_t __gid ));
-int _EXFUN(seteuid, (uid_t __uid ));
-int _EXFUN(setgid, (gid_t __gid ));
-int _EXFUN(setpgid, (pid_t __pid, pid_t __pgid ));
-int _EXFUN(setpgrp, (void ));
-pid_t _EXFUN(setsid, (void ));
-int _EXFUN(setuid, (uid_t __uid ));
-unsigned _EXFUN(sleep, (unsigned int __seconds ));
-void _EXFUN(swab, (const void *, void *, ssize_t));
-int _EXFUN(symlink, (const char *oldpath, const char *newpath));
-long _EXFUN(sysconf, (int __name ));
-pid_t _EXFUN(tcgetpgrp, (int __fildes ));
-int _EXFUN(tcsetpgrp, (int __fildes, pid_t __pgrp_id ));
-int _EXFUN(truncate, (const char *, off_t __length));
-char * _EXFUN(ttyname, (int __fildes ));
-int _EXFUN(ttyname_r, (int __fildes, char *__buf, size_t __len));
-int _EXFUN(unlink, (const char *__path ));
-int _EXFUN(usleep, (__useconds_t __useconds));
-int _EXFUN(vhangup, (void ));
-_READ_WRITE_RETURN_TYPE _EXFUN(write, (int __fd, const void *__buf, size_t __nbyte ));
+char *getpass (__const char *__prompt);
+int getpagesize (void);
+pid_t getpgid (pid_t);
+pid_t getpgrp (void);
+pid_t getpid (void);
+pid_t getppid (void);
+uid_t getuid (void);
+char * getusershell (void);
+char *getwd (char *__buf);
+int isatty (int __fildes);
+int lchown (const char *__path, uid_t __owner, gid_t __group);
+int link (const char *__path1, const char *__path2);
+int nice (int __nice_value);
+off_t lseek (int __fildes, off_t __offset, int __whence);
+long pathconf (const char *__path, int __name);
+int pause (void);
+int pipe (int __fildes[2]);
+ssize_t pread (int __fd, void *__buf, size_t __nbytes, off_t __offset);
+ssize_t pwrite (int __fd, const void *__buf, size_t __nbytes, off_t __offset);
+_READ_WRITE_RETURN_TYPE read (int __fd, void *__buf, size_t __nbyte);
+int readlink (const char *path, char *buf, size_t bufsiz);
+int rmdir (const char *__path);
+void * sbrk (ptrdiff_t __incr);
+int setegid (gid_t __gid);
+int seteuid (uid_t __uid);
+int setgid (gid_t __gid);
+int setpgid (pid_t __pid, pid_t __pgid);
+int setpgrp (void);
+pid_t setsid (void);
+int setuid (uid_t __uid);
+unsigned sleep (unsigned int __seconds);
+void swab (const void *, void *, ssize_t);
+int symlink (const char *oldpath, const char *newpath);
+long sysconf (int __name);
+pid_t tcgetpgrp (int __fildes);
+int tcsetpgrp (int __fildes, pid_t __pgrp_id);
+int truncate (const char *, off_t __length);
+char * ttyname (int __fildes);
+int ttyname_r (int __fildes, char *__buf, size_t __len);
+int unlink (const char *__path);
+int usleep (__useconds_t __useconds);
+int vhangup (void);
+_READ_WRITE_RETURN_TYPE write (int __fd, const void *__buf, size_t __nbyte);
extern char *optarg; /* getopt(3) external variables */
extern int optind, opterr, optopt;
@@ -103,7 +103,7 @@ int getopt(int, char * const [], const char *);
extern int optreset; /* getopt(3) external variable */
#ifndef _POSIX_SOURCE
-pid_t _EXFUN(vfork, (void ));
+pid_t vfork (void);
extern char *suboptarg; /* getsubopt(3) external variable */
int getsubopt(char **, char * const *, char **);
@@ -111,16 +111,16 @@ int getsubopt(char **, char * const *, char **);
/* Provide prototypes for most of the _<systemcall> names that are
provided in newlib for some compilers. */
-int _EXFUN(_close, (int __fildes ));
-pid_t _EXFUN(_fork, (void ));
-pid_t _EXFUN(_getpid, (void ));
-int _EXFUN(_link, (const char *__path1, const char *__path2 ));
-off_t _EXFUN(_lseek, (int __fildes, off_t __offset, int __whence ));
-_READ_WRITE_RETURN_TYPE _EXFUN(_read, (int __fd, void *__buf, size_t __nbyte ));
-void * _EXFUN(_sbrk, (size_t __incr));
-int _EXFUN(_unlink, (const char *__path ));
-_READ_WRITE_RETURN_TYPE _EXFUN(_write, (int __fd, const void *__buf, size_t __nbyte ));
-int _EXFUN(_execve, (const char *__path, char * const __argv[], char * const __envp[] ));
+int _close (int __fildes);
+pid_t _fork (void);
+pid_t _getpid (void);
+int _link (const char *__path1, const char *__path2);
+off_t _lseek (int __fildes, off_t __offset, int __whence);
+_READ_WRITE_RETURN_TYPE _read (int __fd, void *__buf, size_t __nbyte);
+void * _sbrk (size_t __incr);
+int _unlink (const char *__path);
+_READ_WRITE_RETURN_TYPE _write (int __fd, const void *__buf, size_t __nbyte);
+int _execve (const char *__path, char * const __argv[], char * const __envp[]);
#define F_OK 0
#define R_OK 4
diff --git a/newlib/libc/sys/linux/sys/utime.h b/newlib/libc/sys/linux/sys/utime.h
index 7499cfe7e..0df444ae6 100644
--- a/newlib/libc/sys/linux/sys/utime.h
+++ b/newlib/libc/sys/linux/sys/utime.h
@@ -9,6 +9,6 @@ struct utimbuf
time_t modtime; /* Modification time. */
};
-int _EXFUN(utime, (const char *__file, const struct utimbuf *__times));
+int utime (const char *__file, const struct utimbuf *__times);
#endif /* _SYS_UTIME_H */
diff --git a/newlib/libc/sys/sparc64/sys/stat.h b/newlib/libc/sys/sparc64/sys/stat.h
index 746406737..c1f2a61d4 100644
--- a/newlib/libc/sys/sparc64/sys/stat.h
+++ b/newlib/libc/sys/sparc64/sys/stat.h
@@ -119,12 +119,12 @@ struct stat
#define S_ISLNK(m) (((m)&_IFMT) == _IFLNK)
#define S_ISSOCK(m) (((m)&_IFMT) == _IFSOCK)
-int _EXFUN(chmod,( const char *_path, mode_t _mode ));
-int _EXFUN(fstat,( int _fd, struct stat *_sbuf ));
-int _EXFUN(mkdir,( char *_path, mode_t _mode ));
-int _EXFUN(mkfifo,( char *_path, mode_t _mode ));
-int _EXFUN(stat,( const char *__restrict _path, struct stat *__restrict _sbuf ));
-mode_t _EXFUN(umask,( mode_t _mask ));
+int chmod (const char *_path, mode_t _mode);
+int fstat (int _fd, struct stat *_sbuf);
+int mkdir (char *_path, mode_t _mode);
+int mkfifo (char *_path, mode_t _mode);
+int stat (const char *__restrict _path, struct stat *__restrict _sbuf);
+mode_t umask (mode_t _mask);
#ifdef __cplusplus
}
diff --git a/newlib/libc/time/local.h b/newlib/libc/time/local.h
index 10c5b445d..dce51cda2 100644
--- a/newlib/libc/time/local.h
+++ b/newlib/libc/time/local.h
@@ -19,12 +19,12 @@
#define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
-int _EXFUN (__tzcalc_limits, (int __year));
+int __tzcalc_limits (int __year);
extern const int __month_lengths[2][MONSPERYEAR];
-void _EXFUN(_tzset_unlocked_r, (struct _reent *));
-void _EXFUN(_tzset_unlocked, (void));
+void _tzset_unlocked_r (struct _reent *);
+void _tzset_unlocked (void);
/* locks for multi-threading */
#ifdef __SINGLE_THREAD__
@@ -35,6 +35,6 @@ void _EXFUN(_tzset_unlocked, (void));
#define TZ_UNLOCK __tz_unlock()
#endif
-void _EXFUN(__tz_lock,(void));
-void _EXFUN(__tz_unlock,(void));
+void __tz_lock (void);
+void __tz_unlock (void);
diff --git a/newlib/libc/xdr/xdr_mem.c b/newlib/libc/xdr/xdr_mem.c
index 3187ade74..a3d97b633 100644
--- a/newlib/libc/xdr/xdr_mem.c
+++ b/newlib/libc/xdr/xdr_mem.c
@@ -53,22 +53,22 @@
# define htonl(x) xdr_htonl(x)
#endif
-static void _EXFUN (xdrmem_destroy, (XDR *));
-static bool_t _EXFUN (xdrmem_getlong_aligned, (XDR *, long *));
-static bool_t _EXFUN (xdrmem_putlong_aligned, (XDR *, const long *));
-static bool_t _EXFUN (xdrmem_getlong_unaligned, (XDR *, long *));
-static bool_t _EXFUN (xdrmem_putlong_unaligned, (XDR *, const long *));
-static bool_t _EXFUN (xdrmem_getbytes, (XDR *, char *, u_int));
-static bool_t _EXFUN (xdrmem_putbytes, (XDR *, const char *, u_int));
+static void xdrmem_destroy (XDR *);
+static bool_t xdrmem_getlong_aligned (XDR *, long *);
+static bool_t xdrmem_putlong_aligned (XDR *, const long *);
+static bool_t xdrmem_getlong_unaligned (XDR *, long *);
+static bool_t xdrmem_putlong_unaligned (XDR *, const long *);
+static bool_t xdrmem_getbytes (XDR *, char *, u_int);
+static bool_t xdrmem_putbytes (XDR *, const char *, u_int);
/* XXX: w/64-bit pointers, u_int not enough! */
-static u_int _EXFUN (xdrmem_getpos, (XDR *));
-static bool_t _EXFUN (xdrmem_setpos, (XDR *, u_int));
-static int32_t * _EXFUN (xdrmem_inline_aligned, (XDR *, u_int));
-static int32_t * _EXFUN (xdrmem_inline_unaligned, (XDR *, u_int));
-static bool_t _EXFUN (xdrmem_getint32_aligned, (XDR *, int32_t *));
-static bool_t _EXFUN (xdrmem_putint32_aligned, (XDR *, const int32_t *));
-static bool_t _EXFUN (xdrmem_getint32_unaligned, (XDR *, int32_t *));
-static bool_t _EXFUN (xdrmem_putint32_unaligned, (XDR *, const int32_t *));
+static u_int xdrmem_getpos (XDR *);
+static bool_t xdrmem_setpos (XDR *, u_int);
+static int32_t * xdrmem_inline_aligned (XDR *, u_int);
+static int32_t * xdrmem_inline_unaligned (XDR *, u_int);
+static bool_t xdrmem_getint32_aligned (XDR *, int32_t *);
+static bool_t xdrmem_putint32_aligned (XDR *, const int32_t *);
+static bool_t xdrmem_getint32_unaligned (XDR *, int32_t *);
+static bool_t xdrmem_putint32_unaligned (XDR *, const int32_t *);
static const struct xdr_ops xdrmem_ops_aligned = {
xdrmem_getlong_aligned,
diff --git a/newlib/libc/xdr/xdr_private.h b/newlib/libc/xdr/xdr_private.h
index 3b071d668..98c9daada 100644
--- a/newlib/libc/xdr/xdr_private.h
+++ b/newlib/libc/xdr/xdr_private.h
@@ -43,13 +43,13 @@ extern "C" {
typedef void (*xdr_vprintf_t) (const char *, va_list);
-xdr_vprintf_t _EXFUN (xdr_set_vprintf, (xdr_vprintf_t));
+xdr_vprintf_t xdr_set_vprintf (xdr_vprintf_t);
-void _EXFUN (xdr_vwarnx, (const char *, __VALIST)
- _ATTRIBUTE ((__format__ (__printf__, 1, 0))));
+void xdr_vwarnx (const char *, __VALIST)
+ _ATTRIBUTE ((__format__ (__printf__, 1, 0)));
-void _EXFUN (xdr_warnx, (const char *, ...)
- _ATTRIBUTE ((__format__ (__printf__, 1, 2))));
+void xdr_warnx (const char *, ...)
+ _ATTRIBUTE ((__format__ (__printf__, 1, 2)));
/* endian issues */
#include <machine/endian.h>
diff --git a/newlib/libc/xdr/xdr_rec.c b/newlib/libc/xdr/xdr_rec.c
index 9051d522f..24cb5eb53 100644
--- a/newlib/libc/xdr/xdr_rec.c
+++ b/newlib/libc/xdr/xdr_rec.c
@@ -72,16 +72,16 @@ enum xprt_stat
XPRT_IDLE
};
-static bool_t _EXFUN (xdrrec_getlong, (XDR *, long *));
-static bool_t _EXFUN (xdrrec_putlong, (XDR *, const long *));
-static bool_t _EXFUN (xdrrec_getbytes, (XDR *, char *, u_int));
-static bool_t _EXFUN (xdrrec_putbytes, (XDR *, const char *, u_int));
-static u_int _EXFUN (xdrrec_getpos, (XDR *));
-static bool_t _EXFUN (xdrrec_setpos, (XDR *, u_int));
-static int32_t * _EXFUN (xdrrec_inline, (XDR *, u_int));
-static void _EXFUN (xdrrec_destroy, (XDR *));
-static bool_t _EXFUN (xdrrec_getint32, (XDR *, int32_t *));
-static bool_t _EXFUN (xdrrec_putint32, (XDR *, const int32_t *));
+static bool_t xdrrec_getlong (XDR *, long *);
+static bool_t xdrrec_putlong (XDR *, const long *);
+static bool_t xdrrec_getbytes (XDR *, char *, u_int);
+static bool_t xdrrec_putbytes (XDR *, const char *, u_int);
+static u_int xdrrec_getpos (XDR *);
+static bool_t xdrrec_setpos (XDR *, u_int);
+static int32_t * xdrrec_inline (XDR *, u_int);
+static void xdrrec_destroy (XDR *);
+static bool_t xdrrec_getint32 (XDR *, int32_t *);
+static bool_t xdrrec_putint32 (XDR *, const int32_t *);
static const struct xdr_ops xdrrec_ops = {
xdrrec_getlong,
@@ -156,8 +156,8 @@ static bool_t set_input_fragment (RECSTREAM *);
static bool_t skip_input_bytes (RECSTREAM *, long);
static bool_t realloc_stream (RECSTREAM *, int);
-bool_t _EXFUN (__xdrrec_getrec, (XDR *, enum xprt_stat *, bool_t));
-bool_t _EXFUN (__xdrrec_setnonblock, (XDR *, int));
+bool_t __xdrrec_getrec (XDR *, enum xprt_stat *, bool_t);
+bool_t __xdrrec_setnonblock (XDR *, int);
/*
* Create an xdr handle for xdrrec
diff --git a/newlib/libc/xdr/xdr_stdio.c b/newlib/libc/xdr/xdr_stdio.c
index 784ac6c8b..05fbe1f30 100644
--- a/newlib/libc/xdr/xdr_stdio.c
+++ b/newlib/libc/xdr/xdr_stdio.c
@@ -50,16 +50,16 @@
# define htonl(x) xdr_htonl(x)
#endif
-static void _EXFUN (xdrstdio_destroy, (XDR *));
-static bool_t _EXFUN (xdrstdio_getlong, (XDR *, long *));
-static bool_t _EXFUN (xdrstdio_putlong, (XDR *, const long *));
-static bool_t _EXFUN (xdrstdio_getbytes, (XDR *, char *, u_int));
-static bool_t _EXFUN (xdrstdio_putbytes, (XDR *, const char *, u_int));
-static u_int _EXFUN (xdrstdio_getpos, (XDR *));
-static bool_t _EXFUN (xdrstdio_setpos, (XDR *, u_int));
-static int32_t * _EXFUN (xdrstdio_inline, (XDR *, u_int));
-static bool_t _EXFUN (xdrstdio_getint32, (XDR*, int32_t *));
-static bool_t _EXFUN (xdrstdio_putint32, (XDR*, const int32_t *));
+static void xdrstdio_destroy (XDR *);
+static bool_t xdrstdio_getlong (XDR *, long *);
+static bool_t xdrstdio_putlong (XDR *, const long *);
+static bool_t xdrstdio_getbytes (XDR *, char *, u_int);
+static bool_t xdrstdio_putbytes (XDR *, const char *, u_int);
+static u_int xdrstdio_getpos (XDR *);
+static bool_t xdrstdio_setpos (XDR *, u_int);
+static int32_t * xdrstdio_inline (XDR *, u_int);
+static bool_t xdrstdio_getint32 (XDR*, int32_t *);
+static bool_t xdrstdio_putint32 (XDR*, const int32_t *);
/*
* Ops vector for stdio type XDR
diff --git a/newlib/libm/mathfp/zmath.h b/newlib/libm/mathfp/zmath.h
index 369bfec49..67bdb24a7 100644
--- a/newlib/libm/mathfp/zmath.h
+++ b/newlib/libm/mathfp/zmath.h
@@ -39,17 +39,17 @@ extern float z_rooteps_f;
/* Core math routines. */
-int _EXFUN (numtest, (double));
-int _EXFUN (numtestf, (float));
-double _EXFUN (logarithm, (double, int));
-float _EXFUN (logarithmf, (float, int));
-double _EXFUN (sine, (double, int));
-float _EXFUN (sinef, (float, int));
-double _EXFUN (asine, (double, int));
-float _EXFUN (asinef, (float, int));
-double _EXFUN (atangent, (double, double, double, int));
-float _EXFUN (atangentf, (float, float, float, int));
-double _EXFUN (sineh, (double, int));
-float _EXFUN (sinehf, (float, int));
+int numtest (double);
+int numtestf (float);
+double logarithm (double, int);
+float logarithmf (float, int);
+double sine (double, int);
+float sinef (float, int);
+double asine (double, int);
+float asinef (float, int);
+double atangent (double, double, double, int);
+float atangentf (float, float, float, int);
+double sineh (double, int);
+float sinehf (float, int);
#endif /* no __ZMATH_H */
diff --git a/newlib/libm/test/convert.c b/newlib/libm/test/convert.c
index fe5bc0aa4..026bd277b 100644
--- a/newlib/libm/test/convert.c
+++ b/newlib/libm/test/convert.c
@@ -49,7 +49,7 @@ test_atoff (void)
static
void
-iterate (void _EXFUN((*func),(void)),
+iterate (void (*func) (void),
char *name)
{
diff --git a/newlib/libm/test/math.c b/newlib/libm/test/math.c
index dda587a33..0a6389a01 100644
--- a/newlib/libm/test/math.c
+++ b/newlib/libm/test/math.c
@@ -263,7 +263,7 @@ run_vector_1 (int vector,
if (strcmp(args,"dd")==0)
{
- typedef double _EXFUN((*pdblfunc),(double));
+ typedef double (*pdblfunc) (double);
/* Double function returning a double */
@@ -276,7 +276,7 @@ run_vector_1 (int vector,
float arga;
double a;
- typedef float _EXFUN((*pdblfunc),(float));
+ typedef float (*pdblfunc) (float);
/* Double function returning a double */
@@ -289,7 +289,7 @@ run_vector_1 (int vector,
}
else if (strcmp(args,"ddd")==0)
{
- typedef double _EXFUN((*pdblfunc),(double,double));
+ typedef double (*pdblfunc) (double,double);
result = ((pdblfunc)(func))(arg1,arg2);
finish(f, vector, result, p,args, name);
@@ -301,7 +301,7 @@ run_vector_1 (int vector,
float arga;
float argb;
- typedef float _EXFUN((*pdblfunc),(float,float));
+ typedef float (*pdblfunc) (float,float);
if (arg1 < FLT_MAX && arg2 < FLT_MAX)
@@ -314,7 +314,7 @@ run_vector_1 (int vector,
}
else if (strcmp(args,"did")==0)
{
- typedef double _EXFUN((*pdblfunc),(int,double));
+ typedef double (*pdblfunc) (int,double);
result = ((pdblfunc)(func))((int)arg1,arg2);
finish(f, vector, result, p,args, name);
@@ -326,7 +326,7 @@ run_vector_1 (int vector,
float arga;
float argb;
- typedef float _EXFUN((*pdblfunc),(int,float));
+ typedef float (*pdblfunc) (int,float);
if (arg1 < FLT_MAX && arg2 < FLT_MAX)
diff --git a/newlib/libm/test/test.h b/newlib/libm/test/test.h
index 440c3850e..e95c6b4c4 100644
--- a/newlib/libm/test/test.h
+++ b/newlib/libm/test/test.h
@@ -34,7 +34,7 @@ typedef struct
#define MVEC_END 0,};
-int _EXFUN(mag_of_error,(double, double));
+int mag_of_error (double, double);
#define ERROR_PERFECT 20
@@ -128,18 +128,18 @@ typedef struct
} sprint_int_type;
-void _EXFUN(test_ieee,(void));
-void _EXFUN(test_math2,(void));
-void _EXFUN(test_math,(void));
-void _EXFUN(test_string,(void));
-void _EXFUN(test_is,(void));
-void _EXFUN(test_cvt,(void));
+void test_ieee (void);
+void test_math2 (void);
+void test_math (void);
+void test_string (void);
+void test_is (void);
+void test_cvt (void);
-void _EXFUN(line,(int));
+void line (int);
-void _EXFUN(test_mok, (double, double, int));
-void _EXFUN(test_iok, (int, int));
-void _EXFUN(test_eok, (int, int));
-void _EXFUN(test_sok, (char *, char*));
-void _EXFUN(test_scok, (char *, char*, int));
-void _EXFUN(newfunc,(const char *));
+void test_mok (double, double, int);
+void test_iok (int, int);
+void test_eok (int, int);
+void test_sok (char *, char*);
+void test_scok (char *, char*, int);
+void newfunc (const char *);
diff --git a/winsup/cygwin/include/attr/xattr.h b/winsup/cygwin/include/attr/xattr.h
index 7e410414d..07d33837e 100644
--- a/winsup/cygwin/include/attr/xattr.h
+++ b/winsup/cygwin/include/attr/xattr.h
@@ -26,18 +26,18 @@ details. */
_BEGIN_STD_C
-ssize_t _EXFUN(getxattr,(const char *, const char *, void *, size_t ));
-ssize_t _EXFUN(lgetxattr,(const char *, const char *, void *, size_t ));
-ssize_t _EXFUN(fgetxattr,(int , const char *, void *, size_t ));
-ssize_t _EXFUN(listxattr,(const char *, char *, size_t ));
-ssize_t _EXFUN(llistxattr,(const char *, char *, size_t ));
-ssize_t _EXFUN(flistxattr,(int , char *, size_t ));
-int _EXFUN(setxattr,(const char *, const char *, const void *, size_t , int ));
-int _EXFUN(lsetxattr,(const char *, const char *, const void *, size_t , int ));
-int _EXFUN(fsetxattr,(int , const char *, const void *, size_t , int ));
-int _EXFUN(removexattr,(const char *, const char *));
-int _EXFUN(lremovexattr,(const char *, const char *));
-int _EXFUN(fremovexattr,(int , const char *));
+ssize_t getxattr (const char *, const char *, void *, size_t);
+ssize_t lgetxattr (const char *, const char *, void *, size_t);
+ssize_t fgetxattr (int , const char *, void *, size_t);
+ssize_t listxattr (const char *, char *, size_t);
+ssize_t llistxattr (const char *, char *, size_t);
+ssize_t flistxattr (int , char *, size_t);
+int setxattr (const char *, const char *, const void *, size_t , int);
+int lsetxattr (const char *, const char *, const void *, size_t , int);
+int fsetxattr (int , const char *, const void *, size_t , int);
+int removexattr (const char *, const char *);
+int lremovexattr (const char *, const char *);
+int fremovexattr (int , const char *);
_END_STD_C
diff --git a/winsup/cygwin/include/pty.h b/winsup/cygwin/include/pty.h
index 7b92a2b4d..8754dedc9 100644
--- a/winsup/cygwin/include/pty.h
+++ b/winsup/cygwin/include/pty.h
@@ -8,10 +8,10 @@
extern "C" {
#endif
-int _EXFUN(openpty ,(int *, int *, char *, const struct termios *,
- const struct winsize *));
-int _EXFUN(forkpty ,(int *, char *, const struct termios *,
- const struct winsize *));
+int openpty (int *, int *, char *, const struct termios *,
+ const struct winsize *);
+int forkpty (int *, char *, const struct termios *,
+ const struct winsize *);
#ifdef __cplusplus
}
diff --git a/winsup/cygwin/include/sys/stdio.h b/winsup/cygwin/include/sys/stdio.h
index ac22a3940..1e6830fb0 100644
--- a/winsup/cygwin/include/sys/stdio.h
+++ b/winsup/cygwin/include/sys/stdio.h
@@ -32,8 +32,8 @@ details. */
__BEGIN_DECLS
-ssize_t _EXFUN(getline, (char **, size_t *, FILE *));
-ssize_t _EXFUN(getdelim, (char **, size_t *, int, FILE *));
+ssize_t getline (char **, size_t *, FILE *);
+ssize_t getdelim (char **, size_t *, int, FILE *);
__END_DECLS
diff --git a/winsup/cygwin/include/sys/utime.h b/winsup/cygwin/include/sys/utime.h
index 8408fa1df..ab6faebb9 100644
--- a/winsup/cygwin/include/sys/utime.h
+++ b/winsup/cygwin/include/sys/utime.h
@@ -19,7 +19,7 @@ struct utimbuf
time_t modtime;
};
-int _EXFUN(utime, (const char *__path, const struct utimbuf *__buf));
+int utime (const char *__path, const struct utimbuf *__buf);
#ifdef __cplusplus
};
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 02/17] ansification: remove _CONST
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
` (5 preceding siblings ...)
2017-12-07 18:20 ` [PATCH v2 13/17] ansification: remove _EXFNPTR, _EXPARM Yaakov Selkowitz
@ 2017-12-07 18:20 ` Yaakov Selkowitz
2017-12-07 18:20 ` [PATCH v2 06/17] ansification: remove _VOID_PTR Yaakov Selkowitz
` (10 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:20 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
newlib/libc/ctype/ctype_.c | 6 +-
newlib/libc/ctype/ctype_.h | 2 +-
newlib/libc/ctype/ctype_cp.h | 4 +-
newlib/libc/ctype/ctype_iso.h | 4 +-
newlib/libc/iconv/ccs/big5.c | 10 +--
newlib/libc/iconv/ccs/ccs.h | 10 +--
newlib/libc/iconv/ccs/ccsbi.c | 2 +-
newlib/libc/iconv/ccs/ccsbi.h | 82 +++++++++++------------
newlib/libc/iconv/ccs/cns11643_plane1.c | 10 +--
newlib/libc/iconv/ccs/cns11643_plane14.c | 10 +--
newlib/libc/iconv/ccs/cns11643_plane2.c | 10 +--
newlib/libc/iconv/ccs/cp775.c | 6 +-
newlib/libc/iconv/ccs/cp850.c | 6 +-
newlib/libc/iconv/ccs/cp852.c | 6 +-
newlib/libc/iconv/ccs/cp855.c | 6 +-
newlib/libc/iconv/ccs/cp866.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_1.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_10.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_11.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_13.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_14.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_15.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_2.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_3.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_4.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_5.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_6.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_7.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_8.c | 6 +-
newlib/libc/iconv/ccs/iso_8859_9.c | 6 +-
newlib/libc/iconv/ccs/iso_ir_111.c | 6 +-
newlib/libc/iconv/ccs/jis_x0201_1976.c | 6 +-
newlib/libc/iconv/ccs/jis_x0208_1990.c | 10 +--
newlib/libc/iconv/ccs/jis_x0212_1990.c | 10 +--
newlib/libc/iconv/ccs/koi8_r.c | 6 +-
newlib/libc/iconv/ccs/koi8_ru.c | 6 +-
newlib/libc/iconv/ccs/koi8_u.c | 6 +-
newlib/libc/iconv/ccs/koi8_uni.c | 6 +-
newlib/libc/iconv/ccs/ksx1001.c | 10 +--
newlib/libc/iconv/ccs/mktbl.pl | 14 ++--
newlib/libc/iconv/ccs/win_1250.c | 6 +-
newlib/libc/iconv/ccs/win_1251.c | 6 +-
newlib/libc/iconv/ccs/win_1252.c | 6 +-
newlib/libc/iconv/ccs/win_1253.c | 6 +-
newlib/libc/iconv/ccs/win_1254.c | 6 +-
newlib/libc/iconv/ccs/win_1255.c | 6 +-
newlib/libc/iconv/ccs/win_1256.c | 6 +-
newlib/libc/iconv/ccs/win_1257.c | 6 +-
newlib/libc/iconv/ccs/win_1258.c | 6 +-
newlib/libc/iconv/ces/cesbi.c | 68 +++++++++----------
newlib/libc/iconv/ces/cesbi.h | 40 +++++------
newlib/libc/iconv/ces/euc.c | 18 ++---
newlib/libc/iconv/ces/mkdeps.pl | 24 +++----
newlib/libc/iconv/ces/table-pcs.c | 10 +--
newlib/libc/iconv/ces/table.c | 56 ++++++++--------
newlib/libc/iconv/ces/ucs-2-internal.c | 6 +-
newlib/libc/iconv/ces/ucs-2.c | 8 +--
newlib/libc/iconv/ces/ucs-4-internal.c | 6 +-
newlib/libc/iconv/ces/ucs-4.c | 8 +--
newlib/libc/iconv/ces/us-ascii.c | 6 +-
newlib/libc/iconv/ces/utf-16.c | 10 +--
newlib/libc/iconv/ces/utf-8.c | 8 +--
newlib/libc/iconv/lib/aliasesbi.c | 2 +-
newlib/libc/iconv/lib/aliasesi.c | 30 ++++-----
newlib/libc/iconv/lib/conv.h | 18 ++---
newlib/libc/iconv/lib/iconv.c | 18 ++---
newlib/libc/iconv/lib/iconvnls.c | 32 ++++-----
newlib/libc/iconv/lib/local.h | 2 +-
newlib/libc/iconv/lib/nullconv.c | 8 +--
newlib/libc/iconv/lib/ucsconv.c | 24 +++----
newlib/libc/iconv/lib/ucsconv.h | 26 +++----
newlib/libc/include/_ansi.h | 2 -
newlib/libc/include/ctype.h | 2 +-
newlib/libc/include/iconv.h | 6 +-
newlib/libc/include/pthread.h | 54 +++++++--------
newlib/libc/include/rpc/xdr.h | 10 +--
newlib/libc/include/stdio.h | 4 +-
newlib/libc/include/stdlib.h | 4 +-
newlib/libc/include/sys/errno.h | 2 +-
newlib/libc/include/sys/iconvnls.h | 12 ++--
newlib/libc/include/sys/reent.h | 2 +-
newlib/libc/include/unctrl.h | 4 +-
newlib/libc/locale/locale.c | 4 +-
newlib/libc/machine/cris/sys/errno.h | 2 +-
newlib/libc/machine/microblaze/strcmp.c | 4 +-
newlib/libc/machine/microblaze/strcpy.c | 6 +-
newlib/libc/machine/microblaze/strlen.c | 6 +-
newlib/libc/machine/powerpc/atosfix16.c | 4 +-
newlib/libc/machine/powerpc/atosfix32.c | 4 +-
newlib/libc/machine/powerpc/atosfix64.c | 4 +-
newlib/libc/machine/powerpc/atoufix16.c | 4 +-
newlib/libc/machine/powerpc/atoufix32.c | 4 +-
newlib/libc/machine/powerpc/atoufix64.c | 4 +-
newlib/libc/machine/powerpc/strtosfix16.c | 4 +-
newlib/libc/machine/powerpc/strtosfix32.c | 4 +-
newlib/libc/machine/powerpc/strtosfix64.c | 4 +-
newlib/libc/machine/powerpc/strtoufix16.c | 4 +-
newlib/libc/machine/powerpc/strtoufix32.c | 4 +-
newlib/libc/machine/powerpc/strtoufix64.c | 4 +-
newlib/libc/machine/powerpc/vfprintf.c | 8 +--
newlib/libc/machine/powerpc/vfscanf.c | 10 +--
newlib/libc/machine/spu/fdopen.c | 2 +-
newlib/libc/machine/spu/fopen.c | 8 +--
newlib/libc/machine/spu/fputs.c | 4 +-
newlib/libc/machine/spu/freopen.c | 4 +-
newlib/libc/machine/spu/fsetpos.c | 4 +-
newlib/libc/machine/spu/fwrite.c | 4 +-
newlib/libc/machine/spu/impure.c | 2 +-
newlib/libc/machine/spu/perror.c | 4 +-
newlib/libc/machine/spu/puts.c | 2 +-
newlib/libc/machine/spu/remove.c | 2 +-
newlib/libc/machine/spu/rename.c | 8 +--
newlib/libc/machine/spu/sys/errno.h | 2 +-
newlib/libc/machine/spu/vfprintf.c | 2 +-
newlib/libc/machine/spu/vfscanf.c | 2 +-
newlib/libc/machine/spu/vprintf.c | 4 +-
newlib/libc/machine/spu/vscanf.c | 2 +-
newlib/libc/machine/spu/vsnprintf.c | 4 +-
newlib/libc/machine/spu/vsprintf.c | 2 +-
newlib/libc/machine/spu/vsscanf.c | 8 +--
newlib/libc/machine/xscale/strlen.c | 2 +-
newlib/libc/misc/__dprintf.c | 4 +-
newlib/libc/misc/unctrl.c | 4 +-
newlib/libc/posix/execl.c | 14 ++--
newlib/libc/posix/execle.c | 18 ++---
newlib/libc/posix/execlp.c | 14 ++--
newlib/libc/posix/execv.c | 2 +-
newlib/libc/posix/execvp.c | 4 +-
newlib/libc/posix/posix_spawn.c | 52 +++++++-------
newlib/libc/reent/execr.c | 6 +-
newlib/libc/reent/impure.c | 2 +-
newlib/libc/reent/linkr.c | 4 +-
newlib/libc/reent/mkdirr.c | 2 +-
newlib/libc/reent/open64r.c | 2 +-
newlib/libc/reent/openr.c | 2 +-
newlib/libc/reent/renamer.c | 4 +-
newlib/libc/reent/stat64r.c | 2 +-
newlib/libc/reent/statr.c | 2 +-
newlib/libc/reent/unlinkr.c | 2 +-
newlib/libc/reent/writer.c | 2 +-
newlib/libc/search/bsearch.c | 4 +-
newlib/libc/signal/psignal.c | 2 +-
newlib/libc/stdio/fdopen.c | 4 +-
newlib/libc/stdio/fiscanf.c | 4 +-
newlib/libc/stdio/fopen.c | 8 +--
newlib/libc/stdio/fputs.c | 6 +-
newlib/libc/stdio/freopen.c | 4 +-
newlib/libc/stdio/fscanf.c | 4 +-
newlib/libc/stdio/fsetpos.c | 4 +-
newlib/libc/stdio/fvwrite.c | 2 +-
newlib/libc/stdio/fvwrite.h | 2 +-
newlib/libc/stdio/fwrite.c | 6 +-
newlib/libc/stdio/fwscanf.c | 4 +-
newlib/libc/stdio/iscanf.c | 4 +-
newlib/libc/stdio/local.h | 24 +++----
newlib/libc/stdio/nano-vfprintf.c | 14 ++--
newlib/libc/stdio/nano-vfprintf_float.c | 2 +-
newlib/libc/stdio/nano-vfprintf_i.c | 4 +-
newlib/libc/stdio/nano-vfprintf_local.h | 6 +-
newlib/libc/stdio/nano-vfscanf.c | 8 +--
newlib/libc/stdio/perror.c | 4 +-
newlib/libc/stdio/puts.c | 4 +-
newlib/libc/stdio/putw.c | 2 +-
newlib/libc/stdio/remove.c | 4 +-
newlib/libc/stdio/rename.c | 4 +-
newlib/libc/stdio/scanf.c | 4 +-
newlib/libc/stdio/siprintf.c | 8 +--
newlib/libc/stdio/siscanf.c | 16 ++---
newlib/libc/stdio/sniprintf.c | 8 +--
newlib/libc/stdio/snprintf.c | 8 +--
newlib/libc/stdio/sprintf.c | 8 +--
newlib/libc/stdio/sscanf.c | 16 ++---
newlib/libc/stdio/swprintf.c | 4 +-
newlib/libc/stdio/swscanf.c | 4 +-
newlib/libc/stdio/tmpnam.c | 14 ++--
newlib/libc/stdio/vfprintf.c | 34 +++++-----
newlib/libc/stdio/vfscanf.c | 10 +--
newlib/libc/stdio/vfwprintf.c | 16 ++---
newlib/libc/stdio/vfwscanf.c | 10 +--
newlib/libc/stdio/viprintf.c | 4 +-
newlib/libc/stdio/viscanf.c | 4 +-
newlib/libc/stdio/vprintf.c | 4 +-
newlib/libc/stdio/vscanf.c | 4 +-
newlib/libc/stdio/vsiscanf.c | 8 +--
newlib/libc/stdio/vsscanf.c | 8 +--
newlib/libc/stdio/vswscanf.c | 4 +-
newlib/libc/stdio/vwprintf.c | 4 +-
newlib/libc/stdio/vwscanf.c | 4 +-
newlib/libc/stdio/wscanf.c | 4 +-
newlib/libc/stdio64/fdopen64.c | 4 +-
newlib/libc/stdio64/fopen64.c | 8 +--
newlib/libc/stdio64/freopen64.c | 8 +--
newlib/libc/stdio64/fsetpos64.c | 4 +-
newlib/libc/stdlib/__exp10.c | 2 +-
newlib/libc/stdlib/atof.c | 2 +-
newlib/libc/stdlib/atoff.c | 2 +-
newlib/libc/stdlib/atoi.c | 4 +-
newlib/libc/stdlib/atol.c | 4 +-
newlib/libc/stdlib/atoll.c | 4 +-
newlib/libc/stdlib/gdtoa-gethex.c | 6 +-
newlib/libc/stdlib/gdtoa-hexnan.c | 12 ++--
newlib/libc/stdlib/getenv.c | 4 +-
newlib/libc/stdlib/getenv_r.c | 6 +-
newlib/libc/stdlib/ldtoa.c | 108 +++++++++++++++---------------
newlib/libc/stdlib/mprec.c | 14 ++--
newlib/libc/stdlib/mprec.h | 12 ++--
newlib/libc/stdlib/setenv.c | 6 +-
newlib/libc/stdlib/setenv_r.c | 6 +-
newlib/libc/stdlib/strtod.c | 14 ++--
newlib/libc/stdlib/strtol.c | 4 +-
newlib/libc/stdlib/strtoll.c | 6 +-
newlib/libc/stdlib/strtoul.c | 4 +-
newlib/libc/stdlib/strtoull.c | 4 +-
newlib/libc/stdlib/system.c | 10 +--
newlib/libc/stdlib/wcstod.c | 8 +--
newlib/libc/stdlib/wcstol.c | 4 +-
newlib/libc/stdlib/wcstoll.c | 4 +-
newlib/libc/stdlib/wcstoul.c | 4 +-
newlib/libc/stdlib/wcstoull.c | 4 +-
newlib/libc/string/bcmp.c | 4 +-
newlib/libc/string/bcopy.c | 2 +-
newlib/libc/string/index.c | 2 +-
newlib/libc/string/memccpy.c | 6 +-
newlib/libc/string/memchr.c | 4 +-
newlib/libc/string/memcmp.c | 4 +-
newlib/libc/string/memcpy.c | 6 +-
newlib/libc/string/memmove.c | 8 +--
newlib/libc/string/mempcpy.c | 6 +-
newlib/libc/string/memrchr.c | 4 +-
newlib/libc/string/rawmemchr.c | 4 +-
newlib/libc/string/rindex.c | 2 +-
newlib/libc/string/stpcpy.c | 4 +-
newlib/libc/string/stpncpy.c | 4 +-
newlib/libc/string/strcasecmp.c | 8 +--
newlib/libc/string/strcasestr.c | 4 +-
newlib/libc/string/strcat.c | 2 +-
newlib/libc/string/strchr.c | 4 +-
newlib/libc/string/strchrnul.c | 2 +-
newlib/libc/string/strcmp.c | 4 +-
newlib/libc/string/strcoll.c | 4 +-
newlib/libc/string/strcpy.c | 6 +-
newlib/libc/string/strcspn.c | 8 +--
newlib/libc/string/strdup.c | 2 +-
newlib/libc/string/strdup_r.c | 2 +-
newlib/libc/string/strlcat.c | 2 +-
newlib/libc/string/strlcpy.c | 2 +-
newlib/libc/string/strlen.c | 4 +-
newlib/libc/string/strncasecmp.c | 8 +--
newlib/libc/string/strncat.c | 2 +-
newlib/libc/string/strncmp.c | 4 +-
newlib/libc/string/strncpy.c | 8 +--
newlib/libc/string/strndup.c | 2 +-
newlib/libc/string/strndup_r.c | 4 +-
newlib/libc/string/strnlen.c | 4 +-
newlib/libc/string/strpbrk.c | 6 +-
newlib/libc/string/strrchr.c | 4 +-
newlib/libc/string/strspn.c | 8 +--
newlib/libc/string/strstr.c | 4 +-
newlib/libc/string/strxfrm.c | 2 +-
newlib/libc/string/swab.c | 2 +-
newlib/libc/string/wcpcpy.c | 2 +-
newlib/libc/string/wcpncpy.c | 2 +-
newlib/libc/string/wcscasecmp.c | 4 +-
newlib/libc/string/wcscat.c | 4 +-
newlib/libc/string/wcschr.c | 4 +-
newlib/libc/string/wcscmp.c | 4 +-
newlib/libc/string/wcscoll.c | 4 +-
newlib/libc/string/wcscpy.c | 4 +-
newlib/libc/string/wcscspn.c | 8 +--
newlib/libc/string/wcslcat.c | 4 +-
newlib/libc/string/wcslcpy.c | 4 +-
newlib/libc/string/wcslen.c | 4 +-
newlib/libc/string/wcsncasecmp.c | 4 +-
newlib/libc/string/wcsncat.c | 4 +-
newlib/libc/string/wcsncmp.c | 4 +-
newlib/libc/string/wcsncpy.c | 2 +-
newlib/libc/string/wcsnlen.c | 4 +-
newlib/libc/string/wcspbrk.c | 8 +--
newlib/libc/string/wcsrchr.c | 4 +-
newlib/libc/string/wcsspn.c | 8 +--
newlib/libc/string/wcsstr.c | 10 +--
newlib/libc/string/wcswidth.c | 2 +-
newlib/libc/string/wcsxfrm.c | 2 +-
newlib/libc/string/wcwidth.c | 4 +-
newlib/libc/string/wmemchr.c | 2 +-
newlib/libc/string/wmemcmp.c | 4 +-
newlib/libc/string/wmemcpy.c | 2 +-
newlib/libc/string/wmemmove.c | 2 +-
newlib/libc/string/wmempcpy.c | 2 +-
newlib/libc/sys/linux/getpwent.c | 2 +-
newlib/libc/sys/linux/pwrite.c | 4 +-
newlib/libc/sys/linux/sys/errno.h | 2 +-
newlib/libc/sys/phoenix/sys/errno.h | 2 +-
newlib/libc/syscalls/sysexecve.c | 6 +-
newlib/libc/syscalls/syslink.c | 4 +-
newlib/libc/syscalls/sysstat.c | 2 +-
newlib/libc/syscalls/sysunlink.c | 2 +-
newlib/libc/time/asctime.c | 2 +-
newlib/libc/time/asctime_r.c | 6 +-
newlib/libc/time/ctime.c | 2 +-
newlib/libc/time/ctime_r.c | 2 +-
newlib/libc/time/gmtime.c | 2 +-
newlib/libc/time/gmtime_r.c | 4 +-
newlib/libc/time/lcltime.c | 2 +-
newlib/libc/time/lcltime_r.c | 6 +-
newlib/libc/time/local.h | 2 +-
newlib/libc/time/mktime.c | 4 +-
newlib/libc/time/month_lengths.c | 2 +-
newlib/libc/time/strftime.c | 8 +--
newlib/libc/time/strptime.c | 2 +-
newlib/libc/time/tzcalc_limits.c | 6 +-
newlib/libc/unix/getut.c | 2 +-
newlib/libc/unix/pwrite.c | 4 +-
newlib/libc/xdr/xdr_mem.c | 24 +++----
newlib/libc/xdr/xdr_private.c | 4 +-
newlib/libc/xdr/xdr_rec.c | 14 ++--
newlib/libc/xdr/xdr_sizeof.c | 4 +-
newlib/libc/xdr/xdr_stdio.c | 14 ++--
newlib/libm/test/string.c | 2 +-
newlib/libm/test/test.c | 4 +-
newlib/libm/test/test.h | 2 +-
winsup/cygwin/libc/strptime.cc | 2 +-
322 files changed, 1145 insertions(+), 1147 deletions(-)
diff --git a/newlib/libc/ctype/ctype_.c b/newlib/libc/ctype/ctype_.c
index 9e3cdcf05..28727e8a8 100644
--- a/newlib/libc/ctype/ctype_.c
+++ b/newlib/libc/ctype/ctype_.c
@@ -87,7 +87,7 @@ static char sccsid[] = "@(#)ctype_.c 5.6 (Berkeley) 6/1/90";
/* No static const on Cygwin since it's referenced and potentially overwritten
for compatibility with older applications. */
#ifndef __CYGWIN__
-_CONST
+const
#endif
char _ctype_b[128 + 256] = {
_CTYPE_DATA_128_255,
@@ -116,7 +116,7 @@ __asm__ (" \n\
# endif
# else /* !__CYGWIN__ */
-_CONST char _ctype_[1 + 256] = {
+const char _ctype_[1 + 256] = {
0,
_CTYPE_DATA_0_127,
_CTYPE_DATA_128_255
@@ -125,7 +125,7 @@ _CONST char _ctype_[1 + 256] = {
#else /* !ALLOW_NEGATIVE_CTYPE_INDEX */
-_CONST char _ctype_[1 + 256] = {
+const char _ctype_[1 + 256] = {
0,
_CTYPE_DATA_0_127,
_CTYPE_DATA_128_255
diff --git a/newlib/libc/ctype/ctype_.h b/newlib/libc/ctype/ctype_.h
index 5356d3815..a73870b3e 100644
--- a/newlib/libc/ctype/ctype_.h
+++ b/newlib/libc/ctype/ctype_.h
@@ -7,7 +7,7 @@
#ifdef ALLOW_NEGATIVE_CTYPE_INDEX
#ifndef __CYGWIN__
- extern _CONST char _ctype_b[];
+ extern const char _ctype_b[];
#else
extern char _ctype_b[];
#endif
diff --git a/newlib/libc/ctype/ctype_cp.h b/newlib/libc/ctype/ctype_cp.h
index 004c1e2e8..9370778a2 100644
--- a/newlib/libc/ctype/ctype_cp.h
+++ b/newlib/libc/ctype/ctype_cp.h
@@ -473,7 +473,7 @@
#if defined(ALLOW_NEGATIVE_CTYPE_INDEX)
#ifndef __CYGWIN__
-static _CONST
+static const
#endif
char __ctype_cp[26][128 + 256] = {
{ _CTYPE_CP437_128_254,
@@ -636,7 +636,7 @@ char __ctype_cp[26][128 + 256] = {
#else /* !defined(ALLOW_NEGATIVE_CTYPE_INDEX) */
-static _CONST char __ctype_cp[26][1 + 256] = {
+static const char __ctype_cp[26][1 + 256] = {
{ 0,
_CTYPE_DATA_0_127,
_CTYPE_CP437_128_254,
diff --git a/newlib/libc/ctype/ctype_iso.h b/newlib/libc/ctype/ctype_iso.h
index ed1d5d674..60087dc92 100644
--- a/newlib/libc/ctype/ctype_iso.h
+++ b/newlib/libc/ctype/ctype_iso.h
@@ -277,7 +277,7 @@ extern int __iso_8859_index (const char *charset_ext);
#if defined(ALLOW_NEGATIVE_CTYPE_INDEX)
#ifndef __CYGWIN__
-static _CONST
+static const
#endif
char __ctype_iso[15][128 + 256] = {
{ _CTYPE_ISO_8859_1_128_254,
@@ -374,7 +374,7 @@ char __ctype_iso[15][128 + 256] = {
#else /* !defined(ALLOW_NEGATIVE_CTYPE_INDEX) */
-static _CONST char __ctype_iso[15][1 + 256] = {
+static const char __ctype_iso[15][1 + 256] = {
{ 0,
_CTYPE_DATA_0_127,
_CTYPE_ISO_8859_1_128_254,
diff --git a/newlib/libc/iconv/ccs/big5.c b/newlib/libc/iconv/ccs/big5.c
index 45ea59b64..02b20a195 100644
--- a/newlib/libc/iconv/ccs/big5.c
+++ b/newlib/libc/iconv/ccs/big5.c
@@ -21,7 +21,7 @@
#if defined (ICONV_TO_UCS_CCS_BIG5) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_big5[] =
{
/* Heading Block */
@@ -2972,7 +2972,7 @@ to_ucs_speed_big5[] =
#if defined (ICONV_TO_UCS_CCS_BIG5) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_size_big5[] =
{
0x00B0, /* Ranges number */
@@ -5092,7 +5092,7 @@ to_ucs_size_big5[] =
#if defined (ICONV_FROM_UCS_CCS_BIG5) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_speed_big5[] =
{
/* Heading Block */
@@ -8407,7 +8407,7 @@ from_ucs_speed_big5[] =
#if defined (ICONV_FROM_UCS_CCS_BIG5) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_size_big5[] =
{
0x0235, /* Ranges number */
@@ -12579,7 +12579,7 @@ from_ucs_size_big5[] =
* big5 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_big5 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/ccs.h b/newlib/libc/iconv/ccs/ccs.h
index d17f4ab91..c640b6444 100644
--- a/newlib/libc/iconv/ccs/ccs.h
+++ b/newlib/libc/iconv/ccs/ccs.h
@@ -131,12 +131,12 @@
typedef struct
{
__uint16_t ver; /* Table version */
- _CONST char *name; /* CCS name */
+ const char *name; /* CCS name */
__uint16_t bits; /* CCS's bits number */
int from_ucs_type; /* UCS -> CCS table optimization type */
- _CONST __uint16_t *from_ucs; /* UCS -> CCS table */
+ const __uint16_t *from_ucs; /* UCS -> CCS table */
int to_ucs_type; /* CCS -> UCS table optimization type */
- _CONST __uint16_t *to_ucs; /* CCS -> UCS table */
+ const __uint16_t *to_ucs; /* CCS -> UCS table */
} iconv_ccs_t;
/*
@@ -147,11 +147,11 @@ typedef struct
int bits; /* CCS's bits number */
int type; /* Table type (builtin/external) */
int optimization; /* Table optimization type (speed/size) */
- _CONST __uint16_t *tbl; /* Table's data */
+ const __uint16_t *tbl; /* Table's data */
} iconv_ccs_desc_t;
/* Array containing all built-in CCS tables */
-extern _CONST iconv_ccs_t *
+extern const iconv_ccs_t *
_iconv_ccs[];
#endif /* __CCS_H__ */
diff --git a/newlib/libc/iconv/ccs/ccsbi.c b/newlib/libc/iconv/ccs/ccsbi.c
index d79a2ce91..6bb489aa6 100644
--- a/newlib/libc/iconv/ccs/ccsbi.c
+++ b/newlib/libc/iconv/ccs/ccsbi.c
@@ -8,7 +8,7 @@
/*
* The following array contains the list of built-in CCS tables.
*/
-_CONST iconv_ccs_t *
+const iconv_ccs_t *
_iconv_ccs[] =
{
#if defined (ICONV_TO_UCS_CCS_CP775) \
diff --git a/newlib/libc/iconv/ccs/ccsbi.h b/newlib/libc/iconv/ccs/ccsbi.h
index 268cac30e..97a88a0e7 100644
--- a/newlib/libc/iconv/ccs/ccsbi.h
+++ b/newlib/libc/iconv/ccs/ccsbi.h
@@ -310,207 +310,207 @@
*/
#if defined (ICONV_TO_UCS_CCS_BIG5) \
|| defined (ICONV_FROM_UCS_CCS_BIG5)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_big5;
#endif
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
|| defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cns11643_plane1;
#endif
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
|| defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cns11643_plane14;
#endif
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
|| defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cns11643_plane2;
#endif
#if defined (ICONV_TO_UCS_CCS_CP775) \
|| defined (ICONV_FROM_UCS_CCS_CP775)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cp775;
#endif
#if defined (ICONV_TO_UCS_CCS_CP850) \
|| defined (ICONV_FROM_UCS_CCS_CP850)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cp850;
#endif
#if defined (ICONV_TO_UCS_CCS_CP852) \
|| defined (ICONV_FROM_UCS_CCS_CP852)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cp852;
#endif
#if defined (ICONV_TO_UCS_CCS_CP855) \
|| defined (ICONV_FROM_UCS_CCS_CP855)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cp855;
#endif
#if defined (ICONV_TO_UCS_CCS_CP866) \
|| defined (ICONV_FROM_UCS_CCS_CP866)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_cp866;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_1) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_1)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_1;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_10) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_10)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_10;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_11) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_11)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_11;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_13) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_13)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_13;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_14) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_14)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_14;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_15) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_15)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_15;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_2) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_2)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_2;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_3) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_3)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_3;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_4) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_4)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_4;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_5) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_5)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_5;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_6) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_6)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_6;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_7) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_7)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_7;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_8) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_8)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_8;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_8859_9) \
|| defined (ICONV_FROM_UCS_CCS_ISO_8859_9)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_8859_9;
#endif
#if defined (ICONV_TO_UCS_CCS_ISO_IR_111) \
|| defined (ICONV_FROM_UCS_CCS_ISO_IR_111)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_iso_ir_111;
#endif
#if defined (ICONV_TO_UCS_CCS_JIS_X0201_1976) \
|| defined (ICONV_FROM_UCS_CCS_JIS_X0201_1976)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_jis_x0201_1976;
#endif
#if defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
|| defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_jis_x0208_1990;
#endif
#if defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
|| defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_jis_x0212_1990;
#endif
#if defined (ICONV_TO_UCS_CCS_KOI8_R) \
|| defined (ICONV_FROM_UCS_CCS_KOI8_R)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_koi8_r;
#endif
#if defined (ICONV_TO_UCS_CCS_KOI8_RU) \
|| defined (ICONV_FROM_UCS_CCS_KOI8_RU)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_koi8_ru;
#endif
#if defined (ICONV_TO_UCS_CCS_KOI8_U) \
|| defined (ICONV_FROM_UCS_CCS_KOI8_U)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_koi8_u;
#endif
#if defined (ICONV_TO_UCS_CCS_KOI8_UNI) \
|| defined (ICONV_FROM_UCS_CCS_KOI8_UNI)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_koi8_uni;
#endif
#if defined (ICONV_TO_UCS_CCS_KSX1001) \
|| defined (ICONV_FROM_UCS_CCS_KSX1001)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_ksx1001;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1250) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1250)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1250;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1251) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1251)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1251;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1252) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1252)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1252;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1253) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1253)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1253;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1254) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1254)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1254;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1255) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1255)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1255;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1256) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1256)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1256;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1257) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1257)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1257;
#endif
#if defined (ICONV_TO_UCS_CCS_WIN_1258) \
|| defined (ICONV_FROM_UCS_CCS_WIN_1258)
-extern _CONST iconv_ccs_t
+extern const iconv_ccs_t
_iconv_ccs_win_1258;
#endif
diff --git a/newlib/libc/iconv/ccs/cns11643_plane1.c b/newlib/libc/iconv/ccs/cns11643_plane1.c
index 37e31a9a8..da1c0597c 100644
--- a/newlib/libc/iconv/ccs/cns11643_plane1.c
+++ b/newlib/libc/iconv/ccs/cns11643_plane1.c
@@ -21,7 +21,7 @@
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cns11643_plane1[] =
{
/* Heading Block */
@@ -2213,7 +2213,7 @@ to_ucs_speed_cns11643_plane1[] =
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE1) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_size_cns11643_plane1[] =
{
0x0042, /* Ranges number */
@@ -3118,7 +3118,7 @@ to_ucs_size_cns11643_plane1[] =
#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_speed_cns11643_plane1[] =
{
/* Heading Block */
@@ -6367,7 +6367,7 @@ from_ucs_speed_cns11643_plane1[] =
#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE1) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_size_cns11643_plane1[] =
{
0x017D, /* Ranges number */
@@ -11175,7 +11175,7 @@ from_ucs_size_cns11643_plane1[] =
* cns11643_plane1 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cns11643_plane1 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cns11643_plane14.c b/newlib/libc/iconv/ccs/cns11643_plane14.c
index 18230d5ab..507cdef65 100644
--- a/newlib/libc/iconv/ccs/cns11643_plane14.c
+++ b/newlib/libc/iconv/ccs/cns11643_plane14.c
@@ -21,7 +21,7 @@
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cns11643_plane14[] =
{
/* Heading Block */
@@ -2411,7 +2411,7 @@ to_ucs_speed_cns11643_plane14[] =
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE14) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_size_cns11643_plane14[] =
{
0x00DE, /* Ranges number */
@@ -4011,7 +4011,7 @@ to_ucs_size_cns11643_plane14[] =
#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_speed_cns11643_plane14[] =
{
/* Heading Block */
@@ -6765,7 +6765,7 @@ from_ucs_speed_cns11643_plane14[] =
#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE14) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_size_cns11643_plane14[] =
{
0x00C5, /* Ranges number */
@@ -10727,7 +10727,7 @@ from_ucs_size_cns11643_plane14[] =
* cns11643_plane14 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cns11643_plane14 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cns11643_plane2.c b/newlib/libc/iconv/ccs/cns11643_plane2.c
index c591ce38d..15c287f0b 100644
--- a/newlib/libc/iconv/ccs/cns11643_plane2.c
+++ b/newlib/libc/iconv/ccs/cns11643_plane2.c
@@ -21,7 +21,7 @@
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cns11643_plane2[] =
{
/* Heading Block */
@@ -2774,7 +2774,7 @@ to_ucs_speed_cns11643_plane2[] =
#if defined (ICONV_TO_UCS_CCS_CNS11643_PLANE2) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_size_cns11643_plane2[] =
{
0x0052, /* Ranges number */
@@ -3936,7 +3936,7 @@ to_ucs_size_cns11643_plane2[] =
#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_speed_cns11643_plane2[] =
{
/* Heading Block */
@@ -6690,7 +6690,7 @@ from_ucs_speed_cns11643_plane2[] =
#if defined (ICONV_FROM_UCS_CCS_CNS11643_PLANE2) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_size_cns11643_plane2[] =
{
0x027E, /* Ranges number */
@@ -11912,7 +11912,7 @@ from_ucs_size_cns11643_plane2[] =
* cns11643_plane2 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cns11643_plane2 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cp775.c b/newlib/libc/iconv/ccs/cp775.c
index c35a87c11..f7c4af58c 100644
--- a/newlib/libc/iconv/ccs/cp775.c
+++ b/newlib/libc/iconv/ccs/cp775.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_CP775)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cp775[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_cp775[] =
#if defined (ICONV_FROM_UCS_CCS_CP775)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_cp775[] =
{
W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_cp775[] =
* cp775 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cp775 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cp850.c b/newlib/libc/iconv/ccs/cp850.c
index 305ae85d1..57f5906d1 100644
--- a/newlib/libc/iconv/ccs/cp850.c
+++ b/newlib/libc/iconv/ccs/cp850.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_CP850)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cp850[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_cp850[] =
#if defined (ICONV_FROM_UCS_CCS_CP850)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_cp850[] =
{
W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -284,7 +284,7 @@ from_ucs_speed_cp850[] =
* cp850 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cp850 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cp852.c b/newlib/libc/iconv/ccs/cp852.c
index 73a1e0f03..c622da499 100644
--- a/newlib/libc/iconv/ccs/cp852.c
+++ b/newlib/libc/iconv/ccs/cp852.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_CP852)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cp852[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_cp852[] =
#if defined (ICONV_FROM_UCS_CCS_CP852)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_cp852[] =
{
W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -284,7 +284,7 @@ from_ucs_speed_cp852[] =
* cp852 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cp852 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cp855.c b/newlib/libc/iconv/ccs/cp855.c
index 2add727ea..41c52ed93 100644
--- a/newlib/libc/iconv/ccs/cp855.c
+++ b/newlib/libc/iconv/ccs/cp855.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_CP855)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cp855[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_cp855[] =
#if defined (ICONV_FROM_UCS_CCS_CP855)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_cp855[] =
{
W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -284,7 +284,7 @@ from_ucs_speed_cp855[] =
* cp855 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cp855 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/cp866.c b/newlib/libc/iconv/ccs/cp866.c
index 678ea4232..c1dacd8f1 100644
--- a/newlib/libc/iconv/ccs/cp866.c
+++ b/newlib/libc/iconv/ccs/cp866.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_CP866)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_cp866[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_cp866[] =
#if defined (ICONV_FROM_UCS_CCS_CP866)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_cp866[] =
{
W(0x00A0), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_cp866[] =
* cp866 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_cp866 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_1.c b/newlib/libc/iconv/ccs/iso_8859_1.c
index a23947775..775bca654 100644
--- a/newlib/libc/iconv/ccs/iso_8859_1.c
+++ b/newlib/libc/iconv/ccs/iso_8859_1.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_1)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_1[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_1[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_1)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_1[] =
{
W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -185,7 +185,7 @@ from_ucs_speed_iso_8859_1[] =
* iso_8859_1 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_1 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_10.c b/newlib/libc/iconv/ccs/iso_8859_10.c
index 1848afd66..b221a6a82 100644
--- a/newlib/libc/iconv/ccs/iso_8859_10.c
+++ b/newlib/libc/iconv/ccs/iso_8859_10.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_10)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_10[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_10[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_10)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_10[] =
{
W(0x0138), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_10[] =
* iso_8859_10 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_10 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_11.c b/newlib/libc/iconv/ccs/iso_8859_11.c
index 97cc0757e..ebb5ec6d9 100644
--- a/newlib/libc/iconv/ccs/iso_8859_11.c
+++ b/newlib/libc/iconv/ccs/iso_8859_11.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_11)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_11[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_11[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_11)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_11[] =
{
W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -218,7 +218,7 @@ from_ucs_speed_iso_8859_11[] =
* iso_8859_11 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_11 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_13.c b/newlib/libc/iconv/ccs/iso_8859_13.c
index 88a2a6f40..3905cef65 100644
--- a/newlib/libc/iconv/ccs/iso_8859_13.c
+++ b/newlib/libc/iconv/ccs/iso_8859_13.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_13)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_13[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_13[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_13)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_13[] =
{
W(0x2019), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_13[] =
* iso_8859_13 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_13 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_14.c b/newlib/libc/iconv/ccs/iso_8859_14.c
index 28052a7b7..114d2df33 100644
--- a/newlib/libc/iconv/ccs/iso_8859_14.c
+++ b/newlib/libc/iconv/ccs/iso_8859_14.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_14)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_14[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_14[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_14)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_14[] =
{
W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_14[] =
* iso_8859_14 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_14 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_15.c b/newlib/libc/iconv/ccs/iso_8859_15.c
index da3cfc3bb..52dff022b 100644
--- a/newlib/libc/iconv/ccs/iso_8859_15.c
+++ b/newlib/libc/iconv/ccs/iso_8859_15.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_15)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_15[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_15[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_15)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_15[] =
{
W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_15[] =
* iso_8859_15 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_15 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_2.c b/newlib/libc/iconv/ccs/iso_8859_2.c
index 5a1966632..ecb374e4d 100644
--- a/newlib/libc/iconv/ccs/iso_8859_2.c
+++ b/newlib/libc/iconv/ccs/iso_8859_2.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_2)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_2[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_2[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_2)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_2[] =
{
W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_2[] =
* iso_8859_2 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_2 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_3.c b/newlib/libc/iconv/ccs/iso_8859_3.c
index a69fcb362..6f8003402 100644
--- a/newlib/libc/iconv/ccs/iso_8859_3.c
+++ b/newlib/libc/iconv/ccs/iso_8859_3.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_3)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_3[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_3[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_3)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_3[] =
{
W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_3[] =
* iso_8859_3 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_3 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_4.c b/newlib/libc/iconv/ccs/iso_8859_4.c
index 0cec45823..b080e2d29 100644
--- a/newlib/libc/iconv/ccs/iso_8859_4.c
+++ b/newlib/libc/iconv/ccs/iso_8859_4.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_4)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_4[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_4[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_4)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_4[] =
{
W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_4[] =
* iso_8859_4 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_4 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_5.c b/newlib/libc/iconv/ccs/iso_8859_5.c
index e4765ffef..b4b0c3f47 100644
--- a/newlib/libc/iconv/ccs/iso_8859_5.c
+++ b/newlib/libc/iconv/ccs/iso_8859_5.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_5)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_5[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_5[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_5)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_5[] =
{
W(0x045F), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_5[] =
* iso_8859_5 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_5 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_6.c b/newlib/libc/iconv/ccs/iso_8859_6.c
index 783cf1f36..9967841f4 100644
--- a/newlib/libc/iconv/ccs/iso_8859_6.c
+++ b/newlib/libc/iconv/ccs/iso_8859_6.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_6)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_6[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_6[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_6)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_6[] =
{
W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -218,7 +218,7 @@ from_ucs_speed_iso_8859_6[] =
* iso_8859_6 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_6 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_7.c b/newlib/libc/iconv/ccs/iso_8859_7.c
index e964a02e6..41d3400ce 100644
--- a/newlib/libc/iconv/ccs/iso_8859_7.c
+++ b/newlib/libc/iconv/ccs/iso_8859_7.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_7)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_7[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_7[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_7)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_7[] =
{
W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_7[] =
* iso_8859_7 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_7 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_8.c b/newlib/libc/iconv/ccs/iso_8859_8.c
index bf49604db..029a4b873 100644
--- a/newlib/libc/iconv/ccs/iso_8859_8.c
+++ b/newlib/libc/iconv/ccs/iso_8859_8.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_8)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_8[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_8[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_8)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_8[] =
{
W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_8859_8[] =
* iso_8859_8 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_8 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_8859_9.c b/newlib/libc/iconv/ccs/iso_8859_9.c
index 20fbb8424..b787b9815 100644
--- a/newlib/libc/iconv/ccs/iso_8859_9.c
+++ b/newlib/libc/iconv/ccs/iso_8859_9.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_8859_9)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_8859_9[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_8859_9[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_8859_9)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_8859_9[] =
{
W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -218,7 +218,7 @@ from_ucs_speed_iso_8859_9[] =
* iso_8859_9 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_8859_9 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/iso_ir_111.c b/newlib/libc/iconv/ccs/iso_ir_111.c
index 0e9bcc4da..7d05ef4d5 100644
--- a/newlib/libc/iconv/ccs/iso_ir_111.c
+++ b/newlib/libc/iconv/ccs/iso_ir_111.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_ISO_IR_111)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_iso_ir_111[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_iso_ir_111[] =
#if defined (ICONV_FROM_UCS_CCS_ISO_IR_111)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_iso_ir_111[] =
{
W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -251,7 +251,7 @@ from_ucs_speed_iso_ir_111[] =
* iso_ir_111 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_iso_ir_111 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/jis_x0201_1976.c b/newlib/libc/iconv/ccs/jis_x0201_1976.c
index e5cdb5fdd..ca949861d 100644
--- a/newlib/libc/iconv/ccs/jis_x0201_1976.c
+++ b/newlib/libc/iconv/ccs/jis_x0201_1976.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_JIS_X0201_1976)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_jis_x0201_1976[] =
{
INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,INVALC,
@@ -75,7 +75,7 @@ to_ucs_speed_jis_x0201_1976[] =
#if defined (ICONV_FROM_UCS_CCS_JIS_X0201_1976)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_jis_x0201_1976[] =
{
W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -185,7 +185,7 @@ from_ucs_speed_jis_x0201_1976[] =
* jis_x0201_1976 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_jis_x0201_1976 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/jis_x0208_1990.c b/newlib/libc/iconv/ccs/jis_x0208_1990.c
index c12d13482..070e0e4b0 100644
--- a/newlib/libc/iconv/ccs/jis_x0208_1990.c
+++ b/newlib/libc/iconv/ccs/jis_x0208_1990.c
@@ -21,7 +21,7 @@
#if defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_jis_x0208_1990[] =
{
/* Heading Block */
@@ -2609,7 +2609,7 @@ to_ucs_speed_jis_x0208_1990[] =
#if defined (ICONV_TO_UCS_CCS_JIS_X0208_1990) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_size_jis_x0208_1990[] =
{
0x0055, /* Ranges number */
@@ -3684,7 +3684,7 @@ to_ucs_size_jis_x0208_1990[] =
#if defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_speed_jis_x0208_1990[] =
{
/* Heading Block */
@@ -6801,7 +6801,7 @@ from_ucs_speed_jis_x0208_1990[] =
#if defined (ICONV_FROM_UCS_CCS_JIS_X0208_1990) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_size_jis_x0208_1990[] =
{
0x01E9, /* Ranges number */
@@ -12125,7 +12125,7 @@ from_ucs_size_jis_x0208_1990[] =
* jis_x0208_1990 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_jis_x0208_1990 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/jis_x0212_1990.c b/newlib/libc/iconv/ccs/jis_x0212_1990.c
index eb8882f46..613de7d35 100644
--- a/newlib/libc/iconv/ccs/jis_x0212_1990.c
+++ b/newlib/libc/iconv/ccs/jis_x0212_1990.c
@@ -21,7 +21,7 @@
#if defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_jis_x0212_1990[] =
{
/* Heading Block */
@@ -2312,7 +2312,7 @@ to_ucs_speed_jis_x0212_1990[] =
#if defined (ICONV_TO_UCS_CCS_JIS_X0212_1990) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_size_jis_x0212_1990[] =
{
0x0049, /* Ranges number */
@@ -3262,7 +3262,7 @@ to_ucs_size_jis_x0212_1990[] =
#if defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_speed_jis_x0212_1990[] =
{
/* Heading Block */
@@ -6214,7 +6214,7 @@ from_ucs_speed_jis_x0212_1990[] =
#if defined (ICONV_FROM_UCS_CCS_JIS_X0212_1990) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_size_jis_x0212_1990[] =
{
0x01AA, /* Ranges number */
@@ -11349,7 +11349,7 @@ from_ucs_size_jis_x0212_1990[] =
* jis_x0212_1990 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_jis_x0212_1990 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/koi8_r.c b/newlib/libc/iconv/ccs/koi8_r.c
index cccb7c1d5..698652e74 100644
--- a/newlib/libc/iconv/ccs/koi8_r.c
+++ b/newlib/libc/iconv/ccs/koi8_r.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_KOI8_R)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_koi8_r[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_koi8_r[] =
#if defined (ICONV_FROM_UCS_CCS_KOI8_R)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_koi8_r[] =
{
W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_koi8_r[] =
* koi8_r CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_koi8_r =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/koi8_ru.c b/newlib/libc/iconv/ccs/koi8_ru.c
index 704ce95b0..956dc7802 100644
--- a/newlib/libc/iconv/ccs/koi8_ru.c
+++ b/newlib/libc/iconv/ccs/koi8_ru.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_KOI8_RU)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_koi8_ru[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_koi8_ru[] =
#if defined (ICONV_FROM_UCS_CCS_KOI8_RU)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_koi8_ru[] =
{
W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -350,7 +350,7 @@ from_ucs_speed_koi8_ru[] =
* koi8_ru CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_koi8_ru =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/koi8_u.c b/newlib/libc/iconv/ccs/koi8_u.c
index ebe0c9172..d271e7e88 100644
--- a/newlib/libc/iconv/ccs/koi8_u.c
+++ b/newlib/libc/iconv/ccs/koi8_u.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_KOI8_U)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_koi8_u[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_koi8_u[] =
#if defined (ICONV_FROM_UCS_CCS_KOI8_U)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_koi8_u[] =
{
W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_koi8_u[] =
* koi8_u CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_koi8_u =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/koi8_uni.c b/newlib/libc/iconv/ccs/koi8_uni.c
index 5596c2d91..4523d1c78 100644
--- a/newlib/libc/iconv/ccs/koi8_uni.c
+++ b/newlib/libc/iconv/ccs/koi8_uni.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_KOI8_UNI)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_koi8_uni[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_koi8_uni[] =
#if defined (ICONV_FROM_UCS_CCS_KOI8_UNI)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_koi8_uni[] =
{
W(0x042A), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -350,7 +350,7 @@ from_ucs_speed_koi8_uni[] =
* koi8_uni CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_koi8_uni =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/ksx1001.c b/newlib/libc/iconv/ccs/ksx1001.c
index ad2c30d73..5690e4acc 100644
--- a/newlib/libc/iconv/ccs/ksx1001.c
+++ b/newlib/libc/iconv/ccs/ksx1001.c
@@ -21,7 +21,7 @@
#if defined (ICONV_TO_UCS_CCS_KSX1001) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_ksx1001[] =
{
/* Heading Block */
@@ -3005,7 +3005,7 @@ to_ucs_speed_ksx1001[] =
#if defined (ICONV_TO_UCS_CCS_KSX1001) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_size_ksx1001[] =
{
0x005D, /* Ranges number */
@@ -4266,7 +4266,7 @@ to_ucs_size_ksx1001[] =
#if defined (ICONV_FROM_UCS_CCS_KSX1001) \
&& !(defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_speed_ksx1001[] =
{
/* Heading Block */
@@ -9099,7 +9099,7 @@ from_ucs_speed_ksx1001[] =
#if defined (ICONV_FROM_UCS_CCS_KSX1001) \
&& (defined (TABLE_USE_SIZE_OPTIMIZATION))
-static _CONST __uint16_t
+static const __uint16_t
from_ucs_size_ksx1001[] =
{
0x01B6, /* Ranges number */
@@ -15576,7 +15576,7 @@ from_ucs_size_ksx1001[] =
* ksx1001 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_ksx1001 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/mktbl.pl b/newlib/libc/iconv/ccs/mktbl.pl
index c3b87932b..633511e4d 100755
--- a/newlib/libc/iconv/ccs/mktbl.pl
+++ b/newlib/libc/iconv/ccs/mktbl.pl
@@ -343,7 +343,7 @@ if ($Source)
* $CCSName CCS description table.
* $Separator
*/
-_CONST $TypeBICCS
+const $TypeBICCS
$VarBICCS =
{
\t$MacroVer1Table, /* Table version */
@@ -807,7 +807,7 @@ sub Output8bitToUCS(;$)
*/
#if defined ($GuardToUCS)
-static _CONST __uint16_t
+static const __uint16_t
${VarToUCSSpeed}\[] =
{\n\t";
}
@@ -872,7 +872,7 @@ sub Output8bitFromUCS(;$)
#if defined ($GuardFromUCS)
-static _CONST unsigned char
+static const unsigned char
${VarFromUCSSpeed}\[] =
{
";
@@ -995,7 +995,7 @@ sub OutputSpeed($;$)
#if defined ($GuardToUCS) \\
&& !($GuardSize)
-static _CONST __uint16_t
+static const __uint16_t
${VarToUCSSpeed}\[] =
{
";
@@ -1018,7 +1018,7 @@ ${VarToUCSSpeed}\[] =
#if defined ($GuardFromUCS) \\
&& !($GuardSize)
-static _CONST __uint16_t
+static const __uint16_t
${VarFromUCSSpeed}\[] =
{
";
@@ -1149,7 +1149,7 @@ sub OutputSize($;$)
#if defined ($GuardToUCS) \\
&& ($GuardSize)
-static _CONST __uint16_t
+static const __uint16_t
${VarToUCSSize}\[] =
{
";
@@ -1171,7 +1171,7 @@ ${VarToUCSSize}\[] =
#if defined ($GuardFromUCS) \\
&& ($GuardSize)
-static _CONST __uint16_t
+static const __uint16_t
${VarFromUCSSize}\[] =
{
";
diff --git a/newlib/libc/iconv/ccs/win_1250.c b/newlib/libc/iconv/ccs/win_1250.c
index e43eb8d3e..d86d6a0ad 100644
--- a/newlib/libc/iconv/ccs/win_1250.c
+++ b/newlib/libc/iconv/ccs/win_1250.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1250)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1250[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1250[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1250)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1250[] =
{
W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_win_1250[] =
* win_1250 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1250 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1251.c b/newlib/libc/iconv/ccs/win_1251.c
index 7e9b4c339..195fc0a60 100644
--- a/newlib/libc/iconv/ccs/win_1251.c
+++ b/newlib/libc/iconv/ccs/win_1251.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1251)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1251[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1251[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1251)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1251[] =
{
W(0x044F), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -284,7 +284,7 @@ from_ucs_speed_win_1251[] =
* win_1251 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1251 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1252.c b/newlib/libc/iconv/ccs/win_1252.c
index 659054fc4..463cabdfb 100644
--- a/newlib/libc/iconv/ccs/win_1252.c
+++ b/newlib/libc/iconv/ccs/win_1252.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1252)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1252[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1252[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1252)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1252[] =
{
W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_win_1252[] =
* win_1252 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1252 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1253.c b/newlib/libc/iconv/ccs/win_1253.c
index 450813320..c9abd81da 100644
--- a/newlib/libc/iconv/ccs/win_1253.c
+++ b/newlib/libc/iconv/ccs/win_1253.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1253)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1253[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1253[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1253)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1253[] =
{
W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_win_1253[] =
* win_1253 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1253 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1254.c b/newlib/libc/iconv/ccs/win_1254.c
index 3c1599add..05ed88efb 100644
--- a/newlib/libc/iconv/ccs/win_1254.c
+++ b/newlib/libc/iconv/ccs/win_1254.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1254)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1254[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1254[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1254)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1254[] =
{
W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_win_1254[] =
* win_1254 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1254 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1255.c b/newlib/libc/iconv/ccs/win_1255.c
index 937afca5b..47e9c0129 100644
--- a/newlib/libc/iconv/ccs/win_1255.c
+++ b/newlib/libc/iconv/ccs/win_1255.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1255)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1255[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1255[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1255)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1255[] =
{
W(0xFFFF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -350,7 +350,7 @@ from_ucs_speed_win_1255[] =
* win_1255 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1255 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1256.c b/newlib/libc/iconv/ccs/win_1256.c
index 44d451987..93a1f074d 100644
--- a/newlib/libc/iconv/ccs/win_1256.c
+++ b/newlib/libc/iconv/ccs/win_1256.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1256)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1256[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1256[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1256)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1256[] =
{
W(0x06D2), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -350,7 +350,7 @@ from_ucs_speed_win_1256[] =
* win_1256 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1256 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1257.c b/newlib/libc/iconv/ccs/win_1257.c
index ad497cbf4..4f9fa39a7 100644
--- a/newlib/libc/iconv/ccs/win_1257.c
+++ b/newlib/libc/iconv/ccs/win_1257.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1257)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1257[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1257[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1257)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1257[] =
{
W(0x02D9), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -317,7 +317,7 @@ from_ucs_speed_win_1257[] =
* win_1257 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1257 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ccs/win_1258.c b/newlib/libc/iconv/ccs/win_1258.c
index 7331d78d9..42ec24724 100644
--- a/newlib/libc/iconv/ccs/win_1258.c
+++ b/newlib/libc/iconv/ccs/win_1258.c
@@ -28,7 +28,7 @@
*/
#if defined (ICONV_TO_UCS_CCS_WIN_1258)
-static _CONST __uint16_t
+static const __uint16_t
to_ucs_speed_win_1258[] =
{
0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007,
@@ -75,7 +75,7 @@ to_ucs_speed_win_1258[] =
#if defined (ICONV_FROM_UCS_CCS_WIN_1258)
-static _CONST unsigned char
+static const unsigned char
from_ucs_speed_win_1258[] =
{
W(0x00FF), /* Real 0xFF mapping. 0xFF is used to mark invalid codes */
@@ -350,7 +350,7 @@ from_ucs_speed_win_1258[] =
* win_1258 CCS description table.
* ======================================================================
*/
-_CONST iconv_ccs_t
+const iconv_ccs_t
_iconv_ccs_win_1258 =
{
TABLE_VERSION_1, /* Table version */
diff --git a/newlib/libc/iconv/ces/cesbi.c b/newlib/libc/iconv/ces/cesbi.c
index c2e6520a3..5fa5d1b4c 100644
--- a/newlib/libc/iconv/ces/cesbi.c
+++ b/newlib/libc/iconv/ces/cesbi.c
@@ -12,7 +12,7 @@
*/
#if defined (ICONV_TO_UCS_CES_EUC) \
|| defined (ICONV_FROM_UCS_CES_EUC)
-static _CONST char *
+static const char *
iconv_ces_names_euc[] =
{
# if defined (_ICONV_FROM_ENCODING_EUC_JP) \
@@ -33,7 +33,7 @@ iconv_ces_names_euc[] =
#if defined (ICONV_TO_UCS_CES_TABLE) \
|| defined (ICONV_FROM_UCS_CES_TABLE)
-static _CONST char *
+static const char *
iconv_ces_names_table[] =
{
# if defined (_ICONV_FROM_ENCODING_CP775) \
@@ -174,7 +174,7 @@ iconv_ces_names_table[] =
#if defined (ICONV_TO_UCS_CES_TABLE_PCS) \
|| defined (ICONV_FROM_UCS_CES_TABLE_PCS)
-static _CONST char *
+static const char *
iconv_ces_names_table_pcs[] =
{
# if defined (_ICONV_FROM_ENCODING_BIG5) \
@@ -187,7 +187,7 @@ iconv_ces_names_table_pcs[] =
#if defined (ICONV_TO_UCS_CES_UCS_2) \
|| defined (ICONV_FROM_UCS_CES_UCS_2)
-static _CONST char *
+static const char *
iconv_ces_names_ucs_2[] =
{
# if defined (_ICONV_FROM_ENCODING_UCS_2) \
@@ -208,7 +208,7 @@ iconv_ces_names_ucs_2[] =
#if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL) \
|| defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
-static _CONST char *
+static const char *
iconv_ces_names_ucs_2_internal[] =
{
# if defined (_ICONV_FROM_ENCODING_UCS_2_INTERNAL) \
@@ -221,7 +221,7 @@ iconv_ces_names_ucs_2_internal[] =
#if defined (ICONV_TO_UCS_CES_UCS_4) \
|| defined (ICONV_FROM_UCS_CES_UCS_4)
-static _CONST char *
+static const char *
iconv_ces_names_ucs_4[] =
{
# if defined (_ICONV_FROM_ENCODING_UCS_4) \
@@ -242,7 +242,7 @@ iconv_ces_names_ucs_4[] =
#if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL) \
|| defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
-static _CONST char *
+static const char *
iconv_ces_names_ucs_4_internal[] =
{
# if defined (_ICONV_FROM_ENCODING_UCS_4_INTERNAL) \
@@ -255,7 +255,7 @@ iconv_ces_names_ucs_4_internal[] =
#if defined (ICONV_TO_UCS_CES_US_ASCII) \
|| defined (ICONV_FROM_UCS_CES_US_ASCII)
-static _CONST char *
+static const char *
iconv_ces_names_us_ascii[] =
{
# if defined (_ICONV_FROM_ENCODING_US_ASCII) \
@@ -268,7 +268,7 @@ iconv_ces_names_us_ascii[] =
#if defined (ICONV_TO_UCS_CES_UTF_16) \
|| defined (ICONV_FROM_UCS_CES_UTF_16)
-static _CONST char *
+static const char *
iconv_ces_names_utf_16[] =
{
# if defined (_ICONV_FROM_ENCODING_UTF_16) \
@@ -289,7 +289,7 @@ iconv_ces_names_utf_16[] =
#if defined (ICONV_TO_UCS_CES_UTF_8) \
|| defined (ICONV_FROM_UCS_CES_UTF_8)
-static _CONST char *
+static const char *
iconv_ces_names_utf_8[] =
{
# if defined (_ICONV_FROM_ENCODING_UTF_8) \
@@ -303,99 +303,99 @@ iconv_ces_names_utf_8[] =
/*
* The following structure contains the list of "to UCS" linked-in CES converters.
*/
-_CONST iconv_to_ucs_ces_t
+const iconv_to_ucs_ces_t
_iconv_to_ucs_ces[] =
{
#ifdef ICONV_TO_UCS_CES_EUC
- {(_CONST char **)iconv_ces_names_euc,
+ {(const char **)iconv_ces_names_euc,
&_iconv_to_ucs_ces_handlers_euc},
#endif
#ifdef ICONV_TO_UCS_CES_TABLE
- {(_CONST char **)iconv_ces_names_table,
+ {(const char **)iconv_ces_names_table,
&_iconv_to_ucs_ces_handlers_table},
#endif
#ifdef ICONV_TO_UCS_CES_TABLE_PCS
- {(_CONST char **)iconv_ces_names_table_pcs,
+ {(const char **)iconv_ces_names_table_pcs,
&_iconv_to_ucs_ces_handlers_table_pcs},
#endif
#ifdef ICONV_TO_UCS_CES_UCS_2
- {(_CONST char **)iconv_ces_names_ucs_2,
+ {(const char **)iconv_ces_names_ucs_2,
&_iconv_to_ucs_ces_handlers_ucs_2},
#endif
#ifdef ICONV_TO_UCS_CES_UCS_2_INTERNAL
- {(_CONST char **)iconv_ces_names_ucs_2_internal,
+ {(const char **)iconv_ces_names_ucs_2_internal,
&_iconv_to_ucs_ces_handlers_ucs_2_internal},
#endif
#ifdef ICONV_TO_UCS_CES_UCS_4
- {(_CONST char **)iconv_ces_names_ucs_4,
+ {(const char **)iconv_ces_names_ucs_4,
&_iconv_to_ucs_ces_handlers_ucs_4},
#endif
#ifdef ICONV_TO_UCS_CES_UCS_4_INTERNAL
- {(_CONST char **)iconv_ces_names_ucs_4_internal,
+ {(const char **)iconv_ces_names_ucs_4_internal,
&_iconv_to_ucs_ces_handlers_ucs_4_internal},
#endif
#ifdef ICONV_TO_UCS_CES_US_ASCII
- {(_CONST char **)iconv_ces_names_us_ascii,
+ {(const char **)iconv_ces_names_us_ascii,
&_iconv_to_ucs_ces_handlers_us_ascii},
#endif
#ifdef ICONV_TO_UCS_CES_UTF_16
- {(_CONST char **)iconv_ces_names_utf_16,
+ {(const char **)iconv_ces_names_utf_16,
&_iconv_to_ucs_ces_handlers_utf_16},
#endif
#ifdef ICONV_TO_UCS_CES_UTF_8
- {(_CONST char **)iconv_ces_names_utf_8,
+ {(const char **)iconv_ces_names_utf_8,
&_iconv_to_ucs_ces_handlers_utf_8},
#endif
- {(_CONST char **)NULL,
+ {(const char **)NULL,
(iconv_to_ucs_ces_handlers_t *)NULL}
};
/*
* The following structure contains the list of "from UCS" linked-in CES converters.
*/
-_CONST iconv_from_ucs_ces_t
+const iconv_from_ucs_ces_t
_iconv_from_ucs_ces[] =
{
#ifdef ICONV_FROM_UCS_CES_EUC
- {(_CONST char **)iconv_ces_names_euc,
+ {(const char **)iconv_ces_names_euc,
&_iconv_from_ucs_ces_handlers_euc},
#endif
#ifdef ICONV_FROM_UCS_CES_TABLE
- {(_CONST char **)iconv_ces_names_table,
+ {(const char **)iconv_ces_names_table,
&_iconv_from_ucs_ces_handlers_table},
#endif
#ifdef ICONV_FROM_UCS_CES_TABLE_PCS
- {(_CONST char **)iconv_ces_names_table_pcs,
+ {(const char **)iconv_ces_names_table_pcs,
&_iconv_from_ucs_ces_handlers_table_pcs},
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_2
- {(_CONST char **)iconv_ces_names_ucs_2,
+ {(const char **)iconv_ces_names_ucs_2,
&_iconv_from_ucs_ces_handlers_ucs_2},
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_2_INTERNAL
- {(_CONST char **)iconv_ces_names_ucs_2_internal,
+ {(const char **)iconv_ces_names_ucs_2_internal,
&_iconv_from_ucs_ces_handlers_ucs_2_internal},
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_4
- {(_CONST char **)iconv_ces_names_ucs_4,
+ {(const char **)iconv_ces_names_ucs_4,
&_iconv_from_ucs_ces_handlers_ucs_4},
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_4_INTERNAL
- {(_CONST char **)iconv_ces_names_ucs_4_internal,
+ {(const char **)iconv_ces_names_ucs_4_internal,
&_iconv_from_ucs_ces_handlers_ucs_4_internal},
#endif
#ifdef ICONV_FROM_UCS_CES_US_ASCII
- {(_CONST char **)iconv_ces_names_us_ascii,
+ {(const char **)iconv_ces_names_us_ascii,
&_iconv_from_ucs_ces_handlers_us_ascii},
#endif
#ifdef ICONV_FROM_UCS_CES_UTF_16
- {(_CONST char **)iconv_ces_names_utf_16,
+ {(const char **)iconv_ces_names_utf_16,
&_iconv_from_ucs_ces_handlers_utf_16},
#endif
#ifdef ICONV_FROM_UCS_CES_UTF_8
- {(_CONST char **)iconv_ces_names_utf_8,
+ {(const char **)iconv_ces_names_utf_8,
&_iconv_from_ucs_ces_handlers_utf_8},
#endif
- {(_CONST char **)NULL,
+ {(const char **)NULL,
(iconv_from_ucs_ces_handlers_t *)NULL}
};
diff --git a/newlib/libc/iconv/ces/cesbi.h b/newlib/libc/iconv/ces/cesbi.h
index 67e85ef3c..2b157c216 100644
--- a/newlib/libc/iconv/ces/cesbi.h
+++ b/newlib/libc/iconv/ces/cesbi.h
@@ -183,92 +183,92 @@
* These handlers are actually defined in correspondent CES converter files.
*/
#ifdef ICONV_TO_UCS_CES_EUC
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_euc;
#endif
#ifdef ICONV_FROM_UCS_CES_EUC
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_euc;
#endif
#ifdef ICONV_TO_UCS_CES_TABLE
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_table;
#endif
#ifdef ICONV_FROM_UCS_CES_TABLE
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_table;
#endif
#ifdef ICONV_TO_UCS_CES_TABLE_PCS
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_table_pcs;
#endif
#ifdef ICONV_FROM_UCS_CES_TABLE_PCS
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_table_pcs;
#endif
#ifdef ICONV_TO_UCS_CES_UCS_2
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_ucs_2;
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_2
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_ucs_2;
#endif
#ifdef ICONV_TO_UCS_CES_UCS_2_INTERNAL
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_ucs_2_internal;
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_2_INTERNAL
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_ucs_2_internal;
#endif
#ifdef ICONV_TO_UCS_CES_UCS_4
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_ucs_4;
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_4
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_ucs_4;
#endif
#ifdef ICONV_TO_UCS_CES_UCS_4_INTERNAL
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_ucs_4_internal;
#endif
#ifdef ICONV_FROM_UCS_CES_UCS_4_INTERNAL
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_ucs_4_internal;
#endif
#ifdef ICONV_TO_UCS_CES_US_ASCII
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_us_ascii;
#endif
#ifdef ICONV_FROM_UCS_CES_US_ASCII
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_us_ascii;
#endif
#ifdef ICONV_TO_UCS_CES_UTF_16
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_utf_16;
#endif
#ifdef ICONV_FROM_UCS_CES_UTF_16
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_utf_16;
#endif
#ifdef ICONV_TO_UCS_CES_UTF_8
-extern _CONST iconv_to_ucs_ces_handlers_t
+extern const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_utf_8;
#endif
#ifdef ICONV_FROM_UCS_CES_UTF_8
-extern _CONST iconv_from_ucs_ces_handlers_t
+extern const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_utf_8;
#endif
diff --git a/newlib/libc/iconv/ces/euc.c b/newlib/libc/iconv/ces/euc.c
index 62bab771e..ab309a585 100644
--- a/newlib/libc/iconv/ces/euc.c
+++ b/newlib/libc/iconv/ces/euc.c
@@ -103,7 +103,7 @@ static euc_cs_desc_t euc_kr_cs_desc [] =
static _VOID_PTR
_DEFUN(euc_from_ucs_init, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
int i;
euc_data_t *data;
@@ -263,7 +263,7 @@ _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
static _VOID_PTR
_DEFUN(euc_to_ucs_init, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
int i;
euc_data_t *data;
@@ -347,7 +347,7 @@ _DEFUN(euc_to_ucs_close, (rptr, data),
static ucs4_t
_DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft)
{
int i;
@@ -366,8 +366,8 @@ _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
for (i = 1; d->desc[i].csname != NULL; i++)
{
- if (memcmp((_CONST _VOID_PTR)(*inbuf),
- (_CONST _VOID_PTR)d->desc[i].prefix,
+ if (memcmp((const _VOID_PTR)(*inbuf),
+ (const _VOID_PTR)d->desc[i].prefix,
d->desc[i].prefixbytes) == 0)
{
if (((int)*inbytesleft - d->desc[i].prefixbytes - d->desc[i].bytes) < 0)
@@ -388,7 +388,7 @@ _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
res = _iconv_to_ucs_ces_handlers_table.convert_to_ucs (
d->data[i],
- (_CONST unsigned char **)&inbuf1,
+ (const unsigned char **)&inbuf1,
&inbytesleft1);
if (((__int32_t)res) > 0)
{
@@ -419,7 +419,7 @@ _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
res = _iconv_to_ucs_ces_handlers_table.convert_to_ucs (
d->data[0],
- (_CONST unsigned char **)&inbuf1,
+ (const unsigned char **)&inbuf1,
&inbytesleft1);
if (((__int32_t)res) > 0)
{
@@ -439,7 +439,7 @@ _DEFUN(euc_get_mb_cur_max, (data),
}
#if defined (ICONV_FROM_UCS_CES_EUC)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_euc =
{
euc_from_ucs_init,
@@ -453,7 +453,7 @@ _iconv_from_ucs_ces_handlers_euc =
#endif
#if defined (ICONV_TO_UCS_CES_EUC)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_euc =
{
euc_to_ucs_init,
diff --git a/newlib/libc/iconv/ces/mkdeps.pl b/newlib/libc/iconv/ces/mkdeps.pl
index 92dd20dfb..d78dfe8f8 100755
--- a/newlib/libc/iconv/ces/mkdeps.pl
+++ b/newlib/libc/iconv/ces/mkdeps.pl
@@ -524,12 +524,12 @@ sub generate_cesbi_h($$)
foreach my $ces (@ces)
{
print CESBI_H "#ifdef $macro_to_ucs_ces\U$ces\n";
- print CESBI_H "extern _CONST iconv_to_ucs_ces_handlers_t\n";
+ print CESBI_H "extern const iconv_to_ucs_ces_handlers_t\n";
print CESBI_H "$var_to_ucs_handlers$ces;\n";
print CESBI_H "#endif\n";
print CESBI_H "#ifdef $macro_from_ucs_ces\U$ces\n";
- print CESBI_H "extern _CONST iconv_from_ucs_ces_handlers_t\n";
+ print CESBI_H "extern const iconv_from_ucs_ces_handlers_t\n";
print CESBI_H "$var_from_ucs_handlers$ces;\n";
print CESBI_H "#endif\n\n";
}
@@ -584,7 +584,7 @@ sub generate_aliasesbi_c($)
print ALIASESBI_C "$comment_automatic\n\n";
print ALIASESBI_C "#include <_ansi.h>\n";
print ALIASESBI_C "#include \"encnames.h\"\n\n";
- print ALIASESBI_C "_CONST char *\n";
+ print ALIASESBI_C "const char *\n";
print ALIASESBI_C "$var_aliases =\n";
print ALIASESBI_C "{\n";
@@ -749,7 +749,7 @@ sub generate_ccsbi_h($)
{
print CCSBI_H "#if defined ($macro_to_ucs_ccs\U$ccs) \\\n";
print CCSBI_H " || defined ($macro_from_ucs_ccs\U$ccs)\n";
- print CCSBI_H "extern _CONST iconv_ccs_t\n";
+ print CCSBI_H "extern const iconv_ccs_t\n";
print CCSBI_H "$var_ccs$ccs;\n";
print CCSBI_H "#endif\n";
}
@@ -789,7 +789,7 @@ sub generate_cesbi_c($)
{
print CESBI_C "#if defined ($macro_to_ucs_ces\U$ces) \\\n";
print CESBI_C " || defined ($macro_from_ucs_ces\U$ces)\n";
- print CESBI_C "static _CONST char *\n";
+ print CESBI_C "static const char *\n";
print CESBI_C "$var_ces_names${ces}\[] =\n";
print CESBI_C "{\n";
my @encodings = sort @{$cesenc{$ces}};
@@ -808,36 +808,36 @@ sub generate_cesbi_c($)
print CESBI_C "/*\n";
print CESBI_C " * The following structure contains the list of \"to UCS\" linked-in CES converters.\n";
print CESBI_C " */\n";
- print CESBI_C "_CONST iconv_to_ucs_ces_t\n";
+ print CESBI_C "const iconv_to_ucs_ces_t\n";
print CESBI_C "_iconv_to_ucs_ces[] =\n";
print CESBI_C "{\n";
foreach my $ces (@ces)
{
print CESBI_C "#ifdef $macro_to_ucs_ces\U$ces\n";
- print CESBI_C " {(_CONST char **)$var_ces_names$ces,\n";
+ print CESBI_C " {(const char **)$var_ces_names$ces,\n";
print CESBI_C " &$var_to_ucs_handlers$ces},\n";
print CESBI_C "#endif\n";
}
- print CESBI_C " {(_CONST char **)NULL,\n";
+ print CESBI_C " {(const char **)NULL,\n";
print CESBI_C " (iconv_to_ucs_ces_handlers_t *)NULL}\n";
print CESBI_C "};\n\n";
print CESBI_C "/*\n";
print CESBI_C " * The following structure contains the list of \"from UCS\" linked-in CES converters.\n";
print CESBI_C " */\n";
- print CESBI_C "_CONST iconv_from_ucs_ces_t\n";
+ print CESBI_C "const iconv_from_ucs_ces_t\n";
print CESBI_C "_iconv_from_ucs_ces[] =\n";
print CESBI_C "{\n";
foreach my $ces (@ces)
{
print CESBI_C "#ifdef $macro_from_ucs_ces\U$ces\n";
- print CESBI_C " {(_CONST char **)$var_ces_names$ces,\n";
+ print CESBI_C " {(const char **)$var_ces_names$ces,\n";
print CESBI_C " &$var_from_ucs_handlers$ces},\n";
print CESBI_C "#endif\n";
}
- print CESBI_C " {(_CONST char **)NULL,\n";
+ print CESBI_C " {(const char **)NULL,\n";
print CESBI_C " (iconv_from_ucs_ces_handlers_t *)NULL}\n";
print CESBI_C "};\n";
@@ -866,7 +866,7 @@ sub generate_ccsbi_c($)
print CESBI_C " * The following array contains the list of built-in CCS tables.\n";
print CESBI_C " */\n";
- print CESBI_C "_CONST iconv_ccs_t *\n";
+ print CESBI_C "const iconv_ccs_t *\n";
print CESBI_C "_iconv_ccs[] =\n";
print CESBI_C "{\n";
diff --git a/newlib/libc/iconv/ces/table-pcs.c b/newlib/libc/iconv/ces/table-pcs.c
index 650bf9af2..1bab90986 100644
--- a/newlib/libc/iconv/ces/table-pcs.c
+++ b/newlib/libc/iconv/ces/table-pcs.c
@@ -67,7 +67,7 @@ _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
static _VOID_PTR
_DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
return _iconv_from_ucs_ces_handlers_table.init (rptr, encoding);
}
@@ -93,7 +93,7 @@ _DEFUN(table_pcs_from_ucs_get_mb_cur_max, (data),
static ucs4_t
_DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft)
{
if (*inbytesleft < 1)
@@ -115,7 +115,7 @@ _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
static _VOID_PTR
_DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
return _iconv_to_ucs_ces_handlers_table.init (rptr, encoding);
}
@@ -138,7 +138,7 @@ _DEFUN(table_pcs_to_ucs_get_mb_cur_max, (data),
#endif /* ICONV_TO_UCS_CES_TABLE_PCS */
#if defined (ICONV_FROM_UCS_CES_TABLE_PCS)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_table_pcs =
{
table_pcs_from_ucs_init,
@@ -152,7 +152,7 @@ _iconv_from_ucs_ces_handlers_table_pcs =
#endif
#if defined (ICONV_TO_UCS_CES_TABLE_PCS)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_table_pcs =
{
table_pcs_to_ucs_init,
diff --git a/newlib/libc/iconv/ces/table.c b/newlib/libc/iconv/ces/table.c
index 39c358cda..c02831a5b 100644
--- a/newlib/libc/iconv/ces/table.c
+++ b/newlib/libc/iconv/ces/table.c
@@ -57,17 +57,17 @@
*/
static ucs2_t
-_EXFUN(find_code_size, (ucs2_t code, _CONST __uint16_t *tblp));
+_EXFUN(find_code_size, (ucs2_t code, const __uint16_t *tblp));
static __inline ucs2_t
-_EXFUN(find_code_speed, (ucs2_t code, _CONST __uint16_t *tblp));
+_EXFUN(find_code_speed, (ucs2_t code, const __uint16_t *tblp));
static __inline ucs2_t
-_EXFUN(find_code_speed_8bit, (ucs2_t code, _CONST unsigned char *tblp));
+_EXFUN(find_code_speed_8bit, (ucs2_t code, const unsigned char *tblp));
#ifdef _ICONV_ENABLE_EXTERNAL_CCS
-static _CONST iconv_ccs_desc_t *
-_EXFUN(load_file, (struct _reent *rptr, _CONST char *name, int direction));
+static const iconv_ccs_desc_t *
+_EXFUN(load_file, (struct _reent *rptr, const char *name, int direction));
#endif
/*
@@ -78,7 +78,7 @@ _DEFUN(table_close, (rptr, data),
struct _reent *rptr,
_VOID_PTR data)
{
- _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
+ const iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
if (ccsp->type == TABLE_EXTERNAL)
_free_r (rptr, (_VOID_PTR)ccsp->tbl);
@@ -91,10 +91,10 @@ _DEFUN(table_close, (rptr, data),
static _VOID_PTR
_DEFUN(table_init_from_ucs, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
int i;
- _CONST iconv_ccs_t *biccsp = NULL;
+ const iconv_ccs_t *biccsp = NULL;
iconv_ccs_desc_t *ccsp;
for (i = 0; _iconv_ccs[i] != NULL; i++)
@@ -133,7 +133,7 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
unsigned char **outbuf,
size_t *outbytesleft)
{
- _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
+ const iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
ucs2_t code;
if (in > 0xFFFF || in == INVALC)
@@ -142,7 +142,7 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
if (ccsp->bits == TABLE_8BIT)
{
code = find_code_speed_8bit ((ucs2_t)in,
- (_CONST unsigned char *)ccsp->tbl);
+ (const unsigned char *)ccsp->tbl);
if (code == INVALC)
return (size_t)ICONV_CES_INVALID_CHARACTER;
**outbuf = (unsigned char)code;
@@ -174,10 +174,10 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
static _VOID_PTR
_DEFUN(table_init_to_ucs, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
int i;
- _CONST iconv_ccs_t *biccsp = NULL;
+ const iconv_ccs_t *biccsp = NULL;
iconv_ccs_desc_t *ccsp;
for (i = 0; _iconv_ccs[i] != NULL; i++)
@@ -212,10 +212,10 @@ _DEFUN(table_init_to_ucs, (rptr, encoding),
static ucs4_t
_DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft)
{
- _CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
+ const iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
ucs2_t ucs;
if (ccsp->bits == TABLE_8BIT)
@@ -261,7 +261,7 @@ _DEFUN(table_get_mb_cur_max, (data),
#if defined (ICONV_TO_UCS_CES_TABLE)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_table =
{
table_init_to_ucs,
@@ -275,7 +275,7 @@ _iconv_to_ucs_ces_handlers_table =
#endif /* ICONV_FROM_UCS_CES_TABLE */
#if defined (ICONV_FROM_UCS_CES_TABLE)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_table =
{
table_init_from_ucs,
@@ -297,7 +297,7 @@ _iconv_from_ucs_ces_handlers_table =
*
* PARAMETERS:
* ucs2_t code - code whose mapping to find.
- * _CONST __uint16_t *tblp - table pointer.
+ * const __uint16_t *tblp - table pointer.
*
* RETURN:
* Code that corresponds to 'code'.
@@ -305,7 +305,7 @@ _iconv_from_ucs_ces_handlers_table =
static __inline ucs2_t
_DEFUN(find_code_speed, (code, tblp),
ucs2_t code,
- _CONST __uint16_t *tblp)
+ const __uint16_t *tblp)
{
int idx = tblp[code >> 8];
@@ -320,7 +320,7 @@ _DEFUN(find_code_speed, (code, tblp),
*
* PARAMETERS:
* ucs2_t code - code whose mapping to find.
- * _CONST __uint16_t *tblp - table pointer.
+ * const __uint16_t *tblp - table pointer.
*
* RETURN:
* Code that corresponds to 'code'.
@@ -328,7 +328,7 @@ _DEFUN(find_code_speed, (code, tblp),
static __inline ucs2_t
_DEFUN(find_code_speed_8bit, (code, tblp),
ucs2_t code,
- _CONST unsigned char *tblp)
+ const unsigned char *tblp)
{
int idx;
unsigned char ccs;
@@ -360,7 +360,7 @@ _DEFUN(find_code_speed_8bit, (code, tblp),
*
* PARAMETERS:
* ucs2_t code - code whose mapping to find.
- * _CONST __uint16_t *tblp - table pointer.
+ * const __uint16_t *tblp - table pointer.
*
* RETURN:
* Code that corresponds to 'code'.
@@ -368,7 +368,7 @@ _DEFUN(find_code_speed_8bit, (code, tblp),
static ucs2_t
_DEFUN(find_code_size, (code, tblp),
ucs2_t code,
- _CONST __uint16_t *tblp)
+ const __uint16_t *tblp)
{
int first, last, cur, center;
@@ -447,7 +447,7 @@ _DEFUN(find_code_size, (code, tblp),
*
* PARAMETERS:
* struct _reent *rptr - reent structure of current thread/process.
- * _CONST char *name - encoding name.
+ * const char *name - encoding name.
* int direction - conversion direction.
*
* DESCRIPTION:
@@ -459,17 +459,17 @@ _DEFUN(find_code_size, (code, tblp),
* RETURN:
* iconv_ccs_desc_t * pointer is success, NULL if failure.
*/
-static _CONST iconv_ccs_desc_t *
+static const iconv_ccs_desc_t *
_DEFUN(load_file, (rptr, name, direction),
struct _reent *rptr,
- _CONST char *name,
+ const char *name,
int direction)
{
int fd;
- _CONST unsigned char *buf;
+ const unsigned char *buf;
int tbllen, hdrlen;
off_t off;
- _CONST char *fname;
+ const char *fname;
iconv_ccs_desc_t *ccsp = NULL;
int nmlen = strlen(name);
/* Since CCS table name length can vary - it is aligned (by adding extra
@@ -487,7 +487,7 @@ _DEFUN(load_file, (rptr, name, direction),
if ((fd = _open_r (rptr, fname, O_RDONLY, S_IRUSR)) == -1)
goto error1;
- if ((buf = (_CONST unsigned char *)_malloc_r (rptr, hdrlen)) == NULL)
+ if ((buf = (const unsigned char *)_malloc_r (rptr, hdrlen)) == NULL)
goto error2;
if (_read_r (rptr, fd, (_VOID_PTR)buf, hdrlen) != hdrlen)
diff --git a/newlib/libc/iconv/ces/ucs-2-internal.c b/newlib/libc/iconv/ces/ucs-2-internal.c
index 2aacce912..7aed01e88 100644
--- a/newlib/libc/iconv/ces/ucs-2-internal.c
+++ b/newlib/libc/iconv/ces/ucs-2-internal.c
@@ -68,7 +68,7 @@ _DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
static ucs4_t
_DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft),
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft)
{
register ucs4_t res;
@@ -96,7 +96,7 @@ _DEFUN(ucs_2_internal_get_mb_cur_max, (data),
}
#if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_ucs_2_internal =
{
NULL,
@@ -110,7 +110,7 @@ _iconv_to_ucs_ces_handlers_ucs_2_internal =
#endif
#if defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_ucs_2_internal =
{
NULL,
diff --git a/newlib/libc/iconv/ces/ucs-2.c b/newlib/libc/iconv/ces/ucs-2.c
index 000a7912f..7d03ee890 100644
--- a/newlib/libc/iconv/ces/ucs-2.c
+++ b/newlib/libc/iconv/ces/ucs-2.c
@@ -52,7 +52,7 @@
static _VOID_PTR
_DEFUN(ucs_2_init, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
int *data;
@@ -107,7 +107,7 @@ _DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
static ucs4_t
_DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft),
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft)
{
ucs4_t res;
@@ -139,7 +139,7 @@ _DEFUN(ucs_2_get_mb_cur_max, (data),
}
#if defined (ICONV_TO_UCS_CES_UCS_2)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_ucs_2 =
{
ucs_2_init,
@@ -153,7 +153,7 @@ _iconv_to_ucs_ces_handlers_ucs_2 =
#endif
#if defined (ICONV_FROM_UCS_CES_UCS_2)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_ucs_2 =
{
ucs_2_init,
diff --git a/newlib/libc/iconv/ces/ucs-4-internal.c b/newlib/libc/iconv/ces/ucs-4-internal.c
index 4266b2afc..1df5f3fc6 100644
--- a/newlib/libc/iconv/ces/ucs-4-internal.c
+++ b/newlib/libc/iconv/ces/ucs-4-internal.c
@@ -68,7 +68,7 @@ _DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
static ucs4_t
_DEFUN(ucs_4_internal_convert_to_ucs, (data, inbuf, inbytesleft),
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft)
{
register ucs4_t res;
@@ -96,7 +96,7 @@ _DEFUN(ucs_4_internal_get_mb_cur_max, (data),
}
#if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_ucs_4_internal =
{
NULL,
@@ -110,7 +110,7 @@ _iconv_to_ucs_ces_handlers_ucs_4_internal =
#endif
#if defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_ucs_4_internal =
{
NULL,
diff --git a/newlib/libc/iconv/ces/ucs-4.c b/newlib/libc/iconv/ces/ucs-4.c
index 1d028c5dd..8fbfa6aa1 100644
--- a/newlib/libc/iconv/ces/ucs-4.c
+++ b/newlib/libc/iconv/ces/ucs-4.c
@@ -53,7 +53,7 @@
static _VOID_PTR
_DEFUN(ucs_4_init, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
int *data;
@@ -109,7 +109,7 @@ _DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft),
static ucs4_t
_DEFUN(ucs_4_convert_to_ucs, (data, inbuf, inbytesleft),
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft)
{
ucs4_t res;
@@ -141,7 +141,7 @@ _DEFUN(ucs_4_get_mb_cur_max, (data),
}
#if defined (ICONV_TO_UCS_CES_UCS_4)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_ucs_4 =
{
ucs_4_init,
@@ -155,7 +155,7 @@ _iconv_to_ucs_ces_handlers_ucs_4 =
#endif
#if defined (ICONV_FROM_UCS_CES_UCS_4)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_ucs_4 =
{
ucs_4_init,
diff --git a/newlib/libc/iconv/ces/us-ascii.c b/newlib/libc/iconv/ces/us-ascii.c
index eb4dee6e3..1fc7c5d89 100644
--- a/newlib/libc/iconv/ces/us-ascii.c
+++ b/newlib/libc/iconv/ces/us-ascii.c
@@ -62,7 +62,7 @@ _DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
static ucs4_t
_DEFUN(us_ascii_convert_to_ucs, (data, inbuf, inbytesleft),
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft)
{
ucs4_t res;
@@ -90,7 +90,7 @@ _DEFUN(us_ascii_get_mb_cur_max, (data),
}
#if defined (ICONV_TO_UCS_CES_US_ASCII)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_us_ascii =
{
NULL,
@@ -104,7 +104,7 @@ _iconv_to_ucs_ces_handlers_us_ascii =
#endif
#if defined (ICONV_FROM_UCS_CES_US_ASCII)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_us_ascii =
{
NULL,
diff --git a/newlib/libc/iconv/ces/utf-16.c b/newlib/libc/iconv/ces/utf-16.c
index 93cc4c341..fee97b0ee 100644
--- a/newlib/libc/iconv/ces/utf-16.c
+++ b/newlib/libc/iconv/ces/utf-16.c
@@ -70,7 +70,7 @@ _DEFUN(utf_16_close, (rptr, data),
static _VOID_PTR
_DEFUN(utf_16_init_from_ucs, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
int *data;
@@ -172,7 +172,7 @@ _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
static _VOID_PTR
_DEFUN(utf_16_init_to_ucs, (rptr, encoding),
struct _reent *rptr,
- _CONST char *encoding)
+ const char *encoding)
{
int *data;
@@ -192,7 +192,7 @@ _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
static ucs4_t
_DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft)
{
register ucs2_t w1;
@@ -275,7 +275,7 @@ _DEFUN(utf_16_get_mb_cur_max, (data),
}
#if defined (ICONV_TO_UCS_CES_UTF_16)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_utf_16 =
{
utf_16_init_to_ucs,
@@ -289,7 +289,7 @@ _iconv_to_ucs_ces_handlers_utf_16 =
#endif
#if defined (ICONV_FROM_UCS_CES_UTF_16)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_utf_16 =
{
utf_16_init_from_ucs,
diff --git a/newlib/libc/iconv/ces/utf-8.c b/newlib/libc/iconv/ces/utf-8.c
index f02dd6fcc..ae778d12d 100644
--- a/newlib/libc/iconv/ces/utf-8.c
+++ b/newlib/libc/iconv/ces/utf-8.c
@@ -127,10 +127,10 @@ _DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
static ucs4_t
_DEFUN(convert_to_ucs, (data, inbuf, inbytesleft),
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft)
{
- register _CONST unsigned char *in = *inbuf;
+ register const unsigned char *in = *inbuf;
register size_t bytes;
ucs4_t res;
@@ -266,7 +266,7 @@ _DEFUN(get_mb_cur_max, (data),
}
#if defined (ICONV_TO_UCS_CES_UTF_8)
-_CONST iconv_to_ucs_ces_handlers_t
+const iconv_to_ucs_ces_handlers_t
_iconv_to_ucs_ces_handlers_utf_8 =
{
NULL,
@@ -280,7 +280,7 @@ _iconv_to_ucs_ces_handlers_utf_8 =
#endif
#if defined (ICONV_FROM_UCS_CES_UTF_8)
-_CONST iconv_from_ucs_ces_handlers_t
+const iconv_from_ucs_ces_handlers_t
_iconv_from_ucs_ces_handlers_utf_8 =
{
NULL,
diff --git a/newlib/libc/iconv/lib/aliasesbi.c b/newlib/libc/iconv/lib/aliasesbi.c
index 36c434e16..dfd7090d0 100644
--- a/newlib/libc/iconv/lib/aliasesbi.c
+++ b/newlib/libc/iconv/lib/aliasesbi.c
@@ -5,7 +5,7 @@
#include <_ansi.h>
#include "encnames.h"
-_CONST char *
+const char *
_iconv_aliases =
{
#if defined (_ICONV_FROM_ENCODING_BIG5) \
diff --git a/newlib/libc/iconv/lib/aliasesi.c b/newlib/libc/iconv/lib/aliasesi.c
index 278b84915..1f4f70ffc 100644
--- a/newlib/libc/iconv/lib/aliasesi.c
+++ b/newlib/libc/iconv/lib/aliasesi.c
@@ -38,7 +38,7 @@
*
* PARAMETERS:
* struct _reent *rptr - reent structure of current thread/process.
- * _CONST char *str - string to canonize.
+ * const char *str - string to canonize.
*
* DESCRIPTION:
* Converts all letters to small and substitute all '-' characters by '_'
@@ -47,15 +47,15 @@
* RETURN:
* Returns canonical form of 'str' if success, NULL if failure.
*/
-static _CONST char *
+static const char *
_DEFUN(canonical_form, (rptr, str),
struct _reent *rptr,
- _CONST char *str)
+ const char *str)
{
char *p, *p1;
if (str == NULL || (p = p1 = _strdup_r (rptr, str)) == NULL)
- return (_CONST char *)NULL;
+ return (const char *)NULL;
for (; *str; str++, p++)
{
@@ -65,7 +65,7 @@ _DEFUN(canonical_form, (rptr, str),
*p = tolower (*str);
}
- return (_CONST char *)p1;
+ return (const char *)p1;
}
/*
@@ -73,8 +73,8 @@ _DEFUN(canonical_form, (rptr, str),
*
* PARAMETERS:
* struct _reent *rptr - reent structure of current thread/process.
- * _CONST char *alias - alias by which "official" name should be found.
- * _CONST char *table - aliases table.
+ * const char *alias - alias by which "official" name should be found.
+ * const char *table - aliases table.
* int len - aliases table length.
*
* DESCRIPTION:
@@ -95,15 +95,15 @@ _DEFUN(canonical_form, (rptr, str),
static char *
_DEFUN(find_alias, (rptr, alias, table, len),
struct _reent *rptr,
- _CONST char *alias,
- _CONST char *table,
+ const char *alias,
+ const char *table,
int len)
{
- _CONST char *end;
- _CONST char *p;
+ const char *end;
+ const char *p;
int l = strlen (alias);
- _CONST char *ptable = table;
- _CONST char *table_end = table + len;
+ const char *ptable = table;
+ const char *table_end = table + len;
if (table == NULL || alias == NULL || *table == '\0' || *alias == '\0')
return NULL;
@@ -136,7 +136,7 @@ search_again:
*
* PARAMETERS:
* struct _reent *rptr - reent structure of current thread/process.
- * _CONST char *ca - encoding alias to resolve.
+ * const char *ca - encoding alias to resolve.
*
* DESCRIPTION:
* First, tries to find 'ca' among built-in aliases. If not found, tries to
@@ -149,7 +149,7 @@ search_again:
char *
_DEFUN(_iconv_resolve_encoding_name, (rptr, cname, path),
struct _reent *rptr,
- _CONST char *ca)
+ const char *ca)
{
char *p = (char *)ca;
diff --git a/newlib/libc/iconv/lib/conv.h b/newlib/libc/iconv/lib/conv.h
index 550f44949..f0088767e 100644
--- a/newlib/libc/iconv/lib/conv.h
+++ b/newlib/libc/iconv/lib/conv.h
@@ -52,8 +52,8 @@ typedef struct
*
* PARAMETERS:
* struct _reent *rptr - reent structure of current thread/process;
- * _CONST char *to - output encoding's normalized name;
- * _CONST char *from - input encoding's normalized name.
+ * const char *to - output encoding's normalized name;
+ * const char *from - input encoding's normalized name.
*
* DESCRIPTION:
* This function is called from iconv_open() to open conversion. Returns
@@ -64,8 +64,8 @@ typedef struct
* returns NULL and sets current thread's/process's errno.
*/
_VOID_PTR _EXFNPTR(open, (struct _reent *rptr,
- _CONST char *to,
- _CONST char *from));
+ const char *to,
+ const char *from));
/*
* close - close conversion.
@@ -89,7 +89,7 @@ typedef struct
* PARAMETERS:
* struct _reent *rptr - reent structure of current thread/process.
* _VOID_PTR data - conversion-specific data;
- * _CONST unsigned char **inbuf - input data buffer;
+ * const unsigned char **inbuf - input data buffer;
* size_t *inbytesleft - input buffer's length;
* unsigned char **outbuf - output data buffer;
* size_t *outbytesleft - output buffer free space;
@@ -116,7 +116,7 @@ typedef struct
*/
size_t _EXFNPTR(convert, (struct _reent *rptr,
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft,
unsigned char **outbuf,
size_t *outbytesleft,
@@ -199,7 +199,7 @@ typedef struct
typedef struct
{
/* Iconv conversion handlers. */
- _CONST iconv_conversion_handlers_t *handlers;
+ const iconv_conversion_handlers_t *handlers;
/*
* Conversion-specific data (e.g., points to iconv_ucs_conversion_t
@@ -210,11 +210,11 @@ typedef struct
/* UCS-based conversion handlers */
-extern _CONST iconv_conversion_handlers_t
+extern const iconv_conversion_handlers_t
_iconv_ucs_conversion_handlers;
/* Null conversion handlers */
-extern _CONST iconv_conversion_handlers_t
+extern const iconv_conversion_handlers_t
_iconv_null_conversion_handlers;
#endif /* !__ICONV_CONVERSION_H__ */
diff --git a/newlib/libc/iconv/lib/iconv.c b/newlib/libc/iconv/lib/iconv.c
index b8000e4be..7c9b252f3 100644
--- a/newlib/libc/iconv/lib/iconv.c
+++ b/newlib/libc/iconv/lib/iconv.c
@@ -121,8 +121,8 @@ No supporting OS subroutine calls are required.
iconv_t
_DEFUN(iconv_open, (to, from),
- _CONST char *to,
- _CONST char *from)
+ const char *to,
+ const char *from)
{
return _iconv_open_r (_REENT, to, from);
}
@@ -136,7 +136,7 @@ _DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft),
char **__restrict outbuf,
size_t *__restrict outbytesleft)
{
- return _iconv_r (_REENT, cd, (_CONST char **) inbuf, inbytesleft,
+ return _iconv_r (_REENT, cd, (const char **) inbuf, inbytesleft,
outbuf, outbytesleft);
}
@@ -152,18 +152,18 @@ _DEFUN(iconv_close, (cd), iconv_t cd)
iconv_t
_DEFUN(_iconv_open_r, (rptr, to, from),
struct _reent *rptr,
- _CONST char *to,
- _CONST char *from)
+ const char *to,
+ const char *from)
{
iconv_conversion_t *ic;
if (to == NULL || from == NULL || *to == '\0' || *from == '\0')
return (iconv_t)-1;
- if ((to = (_CONST char *)_iconv_resolve_encoding_name (rptr, to)) == NULL)
+ if ((to = (const char *)_iconv_resolve_encoding_name (rptr, to)) == NULL)
return (iconv_t)-1;
- if ((from = (_CONST char *)_iconv_resolve_encoding_name (rptr, from)) == NULL)
+ if ((from = (const char *)_iconv_resolve_encoding_name (rptr, from)) == NULL)
{
_free_r (rptr, (_VOID_PTR)to);
return (iconv_t)-1;
@@ -204,7 +204,7 @@ size_t
_DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
struct _reent *rptr,
iconv_t cd,
- _CONST char **inbuf,
+ const char **inbuf,
size_t *inbytesleft,
char **outbuf,
size_t *outbytesleft)
@@ -279,7 +279,7 @@ _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
return ic->handlers->convert (rptr,
ic->data,
- (_CONST unsigned char**)inbuf,
+ (const unsigned char**)inbuf,
inbytesleft,
(unsigned char**)outbuf,
outbytesleft,
diff --git a/newlib/libc/iconv/lib/iconvnls.c b/newlib/libc/iconv/lib/iconvnls.c
index 3223e1303..fa35cca1a 100644
--- a/newlib/libc/iconv/lib/iconvnls.c
+++ b/newlib/libc/iconv/lib/iconvnls.c
@@ -46,9 +46,9 @@
*
* PARAMETERS:
* struct _reent *rptr - reent structure of current thread/process.
- * _CONST char *file - the name of file.
- * _CONST char *dir - the name of subdirectory;
- * _CONST char *ext - file extension.
+ * const char *file - the name of file.
+ * const char *dir - the name of subdirectory;
+ * const char *ext - file extension.
*
* DESCRIPTION:
* Function constructs patch to icionv-related file.
@@ -58,12 +58,12 @@
* The pointer to file name if success, In case of error returns NULL
* and sets current thread's/process's errno.
*/
-_CONST char *
+const char *
_DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
struct _reent *rptr,
- _CONST char *file,
- _CONST char *dir,
- _CONST char *ext)
+ const char *file,
+ const char *dir,
+ const char *ext)
{
int len1, len2, len3;
char *path;
@@ -78,7 +78,7 @@ _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
len3 = strlen (ext);
if ((p = _malloc_r (rptr, len1 + dirlen + len2 + len3 + 3)) == NULL)
- return (_CONST char *)NULL;
+ return (const char *)NULL;
memcpy (p, path, len1);
if (p[len1 - 1] != '/')
@@ -95,7 +95,7 @@ _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
}
p[len1] = '\0';
- return (_CONST char *)p;
+ return (const char *)p;
}
@@ -169,7 +169,7 @@ size_t
_DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
struct _reent *rptr,
iconv_t cd,
- _CONST char **inbuf,
+ const char **inbuf,
size_t *inbytesleft,
char **outbuf,
size_t *outbytesleft)
@@ -199,7 +199,7 @@ _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
return ic->handlers->convert (rptr,
ic->data,
- (_CONST unsigned char**)inbuf,
+ (const unsigned char**)inbuf,
inbytesleft,
(unsigned char**)outbuf,
outbytesleft,
@@ -261,8 +261,8 @@ _DEFUN(_iconv_nls_set_state, (cd, ps, direction),
static iconv_t
_DEFUN(iconv_open1, (rptr, to, from),
struct _reent *rptr,
- _CONST char *to,
- _CONST char *from)
+ const char *to,
+ const char *from)
{
iconv_conversion_t *ic;
@@ -301,7 +301,7 @@ _DEFUN(iconv_open1, (rptr, to, from),
*
* PARAMETERS:
* struct _reent *rptr - process's reent structure;
- * _CONST char *encoding - encoding name;
+ * const char *encoding - encoding name;
* iconv_t *tomb - wchar -> encoding iconv descriptor pointer;
* iconv_t *towc - encoding -> wchar iconv descriptor pointer;
* int flag - perform encoding name resolving flag.
@@ -318,12 +318,12 @@ _DEFUN(iconv_open1, (rptr, to, from),
int
_DEFUN(_iconv_nls_open, (rptr, encoding, towc, tomb),
struct _reent *rptr,
- _CONST char *encoding,
+ const char *encoding,
iconv_t *tomb,
iconv_t *towc,
int flag)
{
- _CONST char *wchar_encoding;
+ const char *wchar_encoding;
if (sizeof (wchar_t) > 2 && WCHAR_MAX > 0xFFFF)
wchar_encoding = "ucs_4_internal";
diff --git a/newlib/libc/iconv/lib/local.h b/newlib/libc/iconv/lib/local.h
index fd386c5fb..46428ae17 100644
--- a/newlib/libc/iconv/lib/local.h
+++ b/newlib/libc/iconv/lib/local.h
@@ -62,7 +62,7 @@ typedef __uint32_t ucs4_t;
/* The list of built-in encoding names and aliases */
-extern _CONST char *
+extern const char *
_iconv_aliases;
#endif /* !__ICONV_LIB_LOCAL_H__ */
diff --git a/newlib/libc/iconv/lib/nullconv.c b/newlib/libc/iconv/lib/nullconv.c
index 7ddbc77bd..729007ab0 100644
--- a/newlib/libc/iconv/lib/nullconv.c
+++ b/newlib/libc/iconv/lib/nullconv.c
@@ -38,8 +38,8 @@ static int null_conversion_dummy_data;
static _VOID_PTR
_DEFUN(null_conversion_open, (rptr, to, from),
struct _reent *rptr,
- _CONST char *to,
- _CONST char *from)
+ const char *to,
+ const char *from)
{
return (_VOID_PTR)&null_conversion_dummy_data;
}
@@ -59,7 +59,7 @@ _DEFUN(null_conversion_convert,
(rptr, data, inbuf, inbytesleft, outbuf, outbytesleft),
struct _reent *rptr,
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft,
unsigned char **outbuf,
size_t *outbytesleft,
@@ -129,7 +129,7 @@ _DEFUN(null_conversion_is_stateful, (data, direction),
}
/* Null conversion definition object */
-_CONST iconv_conversion_handlers_t
+const iconv_conversion_handlers_t
_iconv_null_conversion_handlers =
{
null_conversion_open,
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index 46ad33efe..7cc65c86c 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -36,8 +36,8 @@
static int fake_data;
static int
-_EXFUN(find_encoding_name, (_CONST char *searchee,
- _CONST char **names));
+_EXFUN(find_encoding_name, (const char *searchee,
+ const char **names));
/*
@@ -47,12 +47,12 @@ _EXFUN(find_encoding_name, (_CONST char *searchee,
static _VOID_PTR
_DEFUN(ucs_based_conversion_open, (rptr, to, from),
struct _reent *rptr,
- _CONST char *to,
- _CONST char *from)
+ const char *to,
+ const char *from)
{
iconv_ucs_conversion_t *uc;
- _CONST iconv_to_ucs_ces_t *to_ucs_bices;
- _CONST iconv_from_ucs_ces_t *from_ucs_bices;
+ const iconv_to_ucs_ces_t *to_ucs_bices;
+ const iconv_from_ucs_ces_t *from_ucs_bices;
uc = (iconv_ucs_conversion_t *)
_calloc_r (rptr, 1, sizeof (iconv_ucs_conversion_t));
@@ -148,7 +148,7 @@ _DEFUN(ucs_based_conversion_convert,
(rptr, data, inbuf, inbytesleft, outbuf, outbytesleft, flags),
struct _reent *rptr,
_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft,
unsigned char **outbuf,
size_t *outbytesleft,
@@ -163,7 +163,7 @@ _DEFUN(ucs_based_conversion_convert,
{
register size_t bytes;
register ucs4_t ch;
- _CONST unsigned char *inbuf_save = *inbuf;
+ const unsigned char *inbuf_save = *inbuf;
size_t inbyteslef_save = *inbytesleft;
if (*outbytesleft == 0)
@@ -324,7 +324,7 @@ _DEFUN(ucs_based_conversion_is_stateful, (data, direction),
/* UCS-based conversion definition object */
-_CONST iconv_conversion_handlers_t
+const iconv_conversion_handlers_t
_iconv_ucs_conversion_handlers =
{
ucs_based_conversion_open,
@@ -343,10 +343,10 @@ _iconv_ucs_conversion_handlers =
static int
_DEFUN(find_encoding_name, (searchee, names),
- _CONST char *searchee,
- _CONST char **names)
+ const char *searchee,
+ const char **names)
{
- _CONST char *p;
+ const char *p;
for (p = *names; p != NULL; p = *(names++))
if (strcmp (p, searchee) == 0)
diff --git a/newlib/libc/iconv/lib/ucsconv.h b/newlib/libc/iconv/lib/ucsconv.h
index 4bf7174bf..cea6d5aa3 100644
--- a/newlib/libc/iconv/lib/ucsconv.h
+++ b/newlib/libc/iconv/lib/ucsconv.h
@@ -57,7 +57,7 @@ typedef struct
*
* PARAMETERS:
* struct _reent *rptr - reent structure of current thread/process;
- * _CONST char *encoding - encoding name.
+ * const char *encoding - encoding name.
*
* DESCRIPTION:
* Initializes CES converter. CES converter may deal with a series of
@@ -69,7 +69,7 @@ typedef struct
* NULL and sets current thread's/process's errno.
*/
_VOID_PTR _EXFNPTR(init, (struct _reent *rptr,
- _CONST char *encoding));
+ const char *encoding));
/*
* close - close CES converter.
@@ -142,7 +142,7 @@ typedef struct
*
* PARAMETERS:
* _VOID_PTR data - CES converter-specific data;
- * _CONST unsigned char **inbuf - buffer with input character byte sequence;
+ * const unsigned char **inbuf - buffer with input character byte sequence;
* size_t *inbytesleft - output buffer bytes count.
*
* DESCRIPTION:
@@ -156,7 +156,7 @@ typedef struct
* sequence was met, returns ICONV_CES_BAD_SEQUENCE.
*/
ucs4_t _EXFNPTR(convert_to_ucs, (_VOID_PTR data,
- _CONST unsigned char **inbuf,
+ const unsigned char **inbuf,
size_t *inbytesleft));
} iconv_to_ucs_ces_handlers_t;
@@ -173,7 +173,7 @@ typedef struct
{
/* Same as in iconv_to_ucs_ces_handlers_t */
_VOID_PTR _EXFNPTR(init, (struct _reent *rptr,
- _CONST char *encoding));
+ const char *encoding));
/* Same as in iconv_to_ucs_ces_handlers_t */
size_t _EXFNPTR(close, (struct _reent *rptr,
@@ -231,7 +231,7 @@ typedef struct
typedef struct
{
/* CES converter handlers */
- _CONST iconv_to_ucs_ces_handlers_t *handlers;
+ const iconv_to_ucs_ces_handlers_t *handlers;
/* "to_ucs" CES converter-specific data. */
_VOID_PTR data;
@@ -247,7 +247,7 @@ typedef struct
typedef struct
{
/* CES converter handlers */
- _CONST iconv_from_ucs_ces_handlers_t *handlers;
+ const iconv_from_ucs_ces_handlers_t *handlers;
/* "from_ucs" CES converter-specific data. */
_VOID_PTR data;
@@ -290,10 +290,10 @@ typedef struct
* An array of encodings names, supported by CES converter.
* The end of array should be marked by NULL pointer.
*/
- _CONST char **names;
+ const char **names;
/* CES converter description structure */
- _CONST iconv_to_ucs_ces_handlers_t *handlers;
+ const iconv_to_ucs_ces_handlers_t *handlers;
} iconv_to_ucs_ces_t;
@@ -308,19 +308,19 @@ typedef struct
* An array of encodings names, supported by CES converter.
* The end of array should be marked by NULL pointer.
*/
- _CONST char **names;
+ const char **names;
/* CES converter description structure */
- _CONST iconv_from_ucs_ces_handlers_t *handlers;
+ const iconv_from_ucs_ces_handlers_t *handlers;
} iconv_from_ucs_ces_t;
/* List of "to UCS" linked-in CES converters. */
-extern _CONST iconv_to_ucs_ces_t
+extern const iconv_to_ucs_ces_t
_iconv_to_ucs_ces[];
/* List of "from UCS" linked-in CES converters. */
-extern _CONST iconv_from_ucs_ces_t
+extern const iconv_from_ucs_ces_t
_iconv_from_ucs_ces[];
#endif /* !__ICONV_UCS_CONVERSION_H__ */
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index fc832fc40..b0ce3bd4e 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -49,7 +49,6 @@
#ifdef _HAVE_STDC
#define _PTR void *
#define _NOARGS void
-#define _CONST const
#define _VOLATILE volatile
#define _SIGNED signed
#define _DOTS , ...
@@ -77,7 +76,6 @@
#else
#define _PTR char *
#define _NOARGS
-#define _CONST
#define _VOLATILE
#define _SIGNED
#define _DOTS
diff --git a/newlib/libc/include/ctype.h b/newlib/libc/include/ctype.h
index 06458cbda..0d705e131 100644
--- a/newlib/libc/include/ctype.h
+++ b/newlib/libc/include/ctype.h
@@ -162,7 +162,7 @@ const char *__locale_ctype_ptr_l (locale_t);
#endif /* !__cplusplus */
/* For C++ backward-compatibility only. */
-extern __IMPORT _CONST char _ctype_[];
+extern __IMPORT const char _ctype_[];
_END_STD_C
diff --git a/newlib/libc/include/iconv.h b/newlib/libc/include/iconv.h
index 4c023e9df..e19f73d85 100644
--- a/newlib/libc/include/iconv.h
+++ b/newlib/libc/include/iconv.h
@@ -38,7 +38,7 @@ _BEGIN_STD_C
#ifndef _REENT_ONLY
iconv_t
-_EXFUN(iconv_open, (_CONST char *, _CONST char *));
+_EXFUN(iconv_open, (const char *, const char *));
size_t
_EXFUN(iconv, (iconv_t, char **__restrict, size_t *__restrict,
@@ -49,10 +49,10 @@ _EXFUN(iconv_close, (iconv_t));
#endif
iconv_t
-_EXFUN(_iconv_open_r, (struct _reent *, _CONST char *, _CONST char *));
+_EXFUN(_iconv_open_r, (struct _reent *, const char *, const char *));
size_t
-_EXFUN(_iconv_r, (struct _reent *, iconv_t, _CONST char **,
+_EXFUN(_iconv_r, (struct _reent *, iconv_t, const char **,
size_t *, char **, size_t *));
int
diff --git a/newlib/libc/include/pthread.h b/newlib/libc/include/pthread.h
index fb2fa93d8..493eafd7e 100644
--- a/newlib/libc/include/pthread.h
+++ b/newlib/libc/include/pthread.h
@@ -47,7 +47,7 @@ int _EXFUN(pthread_atfork,(void (*prepare)(void), void (*parent)(void),
int _EXFUN(pthread_mutexattr_init, (pthread_mutexattr_t *__attr));
int _EXFUN(pthread_mutexattr_destroy, (pthread_mutexattr_t *__attr));
int _EXFUN(pthread_mutexattr_getpshared,
- (_CONST pthread_mutexattr_t *__attr, int *__pshared));
+ (const pthread_mutexattr_t *__attr, int *__pshared));
int _EXFUN(pthread_mutexattr_setpshared,
(pthread_mutexattr_t *__attr, int __pshared));
@@ -56,7 +56,7 @@ int _EXFUN(pthread_mutexattr_setpshared,
/* Single UNIX Specification 2 Mutex Attributes types */
int _EXFUN(pthread_mutexattr_gettype,
- (_CONST pthread_mutexattr_t *__attr, int *__kind));
+ (const pthread_mutexattr_t *__attr, int *__kind));
int _EXFUN(pthread_mutexattr_settype,
(pthread_mutexattr_t *__attr, int __kind));
@@ -65,7 +65,7 @@ int _EXFUN(pthread_mutexattr_settype,
/* Initializing and Destroying a Mutex, P1003.1c/Draft 10, p. 87 */
int _EXFUN(pthread_mutex_init,
- (pthread_mutex_t *__mutex, _CONST pthread_mutexattr_t *__attr));
+ (pthread_mutex_t *__mutex, const pthread_mutexattr_t *__attr));
int _EXFUN(pthread_mutex_destroy, (pthread_mutex_t *__mutex));
/* This is used to statically initialize a pthread_mutex_t. Example:
@@ -85,7 +85,7 @@ int _EXFUN(pthread_mutex_unlock, (pthread_mutex_t *__mutex));
#if defined(_POSIX_TIMEOUTS)
int _EXFUN(pthread_mutex_timedlock,
- (pthread_mutex_t *__mutex, _CONST struct timespec *__timeout));
+ (pthread_mutex_t *__mutex, const struct timespec *__timeout));
#endif /* _POSIX_TIMEOUTS */
@@ -101,14 +101,14 @@ int _EXFUN(pthread_condattr_setclock,
(pthread_condattr_t *__attr, clockid_t __clock_id));
int _EXFUN(pthread_condattr_getpshared,
- (_CONST pthread_condattr_t *__attr, int *__pshared));
+ (const pthread_condattr_t *__attr, int *__pshared));
int _EXFUN(pthread_condattr_setpshared,
(pthread_condattr_t *__attr, int __pshared));
/* Initializing and Destroying a Condition Variable, P1003.1c/Draft 10, p. 87 */
int _EXFUN(pthread_cond_init,
- (pthread_cond_t *__cond, _CONST pthread_condattr_t *__attr));
+ (pthread_cond_t *__cond, const pthread_condattr_t *__attr));
int _EXFUN(pthread_cond_destroy, (pthread_cond_t *__mutex));
/* This is used to statically initialize a pthread_cond_t. Example:
@@ -130,7 +130,7 @@ int _EXFUN(pthread_cond_wait,
int _EXFUN(pthread_cond_timedwait,
(pthread_cond_t *__cond, pthread_mutex_t *__mutex,
- _CONST struct timespec *__abstime));
+ const struct timespec *__abstime));
#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
@@ -139,22 +139,22 @@ int _EXFUN(pthread_cond_timedwait,
int _EXFUN(pthread_attr_setscope,
(pthread_attr_t *__attr, int __contentionscope));
int _EXFUN(pthread_attr_getscope,
- (_CONST pthread_attr_t *__attr, int *__contentionscope));
+ (const pthread_attr_t *__attr, int *__contentionscope));
int _EXFUN(pthread_attr_setinheritsched,
(pthread_attr_t *__attr, int __inheritsched));
int _EXFUN(pthread_attr_getinheritsched,
- (_CONST pthread_attr_t *__attr, int *__inheritsched));
+ (const pthread_attr_t *__attr, int *__inheritsched));
int _EXFUN(pthread_attr_setschedpolicy,
(pthread_attr_t *__attr, int __policy));
int _EXFUN(pthread_attr_getschedpolicy,
- (_CONST pthread_attr_t *__attr, int *__policy));
+ (const pthread_attr_t *__attr, int *__policy));
#endif /* defined(_POSIX_THREAD_PRIORITY_SCHEDULING) */
int _EXFUN(pthread_attr_setschedparam,
- (pthread_attr_t *__attr, _CONST struct sched_param *__param));
+ (pthread_attr_t *__attr, const struct sched_param *__param));
int _EXFUN(pthread_attr_getschedparam,
- (_CONST pthread_attr_t *__attr, struct sched_param *__param));
+ (const pthread_attr_t *__attr, struct sched_param *__param));
#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
@@ -183,11 +183,11 @@ int pthread_setname_np(pthread_t, const char *) __nonnull((2));
int _EXFUN(pthread_mutexattr_setprotocol,
(pthread_mutexattr_t *__attr, int __protocol));
int _EXFUN(pthread_mutexattr_getprotocol,
- (_CONST pthread_mutexattr_t *__attr, int *__protocol));
+ (const pthread_mutexattr_t *__attr, int *__protocol));
int _EXFUN(pthread_mutexattr_setprioceiling,
(pthread_mutexattr_t *__attr, int __prioceiling));
int _EXFUN(pthread_mutexattr_getprioceiling,
- (_CONST pthread_mutexattr_t *__attr, int *__prioceiling));
+ (const pthread_mutexattr_t *__attr, int *__prioceiling));
#endif /* _POSIX_THREAD_PRIO_INHERIT || _POSIX_THREAD_PRIO_PROTECT */
@@ -208,22 +208,22 @@ int _EXFUN(pthread_attr_init, (pthread_attr_t *__attr));
int _EXFUN(pthread_attr_destroy, (pthread_attr_t *__attr));
int _EXFUN(pthread_attr_setstack, (pthread_attr_t *attr,
void *__stackaddr, size_t __stacksize));
-int _EXFUN(pthread_attr_getstack, (_CONST pthread_attr_t *attr,
+int _EXFUN(pthread_attr_getstack, (const pthread_attr_t *attr,
void **__stackaddr, size_t *__stacksize));
int _EXFUN(pthread_attr_getstacksize,
- (_CONST pthread_attr_t *__attr, size_t *__stacksize));
+ (const pthread_attr_t *__attr, size_t *__stacksize));
int _EXFUN(pthread_attr_setstacksize,
(pthread_attr_t *__attr, size_t __stacksize));
int _EXFUN(pthread_attr_getstackaddr,
- (_CONST pthread_attr_t *__attr, void **__stackaddr));
+ (const pthread_attr_t *__attr, void **__stackaddr));
int _EXFUN(pthread_attr_setstackaddr,
(pthread_attr_t *__attr, void *__stackaddr));
int _EXFUN(pthread_attr_getdetachstate,
- (_CONST pthread_attr_t *__attr, int *__detachstate));
+ (const pthread_attr_t *__attr, int *__detachstate));
int _EXFUN(pthread_attr_setdetachstate,
(pthread_attr_t *__attr, int __detachstate));
int _EXFUN(pthread_attr_getguardsize,
- (_CONST pthread_attr_t *__attr, size_t *__guardsize));
+ (const pthread_attr_t *__attr, size_t *__guardsize));
int _EXFUN(pthread_attr_setguardsize,
(pthread_attr_t *__attr, size_t __guardsize));
@@ -253,7 +253,7 @@ int _EXFUN(pthread_getattr_np,
/* Thread Creation, P1003.1c/Draft 10, p. 144 */
int _EXFUN(pthread_create,
- (pthread_t *__pthread, _CONST pthread_attr_t *__attr,
+ (pthread_t *__pthread, const pthread_attr_t *__attr,
void *(*__start_routine)( void * ), void *__arg));
/* Wait for Thread Termination, P1003.1c/Draft 10, p. 147 */
@@ -309,7 +309,7 @@ int _EXFUN(pthread_key_create,
/* Thread-Specific Data Management, P1003.1c/Draft 10, p. 165 */
int _EXFUN(pthread_setspecific,
- (pthread_key_t __key, _CONST void *__value));
+ (pthread_key_t __key, const void *__value));
void * _EXFUN(pthread_getspecific, (pthread_key_t __key));
/* Thread-Specific Data Key Deletion, P1003.1c/Draft 10, p. 167 */
@@ -391,7 +391,7 @@ int _EXFUN(pthread_getcpuclockid,
int _EXFUN(pthread_barrierattr_init, (pthread_barrierattr_t *__attr));
int _EXFUN(pthread_barrierattr_destroy, (pthread_barrierattr_t *__attr));
int _EXFUN(pthread_barrierattr_getpshared,
- (_CONST pthread_barrierattr_t *__attr, int *__pshared));
+ (const pthread_barrierattr_t *__attr, int *__pshared));
int _EXFUN(pthread_barrierattr_setpshared,
(pthread_barrierattr_t *__attr, int __pshared));
@@ -399,7 +399,7 @@ int _EXFUN(pthread_barrierattr_setpshared,
int _EXFUN(pthread_barrier_init,
(pthread_barrier_t *__barrier,
- _CONST pthread_barrierattr_t *__attr, unsigned __count));
+ const pthread_barrierattr_t *__attr, unsigned __count));
int _EXFUN(pthread_barrier_destroy, (pthread_barrier_t *__barrier));
int _EXFUN(pthread_barrier_wait,(pthread_barrier_t *__barrier));
@@ -428,22 +428,22 @@ int _EXFUN(pthread_spin_unlock, (pthread_spinlock_t *__spinlock));
int _EXFUN(pthread_rwlockattr_init, (pthread_rwlockattr_t *__attr));
int _EXFUN(pthread_rwlockattr_destroy, (pthread_rwlockattr_t *__attr));
int _EXFUN(pthread_rwlockattr_getpshared,
- (_CONST pthread_rwlockattr_t *__attr, int *__pshared));
+ (const pthread_rwlockattr_t *__attr, int *__pshared));
int _EXFUN(pthread_rwlockattr_setpshared,
(pthread_rwlockattr_t *__attr, int __pshared));
int _EXFUN(pthread_rwlock_init,
- (pthread_rwlock_t *__rwlock, _CONST pthread_rwlockattr_t *__attr));
+ (pthread_rwlock_t *__rwlock, const pthread_rwlockattr_t *__attr));
int _EXFUN(pthread_rwlock_destroy, (pthread_rwlock_t *__rwlock));
int _EXFUN(pthread_rwlock_rdlock,(pthread_rwlock_t *__rwlock));
int _EXFUN(pthread_rwlock_tryrdlock,(pthread_rwlock_t *__rwlock));
int _EXFUN(pthread_rwlock_timedrdlock,
- (pthread_rwlock_t *__rwlock, _CONST struct timespec *__abstime));
+ (pthread_rwlock_t *__rwlock, const struct timespec *__abstime));
int _EXFUN(pthread_rwlock_unlock,(pthread_rwlock_t *__rwlock));
int _EXFUN(pthread_rwlock_wrlock,(pthread_rwlock_t *__rwlock));
int _EXFUN(pthread_rwlock_trywrlock,(pthread_rwlock_t *__rwlock));
int _EXFUN(pthread_rwlock_timedwrlock,
- (pthread_rwlock_t *__rwlock, _CONST struct timespec *__abstime));
+ (pthread_rwlock_t *__rwlock, const struct timespec *__abstime));
#endif /* defined(_POSIX_READER_WRITER_LOCKS) */
diff --git a/newlib/libc/include/rpc/xdr.h b/newlib/libc/include/rpc/xdr.h
index 4f93bf38e..40ddc1cdd 100644
--- a/newlib/libc/include/rpc/xdr.h
+++ b/newlib/libc/include/rpc/xdr.h
@@ -108,19 +108,19 @@ enum xdr_op
typedef struct __rpc_xdr
{
enum xdr_op x_op; /* operation; fast additional param */
- _CONST struct xdr_ops
+ const struct xdr_ops
{
/* get a long from underlying stream */
bool_t _EXFNPTR (x_getlong, (struct __rpc_xdr *, long *));
/* put a long to " */
- bool_t _EXFNPTR (x_putlong, (struct __rpc_xdr *, _CONST long *));
+ bool_t _EXFNPTR (x_putlong, (struct __rpc_xdr *, const long *));
/* get some bytes from " */
bool_t _EXFNPTR (x_getbytes, (struct __rpc_xdr *, char *, u_int));
/* put some bytes to " */
- bool_t _EXFNPTR (x_putbytes, (struct __rpc_xdr *, _CONST char *, u_int));
+ bool_t _EXFNPTR (x_putbytes, (struct __rpc_xdr *, const char *, u_int));
/* returns bytes off from beginning */
u_int _EXFNPTR (x_getpostn, (struct __rpc_xdr *));
@@ -138,7 +138,7 @@ typedef struct __rpc_xdr
bool_t _EXFNPTR (x_getint32, (struct __rpc_xdr *, int32_t *));
/* put an int32 to the underlying stream */
- bool_t _EXFNPTR (x_putint32, (struct __rpc_xdr *, _CONST int32_t *));
+ bool_t _EXFNPTR (x_putint32, (struct __rpc_xdr *, const int32_t *));
} *x_ops;
char *x_public; /* users' data */
@@ -320,7 +320,7 @@ extern bool_t _EXFUN (xdr_bytes, (XDR *, char **, u_int *, u_int));
extern bool_t _EXFUN (xdr_opaque, (XDR *, char *, u_int));
extern bool_t _EXFUN (xdr_string, (XDR *, char **, u_int));
extern bool_t _EXFUN (xdr_union, (XDR *, enum_t *, char *,
- _CONST struct xdr_discrim *, xdrproc_t));
+ const struct xdr_discrim *, xdrproc_t));
extern bool_t _EXFUN (xdr_char, (XDR *, char *));
extern bool_t _EXFUN (xdr_u_char, (XDR *, u_char *));
extern bool_t _EXFUN (xdr_vector, (XDR *, char *, u_int, u_int, xdrproc_t));
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index b648e6201..9152bf096 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -552,7 +552,7 @@ int _EXFUN(fputs_unlocked, (const char *__restrict, FILE *__restrict));
#if !defined(__CYGWIN__) || defined(_COMPILING_NEWLIB)
FILE * _EXFUN(fdopen64, (int, const char *));
FILE * _EXFUN(fopen64, (const char *, const char *));
-FILE * _EXFUN(freopen64, (_CONST char *, _CONST char *, FILE *));
+FILE * _EXFUN(freopen64, (const char *, const char *, FILE *));
_off64_t _EXFUN(ftello64, (FILE *));
_off64_t _EXFUN(fseeko64, (FILE *, _off64_t, int));
int _EXFUN(fgetpos64, (FILE *, _fpos64_t *));
@@ -561,7 +561,7 @@ FILE * _EXFUN(tmpfile64, (void));
FILE * _EXFUN(_fdopen64_r, (struct _reent *, int, const char *));
FILE * _EXFUN(_fopen64_r, (struct _reent *,const char *, const char *));
-FILE * _EXFUN(_freopen64_r, (struct _reent *, _CONST char *, _CONST char *, FILE *));
+FILE * _EXFUN(_freopen64_r, (struct _reent *, const char *, const char *, FILE *));
_off64_t _EXFUN(_ftello64_r, (struct _reent *, FILE *));
_off64_t _EXFUN(_fseeko64_r, (struct _reent *, FILE *, _off64_t, int));
int _EXFUN(_fgetpos64_r, (struct _reent *, FILE *, _fpos64_t *));
diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h
index c3c591d20..ac433db21 100644
--- a/newlib/libc/include/stdlib.h
+++ b/newlib/libc/include/stdlib.h
@@ -93,8 +93,8 @@ _VOID _EXFUN(exit,(int __status) _ATTRIBUTE ((__noreturn__)));
_VOID _EXFUN_NOTHROW(free,(_PTR));
char * _EXFUN(getenv,(const char *__string));
char * _EXFUN(_getenv_r,(struct _reent *, const char *__string));
-char * _EXFUN(_findenv,(_CONST char *, int *));
-char * _EXFUN(_findenv_r,(struct _reent *, _CONST char *, int *));
+char * _EXFUN(_findenv,(const char *, int *));
+char * _EXFUN(_findenv_r,(struct _reent *, const char *, int *));
#if __POSIX_VISIBLE >= 200809
extern char *suboptarg; /* getsubopt(3) external variable */
int _EXFUN(getsubopt,(char **, char * const *, char **));
diff --git a/newlib/libc/include/sys/errno.h b/newlib/libc/include/sys/errno.h
index a72c37320..89fe1e052 100644
--- a/newlib/libc/include/sys/errno.h
+++ b/newlib/libc/include/sys/errno.h
@@ -17,7 +17,7 @@ extern int *__errno _PARAMS ((void));
/* Please don't use these variables directly.
Use strerror instead. */
-extern __IMPORT _CONST char * _CONST _sys_errlist[];
+extern __IMPORT const char * const _sys_errlist[];
extern __IMPORT int _sys_nerr;
#ifdef __CYGWIN__
extern __IMPORT const char * const sys_errlist[];
diff --git a/newlib/libc/include/sys/iconvnls.h b/newlib/libc/include/sys/iconvnls.h
index 09ea18316..7475ed21b 100644
--- a/newlib/libc/include/sys/iconvnls.h
+++ b/newlib/libc/include/sys/iconvnls.h
@@ -58,20 +58,20 @@ _EXFUN(_iconv_nls_get_mb_cur_max, (iconv_t cd, int direction));
size_t
_EXFUN(_iconv_nls_conv, (struct _reent *rptr, iconv_t cd,
- _CONST char **inbuf, size_t *inbytesleft,
+ const char **inbuf, size_t *inbytesleft,
char **outbuf, size_t *outbytesleft));
-_CONST char *
-_EXFUN(_iconv_nls_construct_filename, (struct _reent *rptr, _CONST char *file,
- _CONST char *dir, _CONST char *ext));
+const char *
+_EXFUN(_iconv_nls_construct_filename, (struct _reent *rptr, const char *file,
+ const char *dir, const char *ext));
int
-_EXFUN(_iconv_nls_open, (struct _reent *rptr, _CONST char *encoding,
+_EXFUN(_iconv_nls_open, (struct _reent *rptr, const char *encoding,
iconv_t *towc, iconv_t *fromwc, int flag));
char *
-_EXFUN(_iconv_resolve_encoding_name, (struct _reent *rptr, _CONST char *ca));
+_EXFUN(_iconv_resolve_encoding_name, (struct _reent *rptr, const char *ca));
#endif /* __SYS_ICONVNLS_H__ */
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index c045ca549..061f580fb 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -773,7 +773,7 @@ extern __FILE __sf[3];
#endif
extern struct _reent *_impure_ptr __ATTRIBUTE_IMPURE_PTR__;
-extern struct _reent *_CONST _global_impure_ptr __ATTRIBUTE_IMPURE_PTR__;
+extern struct _reent *const _global_impure_ptr __ATTRIBUTE_IMPURE_PTR__;
void _reclaim_reent _PARAMS ((struct _reent *));
diff --git a/newlib/libc/include/unctrl.h b/newlib/libc/include/unctrl.h
index 004075232..010812ff3 100644
--- a/newlib/libc/include/unctrl.h
+++ b/newlib/libc/include/unctrl.h
@@ -40,7 +40,7 @@
#define unctrl(c) __unctrl[(c) & 0xff]
#define unctrllen(ch) __unctrllen[(ch) & 0xff]
-extern __IMPORT _CONST char * _CONST __unctrl[256]; /* Control strings. */
-extern __IMPORT _CONST char __unctrllen[256]; /* Control strings length. */
+extern __IMPORT const char * const __unctrl[256]; /* Control strings. */
+extern __IMPORT const char __unctrllen[256]; /* Control strings length. */
#endif /* _UNCTRL_H_ */
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index 87cb04b35..f461ef162 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -292,7 +292,7 @@ char *
_DEFUN(_setlocale_r, (p, category, locale),
struct _reent *p,
int category,
- _CONST char *locale)
+ const char *locale)
{
#ifndef _MB_CAPABLE
if (locale)
@@ -992,7 +992,7 @@ __locale_ctype_ptr (void)
char *
_DEFUN (setlocale, (category, locale),
int category,
- _CONST char *locale)
+ const char *locale)
{
return _setlocale_r (_REENT, category, locale);
}
diff --git a/newlib/libc/machine/cris/sys/errno.h b/newlib/libc/machine/cris/sys/errno.h
index 310388943..dc4ffe28c 100644
--- a/newlib/libc/machine/cris/sys/errno.h
+++ b/newlib/libc/machine/cris/sys/errno.h
@@ -21,7 +21,7 @@ extern int *__errno _PARAMS ((void));
/* Please don't use these variables directly.
Use strerror instead. */
-extern _CONST char * _CONST _sys_errlist[];
+extern const char * const _sys_errlist[];
extern int _sys_nerr;
#define __errno_r(ptr) ((ptr)->_errno)
diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c
index a2751af85..82987eade 100644
--- a/newlib/libc/machine/microblaze/strcmp.c
+++ b/newlib/libc/machine/microblaze/strcmp.c
@@ -82,8 +82,8 @@ QUICKREF
int
_DEFUN (strcmp, (s1, s2),
- _CONST char *s1,
- _CONST char *s2)
+ const char *s1,
+ const char *s2)
{
#ifndef HAVE_HW_PCMP
diff --git a/newlib/libc/machine/microblaze/strcpy.c b/newlib/libc/machine/microblaze/strcpy.c
index e0e1d7760..8e2dae634 100644
--- a/newlib/libc/machine/microblaze/strcpy.c
+++ b/newlib/libc/machine/microblaze/strcpy.c
@@ -83,7 +83,7 @@ QUICKREF
char*
_DEFUN (strcpy, (dst0, src0),
char *__restrict dst0,
- _CONST char *__restrict src0)
+ const char *__restrict src0)
{
#ifndef HAVE_HW_PCMP
@@ -97,9 +97,9 @@ _DEFUN (strcpy, (dst0, src0),
return s;
#else
char *dst = dst0;
- _CONST char *src = src0;
+ const char *src = src0;
long *aligned_dst;
- _CONST long *aligned_src;
+ const long *aligned_src;
/* If SRC or DEST is unaligned, then copy bytes. */
if (!UNALIGNED (src, dst))
diff --git a/newlib/libc/machine/microblaze/strlen.c b/newlib/libc/machine/microblaze/strlen.c
index ddd9e6a82..059f4463d 100644
--- a/newlib/libc/machine/microblaze/strlen.c
+++ b/newlib/libc/machine/microblaze/strlen.c
@@ -79,20 +79,20 @@ QUICKREF
size_t
_DEFUN (strlen, (str),
- _CONST char *str)
+ const char *str)
{
#ifndef HAVE_HW_PCMP
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
- _CONST char *start = str;
+ const char *start = str;
while (*str)
str++;
return str - start;
#else
- _CONST char *start = str;
+ const char *start = str;
unsigned long *aligned_addr;
if (!UNALIGNED (str))
diff --git a/newlib/libc/machine/powerpc/atosfix16.c b/newlib/libc/machine/powerpc/atosfix16.c
index 5115c85e2..dd5e2dfd4 100644
--- a/newlib/libc/machine/powerpc/atosfix16.c
+++ b/newlib/libc/machine/powerpc/atosfix16.c
@@ -64,7 +64,7 @@ PORTABILITY
__int16_t
_DEFUN (_atosfix16_r, (reent, s),
struct _reent *reent,
- _CONST char *s)
+ const char *s)
{
return _strtosfix16_r (reent, s, NULL);
}
@@ -72,7 +72,7 @@ _DEFUN (_atosfix16_r, (reent, s),
#ifndef _REENT_ONLY
__int16_t
_DEFUN (atosfix16, (s),
- _CONST char *s)
+ const char *s)
{
return strtosfix16 (s, NULL);
}
diff --git a/newlib/libc/machine/powerpc/atosfix32.c b/newlib/libc/machine/powerpc/atosfix32.c
index 49f4cce20..fed308b65 100644
--- a/newlib/libc/machine/powerpc/atosfix32.c
+++ b/newlib/libc/machine/powerpc/atosfix32.c
@@ -10,7 +10,7 @@
__int32_t
_DEFUN (_atosfix32_r, (reent, s),
struct _reent *reent,
- _CONST char *s)
+ const char *s)
{
return _strtosfix32_r (reent, s, NULL);
}
@@ -18,7 +18,7 @@ _DEFUN (_atosfix32_r, (reent, s),
#ifndef _REENT_ONLY
__int32_t
_DEFUN (atosfix32, (s),
- _CONST char *s)
+ const char *s)
{
return strtosfix32 (s, NULL);
}
diff --git a/newlib/libc/machine/powerpc/atosfix64.c b/newlib/libc/machine/powerpc/atosfix64.c
index b433778e7..cfc421a3a 100644
--- a/newlib/libc/machine/powerpc/atosfix64.c
+++ b/newlib/libc/machine/powerpc/atosfix64.c
@@ -10,7 +10,7 @@
__int64_t
_DEFUN (_atosfix64_r, (reent, s),
struct _reent *reent,
- _CONST char *s)
+ const char *s)
{
return _strtosfix64_r (reent, s, NULL);
}
@@ -18,7 +18,7 @@ _DEFUN (_atosfix64_r, (reent, s),
#ifndef _REENT_ONLY
__int64_t
_DEFUN (atosfix64, (s),
- _CONST char *s)
+ const char *s)
{
return strtosfix64 (s, NULL);
}
diff --git a/newlib/libc/machine/powerpc/atoufix16.c b/newlib/libc/machine/powerpc/atoufix16.c
index 5148acb7d..84a60b252 100644
--- a/newlib/libc/machine/powerpc/atoufix16.c
+++ b/newlib/libc/machine/powerpc/atoufix16.c
@@ -64,7 +64,7 @@ PORTABILITY
__uint16_t
_DEFUN (_atoufix16_r, (reent, s),
struct _reent *reent,
- _CONST char *s)
+ const char *s)
{
return _strtoufix16_r (reent, s, NULL);
}
@@ -72,7 +72,7 @@ _DEFUN (_atoufix16_r, (reent, s),
#ifndef _REENT_ONLY
__uint16_t
_DEFUN (atoufix16, (s),
- _CONST char *s)
+ const char *s)
{
return strtoufix16 (s, NULL);
}
diff --git a/newlib/libc/machine/powerpc/atoufix32.c b/newlib/libc/machine/powerpc/atoufix32.c
index 01919d406..fc64c75e4 100644
--- a/newlib/libc/machine/powerpc/atoufix32.c
+++ b/newlib/libc/machine/powerpc/atoufix32.c
@@ -10,7 +10,7 @@
__uint32_t
_DEFUN (_atoufix32_r, (reent, s),
struct _reent *reent,
- _CONST char *s)
+ const char *s)
{
return _strtoufix32_r (reent, s, NULL);
}
@@ -18,7 +18,7 @@ _DEFUN (_atoufix32_r, (reent, s),
#ifndef _REENT_ONLY
__uint32_t
_DEFUN (atoufix32, (s),
- _CONST char *s)
+ const char *s)
{
return strtoufix32 (s, NULL);
}
diff --git a/newlib/libc/machine/powerpc/atoufix64.c b/newlib/libc/machine/powerpc/atoufix64.c
index af71089a6..e8ff7773d 100644
--- a/newlib/libc/machine/powerpc/atoufix64.c
+++ b/newlib/libc/machine/powerpc/atoufix64.c
@@ -10,7 +10,7 @@
__uint64_t
_DEFUN (_atoufix64_r, (reent, s),
struct _reent *reent,
- _CONST char *s)
+ const char *s)
{
return _strtoufix64_r (reent, s, NULL);
}
@@ -18,7 +18,7 @@ _DEFUN (_atoufix64_r, (reent, s),
#ifndef _REENT_ONLY
__uint64_t
_DEFUN (atoufix64, (s),
- _CONST char *s)
+ const char *s)
{
return strtoufix64 (s, NULL);
}
diff --git a/newlib/libc/machine/powerpc/strtosfix16.c b/newlib/libc/machine/powerpc/strtosfix16.c
index 84e1171b9..4e998db03 100644
--- a/newlib/libc/machine/powerpc/strtosfix16.c
+++ b/newlib/libc/machine/powerpc/strtosfix16.c
@@ -94,7 +94,7 @@ PORTABILITY
__int16_t
_DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
struct _reent *rptr,
- _CONST char *nptr,
+ const char *nptr,
char **endptr)
{
union double_union dbl;
@@ -170,7 +170,7 @@ _DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
__int16_t
_DEFUN (strtosfix16, (s, ptr, base),
- _CONST char *s,
+ const char *s,
char **ptr)
{
return _strtosfix16_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtosfix32.c b/newlib/libc/machine/powerpc/strtosfix32.c
index 1b1487b1a..e8966808e 100644
--- a/newlib/libc/machine/powerpc/strtosfix32.c
+++ b/newlib/libc/machine/powerpc/strtosfix32.c
@@ -15,7 +15,7 @@
__int32_t
_DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
struct _reent *rptr,
- _CONST char *nptr,
+ const char *nptr,
char **endptr)
{
union double_union dbl;
@@ -93,7 +93,7 @@ _DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
__int32_t
_DEFUN (strtosfix32, (s, ptr, base),
- _CONST char *s,
+ const char *s,
char **ptr)
{
return _strtosfix32_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtosfix64.c b/newlib/libc/machine/powerpc/strtosfix64.c
index 4ba718c03..f7344fc22 100644
--- a/newlib/libc/machine/powerpc/strtosfix64.c
+++ b/newlib/libc/machine/powerpc/strtosfix64.c
@@ -15,7 +15,7 @@
__int64_t
_DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
struct _reent *rptr,
- _CONST char *nptr,
+ const char *nptr,
char **endptr)
{
union long_double_union ldbl;
@@ -106,7 +106,7 @@ _DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
__int64_t
_DEFUN (strtosfix64, (s, ptr, base),
- _CONST char *s,
+ const char *s,
char **ptr)
{
return _strtosfix64_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix16.c b/newlib/libc/machine/powerpc/strtoufix16.c
index 22de506e3..0757930d4 100644
--- a/newlib/libc/machine/powerpc/strtoufix16.c
+++ b/newlib/libc/machine/powerpc/strtoufix16.c
@@ -93,7 +93,7 @@ PORTABILITY
__uint16_t
_DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
struct _reent *rptr,
- _CONST char *nptr,
+ const char *nptr,
char **endptr)
{
union double_union dbl;
@@ -161,7 +161,7 @@ _DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
__uint16_t
_DEFUN (strtoufix16, (s, ptr, base),
- _CONST char *s,
+ const char *s,
char **ptr)
{
return _strtoufix16_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix32.c b/newlib/libc/machine/powerpc/strtoufix32.c
index 05e96675f..60f278daa 100644
--- a/newlib/libc/machine/powerpc/strtoufix32.c
+++ b/newlib/libc/machine/powerpc/strtoufix32.c
@@ -15,7 +15,7 @@
__uint32_t
_DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
struct _reent *rptr,
- _CONST char *nptr,
+ const char *nptr,
char **endptr)
{
union double_union dbl;
@@ -90,7 +90,7 @@ _DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
__uint32_t
_DEFUN (strtoufix32, (s, ptr, base),
- _CONST char *s,
+ const char *s,
char **ptr)
{
return _strtoufix32_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix64.c b/newlib/libc/machine/powerpc/strtoufix64.c
index 5ef53846f..509f51318 100644
--- a/newlib/libc/machine/powerpc/strtoufix64.c
+++ b/newlib/libc/machine/powerpc/strtoufix64.c
@@ -15,7 +15,7 @@
__uint64_t
_DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
struct _reent *rptr,
- _CONST char *nptr,
+ const char *nptr,
char **endptr)
{
union long_double_union ldbl;
@@ -105,7 +105,7 @@ _DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
__uint64_t
_DEFUN (strtoufix64, (s, ptr, base),
- _CONST char *s,
+ const char *s,
char **ptr)
{
return _strtoufix64_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/vfprintf.c b/newlib/libc/machine/powerpc/vfprintf.c
index 0c1c80e1a..e926a7340 100644
--- a/newlib/libc/machine/powerpc/vfprintf.c
+++ b/newlib/libc/machine/powerpc/vfprintf.c
@@ -273,7 +273,7 @@ static char *cvt_ufix64 _PARAMS((struct _reent *, unsigned long long, int, int
int
_DEFUN (VFPRINTF, (fp, fmt0, ap),
FILE * fp,
- _CONST char *fmt0,
+ const char *fmt0,
va_list ap)
{
CHECK_INIT (_REENT, fp);
@@ -284,7 +284,7 @@ int
_DEFUN (_VFPRINTF_R, (data, fp, fmt0, ap),
struct _reent *data,
FILE * fp,
- _CONST char *fmt0,
+ const char *fmt0,
va_list ap)
{
register char *fmt; /* format string */
@@ -350,9 +350,9 @@ _DEFUN (_VFPRINTF_R, (data, fp, fmt0, ap),
* below longer.
*/
#define PADSIZE 16 /* pad chunk size */
- static _CONST char blanks[PADSIZE] =
+ static const char blanks[PADSIZE] =
{' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '};
- static _CONST char zeroes[PADSIZE] =
+ static const char zeroes[PADSIZE] =
{'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
/*
diff --git a/newlib/libc/machine/powerpc/vfscanf.c b/newlib/libc/machine/powerpc/vfscanf.c
index b82a14088..df5344e20 100644
--- a/newlib/libc/machine/powerpc/vfscanf.c
+++ b/newlib/libc/machine/powerpc/vfscanf.c
@@ -184,7 +184,7 @@ typedef union
int
_DEFUN (vfscanf, (fp, fmt, ap),
register FILE *__restrict fp,
- _CONST char *__restrict fmt,
+ const char *__restrict fmt,
va_list ap)
{
CHECK_INIT(_REENT, fp);
@@ -194,7 +194,7 @@ _DEFUN (vfscanf, (fp, fmt, ap),
int
__svfscanf (fp, fmt0, ap)
register FILE *fp;
- char _CONST *fmt0;
+ char const *fmt0;
va_list ap;
{
return __svfscanf_r (_REENT, fp, fmt0, ap);
@@ -206,7 +206,7 @@ int
_DEFUN (_vfscanf_r, (data, fp, fmt, ap),
struct _reent *data,
register FILE *__restrict fp,
- _CONST char *__restrict fmt,
+ const char *__restrict fmt,
va_list ap)
{
return __svfscanf_r (data, fp, fmt, ap);
@@ -217,7 +217,7 @@ int
__svfscanf_r (rptr, fp, fmt0, ap)
struct _reent *rptr;
register FILE *fp;
- char _CONST *fmt0;
+ char const *fmt0;
va_list ap;
{
register u_char *fmt = (u_char *) fmt0;
@@ -262,7 +262,7 @@ __svfscanf_r (rptr, fp, fmt0, ap)
#endif
/* `basefix' is used to avoid `if' tests in the integer scanner */
- static _CONST short basefix[17] =
+ static const short basefix[17] =
{10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
nassigned = 0;
diff --git a/newlib/libc/machine/spu/fdopen.c b/newlib/libc/machine/spu/fdopen.c
index b09ffad16..edec03cff 100644
--- a/newlib/libc/machine/spu/fdopen.c
+++ b/newlib/libc/machine/spu/fdopen.c
@@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
FILE *
_DEFUN (fdopen, (fd, mode),
int fd,
- _CONST char *mode)
+ const char *mode)
{
errno = ENOSYS;
return NULL;
diff --git a/newlib/libc/machine/spu/fopen.c b/newlib/libc/machine/spu/fopen.c
index c41d33510..ffa8f6904 100644
--- a/newlib/libc/machine/spu/fopen.c
+++ b/newlib/libc/machine/spu/fopen.c
@@ -37,17 +37,17 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
typedef struct
{
- _CONST char* file;
+ const char* file;
unsigned int pad0[ 3 ];
- _CONST char* mode;
+ const char* mode;
unsigned int pad1[ 3 ];
} c99_fopen_t;
#ifndef _REENT_ONLY
FILE *
_DEFUN (fopen, (file, mode),
- _CONST char *__restrict file,
- _CONST char *__restrict mode)
+ const char *__restrict file,
+ const char *__restrict mode)
{
int ret;
c99_fopen_t args;
diff --git a/newlib/libc/machine/spu/fputs.c b/newlib/libc/machine/spu/fputs.c
index 8cf84bb6e..82b72e060 100644
--- a/newlib/libc/machine/spu/fputs.c
+++ b/newlib/libc/machine/spu/fputs.c
@@ -37,7 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
typedef struct
{
- _CONST char* s;
+ const char* s;
unsigned int pad0[ 3 ];
int fp;
unsigned int pad1[ 3 ];
@@ -47,7 +47,7 @@ typedef struct
int
_DEFUN (fputs, (s, fp),
- char _CONST *__restrict s,
+ char const *__restrict s,
FILE *__restrict fp)
{
c99_fputs_t args;
diff --git a/newlib/libc/machine/spu/freopen.c b/newlib/libc/machine/spu/freopen.c
index 7c52abef3..0e3f15f83 100644
--- a/newlib/libc/machine/spu/freopen.c
+++ b/newlib/libc/machine/spu/freopen.c
@@ -37,9 +37,9 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
typedef struct
{
- _CONST char *file;
+ const char *file;
unsigned int pad0[ 3 ];
- _CONST char *mode;
+ const char *mode;
unsigned int pad1[ 3 ];
int fp;
} c99_freopen_t;
diff --git a/newlib/libc/machine/spu/fsetpos.c b/newlib/libc/machine/spu/fsetpos.c
index 1ebbb8f63..a92cca5a3 100644
--- a/newlib/libc/machine/spu/fsetpos.c
+++ b/newlib/libc/machine/spu/fsetpos.c
@@ -39,7 +39,7 @@ typedef struct
{
int fp;
unsigned int pad0[ 3 ];
- _CONST _fpos_t *pos;
+ const _fpos_t *pos;
} c99_fsetpos_t;
#ifndef _REENT_ONLY
@@ -47,7 +47,7 @@ typedef struct
int
_DEFUN (fsetpos, (iop, pos),
FILE * iop,
- _CONST _fpos_t * pos)
+ const _fpos_t * pos)
{
c99_fsetpos_t args;
diff --git a/newlib/libc/machine/spu/fwrite.c b/newlib/libc/machine/spu/fwrite.c
index 6de571069..149eb1345 100644
--- a/newlib/libc/machine/spu/fwrite.c
+++ b/newlib/libc/machine/spu/fwrite.c
@@ -39,7 +39,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
typedef struct
{
- _CONST char* buf;
+ const char* buf;
unsigned int pad0[ 3 ];
size_t size;
unsigned int pad1[ 3 ];
@@ -50,7 +50,7 @@ typedef struct
size_t
_DEFUN (fwrite, (buf, size, count, fp),
- _CONST _PTR __restrict buf,
+ const _PTR __restrict buf,
size_t size,
size_t count,
FILE * fp)
diff --git a/newlib/libc/machine/spu/impure.c b/newlib/libc/machine/spu/impure.c
index 5fbe0e5f5..f9c86efdc 100644
--- a/newlib/libc/machine/spu/impure.c
+++ b/newlib/libc/machine/spu/impure.c
@@ -11,4 +11,4 @@
struct _reent __ATTRIBUTE_IMPURE_DATA__ _impure_data = _REENT_INIT(_impure_data);
struct _reent *__ATTRIBUTE_IMPURE_PTR__ _impure_ptr = &_impure_data;
-struct _reent *_CONST __ATTRIBUTE_IMPURE_PTR__ _global_impure_ptr = &_impure_data;
+struct _reent *const __ATTRIBUTE_IMPURE_PTR__ _global_impure_ptr = &_impure_data;
diff --git a/newlib/libc/machine/spu/perror.c b/newlib/libc/machine/spu/perror.c
index 028f44a37..612467318 100644
--- a/newlib/libc/machine/spu/perror.c
+++ b/newlib/libc/machine/spu/perror.c
@@ -7,7 +7,7 @@
typedef struct
{
- _CONST char* str;
+ const char* str;
unsigned int pad0[ 3 ];
int arg_errno;
unsigned int pad1[ 3 ];
@@ -15,7 +15,7 @@ typedef struct
void
_DEFUN (perror, (s),
- _CONST char *s)
+ const char *s)
{
c99_perror_t arg;
diff --git a/newlib/libc/machine/spu/puts.c b/newlib/libc/machine/spu/puts.c
index 06f4b87b6..427508969 100644
--- a/newlib/libc/machine/spu/puts.c
+++ b/newlib/libc/machine/spu/puts.c
@@ -6,7 +6,7 @@
int
_DEFUN (puts, (s),
- char _CONST * s)
+ char const * s)
{
CHECK_STD_INIT(_REENT);
diff --git a/newlib/libc/machine/spu/remove.c b/newlib/libc/machine/spu/remove.c
index 930a98036..1a379dedc 100644
--- a/newlib/libc/machine/spu/remove.c
+++ b/newlib/libc/machine/spu/remove.c
@@ -36,7 +36,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
int
remove (filename)
- _CONST char *filename;
+ const char *filename;
{
/* The return value gets written over buf
diff --git a/newlib/libc/machine/spu/rename.c b/newlib/libc/machine/spu/rename.c
index bf58fbdc4..e60355de7 100644
--- a/newlib/libc/machine/spu/rename.c
+++ b/newlib/libc/machine/spu/rename.c
@@ -37,16 +37,16 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
typedef struct
{
- _CONST char *old;
+ const char *old;
unsigned int pad0[ 3 ];
- _CONST char *new;
+ const char *new;
unsigned int pad1[ 3 ];
} c99_rename_t;
int
rename (old, new)
- _CONST char *old;
- _CONST char *new;
+ const char *old;
+ const char *new;
{
c99_rename_t args;
args.old = old;
diff --git a/newlib/libc/machine/spu/sys/errno.h b/newlib/libc/machine/spu/sys/errno.h
index 85aafcfd5..ef087bd68 100644
--- a/newlib/libc/machine/spu/sys/errno.h
+++ b/newlib/libc/machine/spu/sys/errno.h
@@ -32,7 +32,7 @@ extern struct _reent _impure_data;
/* Please don't use these variables directly.
Use strerror instead. */
-extern _CONST char * _CONST _sys_errlist[];
+extern const char * const _sys_errlist[];
extern int _sys_nerr;
#define __errno_r(ptr) ((ptr)->_errno)
diff --git a/newlib/libc/machine/spu/vfprintf.c b/newlib/libc/machine/spu/vfprintf.c
index e5ef2fa9f..90dcaef56 100644
--- a/newlib/libc/machine/spu/vfprintf.c
+++ b/newlib/libc/machine/spu/vfprintf.c
@@ -59,7 +59,7 @@ typedef struct
int
_DEFUN (vfprintf, (fp, fmt0, ap),
FILE *__restrict fp,
- _CONST char *__restrict fmt0,
+ const char *__restrict fmt0,
va_list ap)
{
c99_vfprintf_t args;
diff --git a/newlib/libc/machine/spu/vfscanf.c b/newlib/libc/machine/spu/vfscanf.c
index a497b7ba3..c22f76db7 100644
--- a/newlib/libc/machine/spu/vfscanf.c
+++ b/newlib/libc/machine/spu/vfscanf.c
@@ -59,7 +59,7 @@ typedef struct
int
_DEFUN (vfscanf, (fp, fmt, ap),
FILE *__restrict fp,
- _CONST char *__restrict fmt,
+ const char *__restrict fmt,
va_list ap)
{
c99_vfscanf_t args;
diff --git a/newlib/libc/machine/spu/vprintf.c b/newlib/libc/machine/spu/vprintf.c
index 35b12dfb5..e99144623 100644
--- a/newlib/libc/machine/spu/vprintf.c
+++ b/newlib/libc/machine/spu/vprintf.c
@@ -15,7 +15,7 @@
typedef struct
{
- _CONST char* fmt;
+ const char* fmt;
unsigned int pad0[ 3 ];
va_list ap;
} c99_vprintf_t;
@@ -24,7 +24,7 @@ typedef struct
int
_DEFUN (vprintf, (fmt, ap),
- _CONST char *fmt,
+ const char *fmt,
va_list ap)
{
c99_vprintf_t args;
diff --git a/newlib/libc/machine/spu/vscanf.c b/newlib/libc/machine/spu/vscanf.c
index 29b4948dd..aae6bc45b 100644
--- a/newlib/libc/machine/spu/vscanf.c
+++ b/newlib/libc/machine/spu/vscanf.c
@@ -56,7 +56,7 @@ typedef struct
int
_DEFUN (vscanf, (fmt, ap),
- _CONST char *fmt,
+ const char *fmt,
va_list ap)
{
c99_vscanf_t args;
diff --git a/newlib/libc/machine/spu/vsnprintf.c b/newlib/libc/machine/spu/vsnprintf.c
index f952b84c1..b30770d68 100644
--- a/newlib/libc/machine/spu/vsnprintf.c
+++ b/newlib/libc/machine/spu/vsnprintf.c
@@ -19,7 +19,7 @@ typedef struct
unsigned int pad0[ 3 ];
size_t size;
unsigned int pad1[ 3 ];
- _CONST char* fmt;
+ const char* fmt;
unsigned int pad2[ 3 ];
va_list ap;
} c99_vsnprintf_t;
@@ -30,7 +30,7 @@ int
_DEFUN (vsnprintf, (str, size, fmt, ap),
char *__restrict str,
size_t size,
- _CONST char *__restrict fmt,
+ const char *__restrict fmt,
va_list ap)
{
c99_vsnprintf_t args;
diff --git a/newlib/libc/machine/spu/vsprintf.c b/newlib/libc/machine/spu/vsprintf.c
index 1a44de479..12461c08e 100644
--- a/newlib/libc/machine/spu/vsprintf.c
+++ b/newlib/libc/machine/spu/vsprintf.c
@@ -28,7 +28,7 @@ typedef struct
int
_DEFUN (vsprintf, (str, fmt, ap),
char *__restrict str,
- _CONST char *__restrict fmt,
+ const char *__restrict fmt,
va_list ap)
{
c99_vsprintf_t args;
diff --git a/newlib/libc/machine/spu/vsscanf.c b/newlib/libc/machine/spu/vsscanf.c
index 38ee1f4b9..7725e6822 100644
--- a/newlib/libc/machine/spu/vsscanf.c
+++ b/newlib/libc/machine/spu/vsscanf.c
@@ -47,9 +47,9 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
typedef struct
{
- _CONST char *str;
+ const char *str;
unsigned int pad0[ 3 ];
- _CONST char *fmt;
+ const char *fmt;
unsigned int pad1[ 3 ];
va_list ap;
} c99_vsscanf_t;
@@ -58,8 +58,8 @@ typedef struct
int
_DEFUN (vsscanf, (str, fmt, ap),
- _CONST char *__restrict str,
- _CONST char *__restrict fmt,
+ const char *__restrict str,
+ const char *__restrict fmt,
va_list ap)
{
c99_vsscanf_t args;
diff --git a/newlib/libc/machine/xscale/strlen.c b/newlib/libc/machine/xscale/strlen.c
index a8bc0851d..70c9a3b44 100644
--- a/newlib/libc/machine/xscale/strlen.c
+++ b/newlib/libc/machine/xscale/strlen.c
@@ -10,7 +10,7 @@
size_t
strlen (const char *str)
{
- _CONST char *start = str;
+ const char *start = str;
/* Skip unaligned part. */
if ((long)str & 3)
diff --git a/newlib/libc/misc/__dprintf.c b/newlib/libc/misc/__dprintf.c
index 6026d195c..5fa30e0ab 100644
--- a/newlib/libc/misc/__dprintf.c
+++ b/newlib/libc/misc/__dprintf.c
@@ -23,7 +23,7 @@ static char *parse_number ();
static long _EXFUN(get_number, (char *, long, int));
static void _EXFUN(print_number, (int, int, long));
static void _EXFUN(write_char, (char c));
-static void _EXFUN(write_string, (_CONST char *s));
+static void _EXFUN(write_string, (const char *s));
/* Non-zero for big-endian systems. */
static int big_endian_p;
@@ -266,7 +266,7 @@ _DEFUN(write_char, (c),
static void
_DEFUN(write_string, (s),
- _CONST char *s)
+ const char *s)
{
_write_r (_REENT, CONSOLE_FD, s, strlen (s));
}
diff --git a/newlib/libc/misc/unctrl.c b/newlib/libc/misc/unctrl.c
index e2cdb3861..8bca2a2a5 100644
--- a/newlib/libc/misc/unctrl.c
+++ b/newlib/libc/misc/unctrl.c
@@ -69,7 +69,7 @@ No supporting OS subroutines are required.
static char sccsid[] = "@(#)unctrl.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
-_CONST char * _CONST __unctrl[256] = {
+const char * const __unctrl[256] = {
"^@", "^A", "^B", "^C", "^D", "^E", "^F", "^G",
"^H", "^I", "^J", "^K", "^L", "^M", "^N", "^O",
"^P", "^Q", "^R", "^S", "^T", "^U", "^V", "^W",
@@ -105,7 +105,7 @@ _CONST char * _CONST __unctrl[256] = {
"0xf8", "0xf9", "0xfa", "0xfb", "0xfc", "0xfd", "0xfe", "0xff",
};
-_CONST char __unctrllen[256] = {
+const char __unctrllen[256] = {
2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2,
diff --git a/newlib/libc/posix/execl.c b/newlib/libc/posix/execl.c
index beb48c6ae..fbad9f3f8 100644
--- a/newlib/libc/posix/execl.c
+++ b/newlib/libc/posix/execl.c
@@ -19,8 +19,8 @@ static char ***p_environ = &environ;
int
_DEFUN(execl, (path, arg0, ...),
- _CONST char *path,
- _CONST char *arg0 _DOTS)
+ const char *path,
+ const char *arg0 _DOTS)
#else
@@ -28,8 +28,8 @@ _DEFUN(execl, (path, arg0, ...),
int
_DEFUN(execl, (path, arg0, va_alist),
- _CONST char *path,
- _CONST char *arg0,
+ const char *path,
+ const char *arg0,
va_dcl)
#endif
@@ -37,16 +37,16 @@ _DEFUN(execl, (path, arg0, va_alist),
{
int i;
va_list args;
- _CONST char *argv[256];
+ const char *argv[256];
va_start (args, arg0);
argv[0] = arg0;
i = 1;
do
- argv[i] = va_arg (args, _CONST char *);
+ argv[i] = va_arg (args, const char *);
while (argv[i++] != NULL);
va_end (args);
- return _execve (path, (char * _CONST *) argv, *p_environ);
+ return _execve (path, (char * const *) argv, *p_environ);
}
#endif /* !_NO_EXECVE */
diff --git a/newlib/libc/posix/execle.c b/newlib/libc/posix/execle.c
index f4c759250..c18555c02 100644
--- a/newlib/libc/posix/execle.c
+++ b/newlib/libc/posix/execle.c
@@ -14,8 +14,8 @@
int
_DEFUN(execle, (path, arg0, ...),
- _CONST char *path,
- _CONST char *arg0 _DOTS)
+ const char *path,
+ const char *arg0 _DOTS)
#else
@@ -23,8 +23,8 @@ _DEFUN(execle, (path, arg0, ...),
int
_DEFUN(execle, (path, arg0, va_alist),
- _CONST char *path,
- _CONST char *arg0,
+ const char *path,
+ const char *arg0,
va_dcl)
#endif
@@ -32,19 +32,19 @@ _DEFUN(execle, (path, arg0, va_alist),
{
int i;
va_list args;
- _CONST char * _CONST *envp;
- _CONST char *argv[256];
+ const char * const *envp;
+ const char *argv[256];
va_start (args, arg0);
argv[0] = arg0;
i = 1;
do
- argv[i] = va_arg (args, _CONST char *);
+ argv[i] = va_arg (args, const char *);
while (argv[i++] != NULL);
- envp = va_arg (args, _CONST char * _CONST *);
+ envp = va_arg (args, const char * const *);
va_end (args);
- return _execve (path, (char * _CONST *) argv, (char * _CONST *) envp);
+ return _execve (path, (char * const *) argv, (char * const *) envp);
}
#endif /* !_NO_EXECVE */
diff --git a/newlib/libc/posix/execlp.c b/newlib/libc/posix/execlp.c
index 6731bb905..6b9c2f7e9 100644
--- a/newlib/libc/posix/execlp.c
+++ b/newlib/libc/posix/execlp.c
@@ -14,8 +14,8 @@
int
_DEFUN(execlp, (path, arg0, ...),
- _CONST char *path,
- _CONST char *arg0 _DOTS)
+ const char *path,
+ const char *arg0 _DOTS)
#else
@@ -23,8 +23,8 @@ _DEFUN(execlp, (path, arg0, ...),
int
_DEFUN(execlp, (path, arg0, va_alist),
- _CONST char *path,
- _CONST char *arg0,
+ const char *path,
+ const char *arg0,
va_dcl)
#endif
@@ -32,17 +32,17 @@ _DEFUN(execlp, (path, arg0, va_alist),
{
int i;
va_list args;
- _CONST char *argv[256];
+ const char *argv[256];
va_start (args, arg0);
argv[0] = arg0;
i = 1;
do
- argv[i] = va_arg (args, _CONST char *);
+ argv[i] = va_arg (args, const char *);
while (argv[i++] != NULL);
va_end (args);
- return execvp (path, (char * _CONST *) argv);
+ return execvp (path, (char * const *) argv);
}
#endif /* !_NO_EXECVE */
diff --git a/newlib/libc/posix/execv.c b/newlib/libc/posix/execv.c
index 049a5381d..96220dd98 100644
--- a/newlib/libc/posix/execv.c
+++ b/newlib/libc/posix/execv.c
@@ -18,7 +18,7 @@ _DEFUN (execv, (path, argv),
const char *path,
char * const argv[])
{
- return _execve (path, (char * _CONST *) argv, *p_environ);
+ return _execve (path, (char * const *) argv, *p_environ);
}
#endif /* !_NO_EXECVE */
diff --git a/newlib/libc/posix/execvp.c b/newlib/libc/posix/execvp.c
index db7e03456..1c1fd3a01 100644
--- a/newlib/libc/posix/execvp.c
+++ b/newlib/libc/posix/execvp.c
@@ -37,8 +37,8 @@ _DEFUN (strccpy, (s1, s2, c),
int
_DEFUN (execvp, (file, argv),
- _CONST char *file,
- char * _CONST argv[])
+ const char *file,
+ char * const argv[])
{
char *path = getenv ("PATH");
char buf[MAXNAMLEN];
diff --git a/newlib/libc/posix/posix_spawn.c b/newlib/libc/posix/posix_spawn.c
index 8e54de7fa..cade6b005 100644
--- a/newlib/libc/posix/posix_spawn.c
+++ b/newlib/libc/posix/posix_spawn.c
@@ -147,7 +147,7 @@ typedef struct __posix_spawn_file_actions_entry {
*/
static int
-process_spawnattr(_CONST posix_spawnattr_t sa)
+process_spawnattr(const posix_spawnattr_t sa)
{
struct sigaction sigact = { .sa_flags = 0, .sa_handler = SIG_DFL };
int i;
@@ -240,7 +240,7 @@ process_file_actions_entry(posix_spawn_file_actions_entry_t *fae)
}
static int
-process_file_actions(_CONST posix_spawn_file_actions_t fa)
+process_file_actions(const posix_spawn_file_actions_t fa)
{
posix_spawn_file_actions_entry_t *fae;
int error;
@@ -255,10 +255,10 @@ process_file_actions(_CONST posix_spawn_file_actions_t fa)
}
static int
-do_posix_spawn(pid_t *pid, _CONST char *path,
- _CONST posix_spawn_file_actions_t *fa,
- _CONST posix_spawnattr_t *sa,
- char * _CONST argv[], char * _CONST envp[], int use_env_path)
+do_posix_spawn(pid_t *pid, const char *path,
+ const posix_spawn_file_actions_t *fa,
+ const posix_spawnattr_t *sa,
+ char * const argv[], char * const envp[], int use_env_path)
{
pid_t p;
volatile int error = 0;
@@ -296,11 +296,11 @@ do_posix_spawn(pid_t *pid, _CONST char *path,
int
_DEFUN(posix_spawn, (pid, path, fa, sa, argv, envp),
pid_t *pid,
- _CONST char *path,
- _CONST posix_spawn_file_actions_t *fa,
- _CONST posix_spawnattr_t *sa,
- char * _CONST argv[],
- char * _CONST envp[])
+ const char *path,
+ const posix_spawn_file_actions_t *fa,
+ const posix_spawnattr_t *sa,
+ char * const argv[],
+ char * const envp[])
{
return do_posix_spawn(pid, path, fa, sa, argv, envp, 0);
}
@@ -308,11 +308,11 @@ _DEFUN(posix_spawn, (pid, path, fa, sa, argv, envp),
int
_DEFUN(posix_spawnp, (pid, path, fa, sa, argv, envp),
pid_t *pid,
- _CONST char *path,
- _CONST posix_spawn_file_actions_t *fa,
- _CONST posix_spawnattr_t *sa,
- char * _CONST argv[],
- char * _CONST envp[])
+ const char *path,
+ const posix_spawn_file_actions_t *fa,
+ const posix_spawnattr_t *sa,
+ char * const argv[],
+ char * const envp[])
{
return do_posix_spawn(pid, path, fa, sa, argv, envp, 1);
}
@@ -360,7 +360,7 @@ int
_DEFUN(posix_spawn_file_actions_addopen, (fa, fildes, path, oflag, mode),
posix_spawn_file_actions_t * __restrict fa,
int fildes,
- _CONST char * __restrict path,
+ const char * __restrict path,
int oflag,
mode_t mode)
{
@@ -468,7 +468,7 @@ _DEFUN(posix_spawnattr_destroy, (sa),
int
_DEFUN(posix_spawnattr_getflags, (sa, flags),
- _CONST posix_spawnattr_t * __restrict sa,
+ const posix_spawnattr_t * __restrict sa,
short * __restrict flags)
{
*flags = (*sa)->sa_flags;
@@ -477,7 +477,7 @@ _DEFUN(posix_spawnattr_getflags, (sa, flags),
int
_DEFUN(posix_spawnattr_getpgroup, (sa, pgroup),
- _CONST posix_spawnattr_t * __restrict sa,
+ const posix_spawnattr_t * __restrict sa,
pid_t * __restrict pgroup)
{
*pgroup = (*sa)->sa_pgroup;
@@ -486,7 +486,7 @@ _DEFUN(posix_spawnattr_getpgroup, (sa, pgroup),
int
_DEFUN(posix_spawnattr_getschedparam, (sa, schedparam),
- _CONST posix_spawnattr_t * __restrict sa,
+ const posix_spawnattr_t * __restrict sa,
struct sched_param * __restrict schedparam)
{
*schedparam = (*sa)->sa_schedparam;
@@ -495,7 +495,7 @@ _DEFUN(posix_spawnattr_getschedparam, (sa, schedparam),
int
_DEFUN(posix_spawnattr_getschedpolicy, (sa, schedpolicy),
- _CONST posix_spawnattr_t * __restrict sa,
+ const posix_spawnattr_t * __restrict sa,
int * __restrict schedpolicy)
{
*schedpolicy = (*sa)->sa_schedpolicy;
@@ -504,7 +504,7 @@ _DEFUN(posix_spawnattr_getschedpolicy, (sa, schedpolicy),
int
_DEFUN(posix_spawnattr_getsigdefault, (sa, sigdefault),
- _CONST posix_spawnattr_t * __restrict sa,
+ const posix_spawnattr_t * __restrict sa,
sigset_t * __restrict sigdefault)
{
*sigdefault = (*sa)->sa_sigdefault;
@@ -513,7 +513,7 @@ _DEFUN(posix_spawnattr_getsigdefault, (sa, sigdefault),
int
_DEFUN(posix_spawnattr_getsigmask, (sa, sigmask),
- _CONST posix_spawnattr_t * __restrict sa,
+ const posix_spawnattr_t * __restrict sa,
sigset_t * __restrict sigmask)
{
*sigmask = (*sa)->sa_sigmask;
@@ -541,7 +541,7 @@ _DEFUN(posix_spawnattr_setpgroup, (sa, pgroup),
int
_DEFUN(posix_spawnattr_setschedparam, (sa, schedparam),
posix_spawnattr_t * __restrict sa,
- _CONST struct sched_param * __restrict schedparam)
+ const struct sched_param * __restrict schedparam)
{
(*sa)->sa_schedparam = *schedparam;
return (0);
@@ -559,7 +559,7 @@ _DEFUN(posix_spawnattr_setschedpolicy, (sa, schedpolicy),
int
_DEFUN(posix_spawnattr_setsigdefault, (sa, sigdefault),
posix_spawnattr_t * __restrict sa,
- _CONST sigset_t * __restrict sigdefault)
+ const sigset_t * __restrict sigdefault)
{
(*sa)->sa_sigdefault = *sigdefault;
return (0);
@@ -568,7 +568,7 @@ _DEFUN(posix_spawnattr_setsigdefault, (sa, sigdefault),
int
_DEFUN(posix_spawnattr_setsigmask, (sa, sigmask),
posix_spawnattr_t * __restrict sa,
- _CONST sigset_t * __restrict sigmask)
+ const sigset_t * __restrict sigmask)
{
(*sa)->sa_sigmask = *sigmask;
return (0);
diff --git a/newlib/libc/reent/execr.c b/newlib/libc/reent/execr.c
index cb78fba76..0dc531384 100644
--- a/newlib/libc/reent/execr.c
+++ b/newlib/libc/reent/execr.c
@@ -47,9 +47,9 @@ DESCRIPTION
int
_DEFUN (_execve_r, (ptr, name, argv, env),
struct _reent *ptr,
- _CONST char *name,
- char *_CONST argv[],
- char *_CONST env[])
+ const char *name,
+ char *const argv[],
+ char *const env[])
{
int ret;
diff --git a/newlib/libc/reent/impure.c b/newlib/libc/reent/impure.c
index f5918c88f..76f67459e 100644
--- a/newlib/libc/reent/impure.c
+++ b/newlib/libc/reent/impure.c
@@ -25,4 +25,4 @@ static struct _reent __ATTRIBUTE_IMPURE_DATA__ impure_data = _REENT_INIT (impure
extern struct _reent reent_data __attribute__ ((alias("impure_data")));
#endif
struct _reent *__ATTRIBUTE_IMPURE_PTR__ _impure_ptr = &impure_data;
-struct _reent *_CONST __ATTRIBUTE_IMPURE_PTR__ _global_impure_ptr = &impure_data;
+struct _reent *const __ATTRIBUTE_IMPURE_PTR__ _global_impure_ptr = &impure_data;
diff --git a/newlib/libc/reent/linkr.c b/newlib/libc/reent/linkr.c
index 59113d26e..5e85f2d2e 100644
--- a/newlib/libc/reent/linkr.c
+++ b/newlib/libc/reent/linkr.c
@@ -45,8 +45,8 @@ DESCRIPTION
int
_DEFUN (_link_r, (ptr, old, new),
struct _reent *ptr,
- _CONST char *old,
- _CONST char *new)
+ const char *old,
+ const char *new)
{
int ret;
diff --git a/newlib/libc/reent/mkdirr.c b/newlib/libc/reent/mkdirr.c
index 4c2c94f9c..dca20dc2c 100644
--- a/newlib/libc/reent/mkdirr.c
+++ b/newlib/libc/reent/mkdirr.c
@@ -42,7 +42,7 @@ DESCRIPTION
int
_DEFUN (_mkdir_r, (ptr, path, mode),
struct _reent *ptr,
- _CONST char *path,
+ const char *path,
int mode)
{
int ret;
diff --git a/newlib/libc/reent/open64r.c b/newlib/libc/reent/open64r.c
index 6b39fa1fd..84bd67e34 100644
--- a/newlib/libc/reent/open64r.c
+++ b/newlib/libc/reent/open64r.c
@@ -44,7 +44,7 @@ DESCRIPTION
int
_open64_r (ptr, file, flags, mode)
struct _reent *ptr;
- _CONST char *file;
+ const char *file;
int flags;
int mode;
{
diff --git a/newlib/libc/reent/openr.c b/newlib/libc/reent/openr.c
index f38ff8458..33ace75ad 100644
--- a/newlib/libc/reent/openr.c
+++ b/newlib/libc/reent/openr.c
@@ -41,7 +41,7 @@ DESCRIPTION
int
_DEFUN (_open_r, (ptr, file, flags, mode),
struct _reent *ptr,
- _CONST char *file,
+ const char *file,
int flags,
int mode)
{
diff --git a/newlib/libc/reent/renamer.c b/newlib/libc/reent/renamer.c
index e55c2f291..736c1a30f 100644
--- a/newlib/libc/reent/renamer.c
+++ b/newlib/libc/reent/renamer.c
@@ -42,8 +42,8 @@ DESCRIPTION
int
_DEFUN (_rename_r, (ptr, old, new),
struct _reent *ptr,
- _CONST char *old,
- _CONST char *new)
+ const char *old,
+ const char *new)
{
int ret = 0;
diff --git a/newlib/libc/reent/stat64r.c b/newlib/libc/reent/stat64r.c
index 134ca82ef..2077c0a2e 100644
--- a/newlib/libc/reent/stat64r.c
+++ b/newlib/libc/reent/stat64r.c
@@ -47,7 +47,7 @@ DESCRIPTION
int
_DEFUN (_stat64_r, (ptr, file, pstat),
struct _reent *ptr,
- _CONST char *file,
+ const char *file,
struct stat64 *pstat)
{
int ret;
diff --git a/newlib/libc/reent/statr.c b/newlib/libc/reent/statr.c
index 2b271e10f..fb27ab0c0 100644
--- a/newlib/libc/reent/statr.c
+++ b/newlib/libc/reent/statr.c
@@ -47,7 +47,7 @@ DESCRIPTION
int
_DEFUN (_stat_r, (ptr, file, pstat),
struct _reent *ptr,
- _CONST char *file,
+ const char *file,
struct stat *pstat)
{
int ret;
diff --git a/newlib/libc/reent/unlinkr.c b/newlib/libc/reent/unlinkr.c
index eb000be15..0ef0ff56e 100644
--- a/newlib/libc/reent/unlinkr.c
+++ b/newlib/libc/reent/unlinkr.c
@@ -40,7 +40,7 @@ DESCRIPTION
int
_DEFUN (_unlink_r, (ptr, file),
struct _reent *ptr,
- _CONST char *file)
+ const char *file)
{
int ret;
diff --git a/newlib/libc/reent/writer.c b/newlib/libc/reent/writer.c
index 4e06d74ef..4c4f95f77 100644
--- a/newlib/libc/reent/writer.c
+++ b/newlib/libc/reent/writer.c
@@ -41,7 +41,7 @@ _ssize_t
_DEFUN (_write_r, (ptr, fd, buf, cnt),
struct _reent *ptr,
int fd,
- _CONST _PTR buf,
+ const _PTR buf,
size_t cnt)
{
_ssize_t ret;
diff --git a/newlib/libc/search/bsearch.c b/newlib/libc/search/bsearch.c
index c15ea64d2..86380a816 100644
--- a/newlib/libc/search/bsearch.c
+++ b/newlib/libc/search/bsearch.c
@@ -57,8 +57,8 @@ No supporting OS subroutines are required.
_PTR
_DEFUN (bsearch, (key, base, nmemb, size, compar),
- _CONST _PTR key,
- _CONST _PTR base,
+ const _PTR key,
+ const _PTR base,
size_t nmemb,
size_t size,
int _EXFNPTR(compar, (const _PTR, const _PTR)))
diff --git a/newlib/libc/signal/psignal.c b/newlib/libc/signal/psignal.c
index f0c9b6ee6..6263c3f70 100644
--- a/newlib/libc/signal/psignal.c
+++ b/newlib/libc/signal/psignal.c
@@ -36,7 +36,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
_VOID
_DEFUN(psignal, (sig, s),
int sig,
- _CONST char *s)
+ const char *s)
{
if (s != NULL && *s != '\0')
fprintf (stderr, "%s: %s\n", s, strsignal (sig));
diff --git a/newlib/libc/stdio/fdopen.c b/newlib/libc/stdio/fdopen.c
index 7dda3c359..82b7a9bc2 100644
--- a/newlib/libc/stdio/fdopen.c
+++ b/newlib/libc/stdio/fdopen.c
@@ -56,7 +56,7 @@ FILE *
_DEFUN(_fdopen_r, (ptr, fd, mode),
struct _reent *ptr,
int fd,
- _CONST char *mode)
+ const char *mode)
{
register FILE *fp;
int flags, oflags;
@@ -125,7 +125,7 @@ _DEFUN(_fdopen_r, (ptr, fd, mode),
FILE *
_DEFUN(fdopen, (fd, mode),
int fd,
- _CONST char *mode)
+ const char *mode)
{
return _fdopen_r (_REENT, fd, mode);
}
diff --git a/newlib/libc/stdio/fiscanf.c b/newlib/libc/stdio/fiscanf.c
index 53fee8454..7b497bddb 100644
--- a/newlib/libc/stdio/fiscanf.c
+++ b/newlib/libc/stdio/fiscanf.c
@@ -29,7 +29,7 @@
int
#ifdef _HAVE_STDC
-fiscanf(FILE *fp, _CONST char *fmt, ...)
+fiscanf(FILE *fp, const char *fmt, ...)
#else
fiscanf(FILE *fp, fmt, va_alist)
FILE *fp;
@@ -54,7 +54,7 @@ fiscanf(FILE *fp, fmt, va_alist)
int
#ifdef _HAVE_STDC
-_fiscanf_r(struct _reent *ptr, FILE *fp, _CONST char *fmt, ...)
+_fiscanf_r(struct _reent *ptr, FILE *fp, const char *fmt, ...)
#else
_fiscanf_r(ptr, FILE *fp, fmt, va_alist)
struct _reent *ptr;
diff --git a/newlib/libc/stdio/fopen.c b/newlib/libc/stdio/fopen.c
index 92ec70670..e6b044557 100644
--- a/newlib/libc/stdio/fopen.c
+++ b/newlib/libc/stdio/fopen.c
@@ -115,8 +115,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
FILE *
_DEFUN(_fopen_r, (ptr, file, mode),
struct _reent *ptr,
- _CONST char *__restrict file,
- _CONST char *__restrict mode)
+ const char *__restrict file,
+ const char *__restrict mode)
{
register FILE *fp;
register int f;
@@ -164,8 +164,8 @@ _DEFUN(_fopen_r, (ptr, file, mode),
FILE *
_DEFUN(fopen, (file, mode),
- _CONST char *file,
- _CONST char *mode)
+ const char *file,
+ const char *mode)
{
return _fopen_r (_REENT, file, mode);
}
diff --git a/newlib/libc/stdio/fputs.c b/newlib/libc/stdio/fputs.c
index 7adb89a04..0fd051bad 100644
--- a/newlib/libc/stdio/fputs.c
+++ b/newlib/libc/stdio/fputs.c
@@ -88,7 +88,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
_DEFUN(_fputs_r, (ptr, s, fp),
struct _reent * ptr,
- char _CONST *__restrict s,
+ char const *__restrict s,
FILE *__restrict fp)
{
#ifdef _FVWRITE_IN_STREAMIO
@@ -109,7 +109,7 @@ _DEFUN(_fputs_r, (ptr, s, fp),
_newlib_flockfile_end (fp);
return result;
#else
- _CONST char *p = s;
+ const char *p = s;
CHECK_INIT(ptr, fp);
@@ -136,7 +136,7 @@ error:
#ifndef _REENT_ONLY
int
_DEFUN(fputs, (s, fp),
- char _CONST *__restrict s,
+ char const *__restrict s,
FILE *__restrict fp)
{
return _fputs_r (_REENT, s, fp);
diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c
index b9fee0c7b..7e70b9a98 100644
--- a/newlib/libc/stdio/freopen.c
+++ b/newlib/libc/stdio/freopen.c
@@ -244,8 +244,8 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
FILE *
_DEFUN(freopen, (file, mode, fp),
- _CONST char *__restrict file,
- _CONST char *__restrict mode,
+ const char *__restrict file,
+ const char *__restrict mode,
register FILE *__restrict fp)
{
return _freopen_r (_REENT, file, mode, fp);
diff --git a/newlib/libc/stdio/fscanf.c b/newlib/libc/stdio/fscanf.c
index 87b51dd88..40705a5e7 100644
--- a/newlib/libc/stdio/fscanf.c
+++ b/newlib/libc/stdio/fscanf.c
@@ -29,7 +29,7 @@
int
#ifdef _HAVE_STDC
-fscanf(FILE *__restrict fp, _CONST char *__restrict fmt, ...)
+fscanf(FILE *__restrict fp, const char *__restrict fmt, ...)
#else
fscanf(FILE *fp, fmt, va_alist)
FILE *fp;
@@ -60,7 +60,7 @@ _EXFUN(fiscanf, (FILE *, const char *, ...)
int
#ifdef _HAVE_STDC
-_fscanf_r(struct _reent *ptr, FILE *__restrict fp, _CONST char *__restrict fmt, ...)
+_fscanf_r(struct _reent *ptr, FILE *__restrict fp, const char *__restrict fmt, ...)
#else
_fscanf_r(ptr, FILE *fp, fmt, va_alist)
struct _reent *ptr;
diff --git a/newlib/libc/stdio/fsetpos.c b/newlib/libc/stdio/fsetpos.c
index ffc9d794c..d765081a6 100644
--- a/newlib/libc/stdio/fsetpos.c
+++ b/newlib/libc/stdio/fsetpos.c
@@ -62,7 +62,7 @@ int
_DEFUN(_fsetpos_r, (ptr, iop, pos),
struct _reent * ptr,
FILE * iop,
- _CONST _fpos_t * pos)
+ const _fpos_t * pos)
{
int x = _fseek_r (ptr, iop, *pos, SEEK_SET);
@@ -76,7 +76,7 @@ _DEFUN(_fsetpos_r, (ptr, iop, pos),
int
_DEFUN(fsetpos, (iop, pos),
FILE * iop,
- _CONST _fpos_t * pos)
+ const _fpos_t * pos)
{
return _fsetpos_r (_REENT, iop, pos);
}
diff --git a/newlib/libc/stdio/fvwrite.c b/newlib/libc/stdio/fvwrite.c
index a0432a03d..c93888dc4 100644
--- a/newlib/libc/stdio/fvwrite.c
+++ b/newlib/libc/stdio/fvwrite.c
@@ -51,7 +51,7 @@ _DEFUN(__sfvwrite_r, (ptr, fp, uio),
register struct __suio *uio)
{
register size_t len;
- register _CONST char *p = NULL;
+ register const char *p = NULL;
register struct __siov *iov;
register _READ_WRITE_RETURN_TYPE w, s;
char *nl;
diff --git a/newlib/libc/stdio/fvwrite.h b/newlib/libc/stdio/fvwrite.h
index 5c078fe68..8b01a2a9d 100644
--- a/newlib/libc/stdio/fvwrite.h
+++ b/newlib/libc/stdio/fvwrite.h
@@ -22,7 +22,7 @@
* I/O descriptors for __sfvwrite_r().
*/
struct __siov {
- _CONST _PTR iov_base;
+ const _PTR iov_base;
size_t iov_len;
};
struct __suio {
diff --git a/newlib/libc/stdio/fwrite.c b/newlib/libc/stdio/fwrite.c
index a805eff7f..cfaa2499a 100644
--- a/newlib/libc/stdio/fwrite.c
+++ b/newlib/libc/stdio/fwrite.c
@@ -110,7 +110,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
size_t
_DEFUN(_fwrite_r, (ptr, buf, size, count, fp),
struct _reent * ptr,
- _CONST _PTR __restrict buf,
+ const _PTR __restrict buf,
size_t size,
size_t count,
FILE * __restrict fp)
@@ -144,7 +144,7 @@ _DEFUN(_fwrite_r, (ptr, buf, size, count, fp),
return (n - uio.uio_resid) / size;
#else
size_t i = 0;
- _CONST char *p = buf;
+ const char *p = buf;
n = count * size;
CHECK_INIT (ptr, fp);
@@ -171,7 +171,7 @@ ret:
#ifndef _REENT_ONLY
size_t
_DEFUN(fwrite, (buf, size, count, fp),
- _CONST _PTR __restrict buf,
+ const _PTR __restrict buf,
size_t size,
size_t count,
FILE * fp)
diff --git a/newlib/libc/stdio/fwscanf.c b/newlib/libc/stdio/fwscanf.c
index 8572f4185..1b86a3472 100644
--- a/newlib/libc/stdio/fwscanf.c
+++ b/newlib/libc/stdio/fwscanf.c
@@ -26,7 +26,7 @@
#ifndef _REENT_ONLY
int
-fwscanf (FILE *__restrict fp, _CONST wchar_t *__restrict fmt, ...)
+fwscanf (FILE *__restrict fp, const wchar_t *__restrict fmt, ...)
{
int ret;
va_list ap;
@@ -40,7 +40,7 @@ fwscanf (FILE *__restrict fp, _CONST wchar_t *__restrict fmt, ...)
#endif /* !_REENT_ONLY */
int
-_fwscanf_r (struct _reent *ptr, FILE *fp, _CONST wchar_t *fmt, ...)
+_fwscanf_r (struct _reent *ptr, FILE *fp, const wchar_t *fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio/iscanf.c b/newlib/libc/stdio/iscanf.c
index f35acd2ed..aefd1a4ac 100644
--- a/newlib/libc/stdio/iscanf.c
+++ b/newlib/libc/stdio/iscanf.c
@@ -29,7 +29,7 @@
int
#ifdef _HAVE_STDC
-iscanf(_CONST char *fmt, ...)
+iscanf(const char *fmt, ...)
#else
iscanf(fmt, va_alist)
char *fmt;
@@ -54,7 +54,7 @@ iscanf(fmt, va_alist)
int
#ifdef _HAVE_STDC
-_iscanf_r(struct _reent *ptr, _CONST char *fmt, ...)
+_iscanf_r(struct _reent *ptr, const char *fmt, ...)
#else
_iscanf_r(ptr, fmt, va_alist)
struct _reent *ptr;
diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h
index 511e5e35f..b5fd1198a 100644
--- a/newlib/libc/stdio/local.h
+++ b/newlib/libc/stdio/local.h
@@ -143,14 +143,14 @@
extern wint_t _EXFUN(__fgetwc, (struct _reent *, FILE *));
extern wint_t _EXFUN(__fputwc, (struct _reent *, wchar_t, FILE *));
extern u_char *_EXFUN(__sccl, (char *, u_char *fmt));
-extern int _EXFUN(__svfscanf_r,(struct _reent *,FILE *, _CONST char *,va_list));
-extern int _EXFUN(__ssvfscanf_r,(struct _reent *,FILE *, _CONST char *,va_list));
-extern int _EXFUN(__svfiscanf_r,(struct _reent *,FILE *, _CONST char *,va_list));
-extern int _EXFUN(__ssvfiscanf_r,(struct _reent *,FILE *, _CONST char *,va_list));
-extern int _EXFUN(__svfwscanf_r,(struct _reent *,FILE *, _CONST wchar_t *,va_list));
-extern int _EXFUN(__ssvfwscanf_r,(struct _reent *,FILE *, _CONST wchar_t *,va_list));
-extern int _EXFUN(__svfiwscanf_r,(struct _reent *,FILE *, _CONST wchar_t *,va_list));
-extern int _EXFUN(__ssvfiwscanf_r,(struct _reent *,FILE *, _CONST wchar_t *,va_list));
+extern int _EXFUN(__svfscanf_r,(struct _reent *,FILE *, const char *,va_list));
+extern int _EXFUN(__ssvfscanf_r,(struct _reent *,FILE *, const char *,va_list));
+extern int _EXFUN(__svfiscanf_r,(struct _reent *,FILE *, const char *,va_list));
+extern int _EXFUN(__ssvfiscanf_r,(struct _reent *,FILE *, const char *,va_list));
+extern int _EXFUN(__svfwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
+extern int _EXFUN(__ssvfwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
+extern int _EXFUN(__svfiwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
+extern int _EXFUN(__ssvfiwscanf_r,(struct _reent *,FILE *, const wchar_t *,va_list));
int _EXFUN(_svfprintf_r,(struct _reent *, FILE *, const char *,
va_list)
_ATTRIBUTE ((__format__ (__printf__, 3, 0))));
@@ -162,7 +162,7 @@ int _EXFUN(_svfwprintf_r,(struct _reent *, FILE *, const wchar_t *,
int _EXFUN(_svfiwprintf_r,(struct _reent *, FILE *, const wchar_t *,
va_list));
extern FILE *_EXFUN(__sfp,(struct _reent *));
-extern int _EXFUN(__sflags,(struct _reent *,_CONST char*, int*));
+extern int _EXFUN(__sflags,(struct _reent *,const char*, int*));
extern int _EXFUN(__sflush_r,(struct _reent *,FILE *));
#ifdef _STDIO_BSD_SEMANTICS
extern int _EXFUN(__sflushw_r,(struct _reent *,FILE *));
@@ -347,6 +347,6 @@ typedef enum __packed {
PWPOS, /* get positional parameter value for variable width or precision */
} __ACTION;
-extern _CONST __CH_CLASS __chclass[256];
-extern _CONST __STATE __state_table[MAX_STATE][MAX_CH_CLASS];
-extern _CONST __ACTION __action_table[MAX_STATE][MAX_CH_CLASS];
+extern const __CH_CLASS __chclass[256];
+extern const __STATE __state_table[MAX_STATE][MAX_CH_CLASS];
+extern const __ACTION __action_table[MAX_STATE][MAX_CH_CLASS];
diff --git a/newlib/libc/stdio/nano-vfprintf.c b/newlib/libc/stdio/nano-vfprintf.c
index 648bb33a7..ad75b195c 100644
--- a/newlib/libc/stdio/nano-vfprintf.c
+++ b/newlib/libc/stdio/nano-vfprintf.c
@@ -175,7 +175,7 @@ int
_DEFUN(__ssputs_r, (ptr, fp, buf, len),
struct _reent *ptr,
FILE *fp,
- _CONST char *buf,
+ const char *buf,
size_t len)
{
register int w;
@@ -251,7 +251,7 @@ _DEFUN(__ssprint_r, (ptr, fp, uio),
register size_t len;
register int w;
register struct __siov *iov;
- register _CONST char *p = NULL;
+ register const char *p = NULL;
iov = uio->uio_iov;
len = 0;
@@ -407,7 +407,7 @@ int
_DEFUN(__sfputs_r, (ptr, fp, buf, len),
struct _reent *ptr,
FILE *fp,
- _CONST char *buf,
+ const char *buf,
size_t len)
{
register int i;
@@ -438,13 +438,13 @@ _DEFUN(__sfputs_r, (ptr, fp, buf, len),
}
#endif /* STRING_ONLY. */
-int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, _CONST char *, va_list));
+int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, const char *, va_list));
#ifndef STRING_ONLY
int
_DEFUN(VFPRINTF, (fp, fmt0, ap),
FILE * fp,
- _CONST char *fmt0,
+ const char *fmt0,
va_list ap)
{
int result;
@@ -474,7 +474,7 @@ int
_DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
struct _reent *data,
FILE * fp,
- _CONST char *fmt0,
+ const char *fmt0,
va_list ap)
{
register char *fmt; /* Format string. */
@@ -484,7 +484,7 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
struct _prt_data_t prt_data; /* All data for decoding format string. */
/* Output function pointer. */
- int (*pfunc)(struct _reent *, FILE *, _CONST char *, size_t len);
+ int (*pfunc)(struct _reent *, FILE *, const char *, size_t len);
pfunc = __SPRINT;
diff --git a/newlib/libc/stdio/nano-vfprintf_float.c b/newlib/libc/stdio/nano-vfprintf_float.c
index aca24aec0..98893e97b 100644
--- a/newlib/libc/stdio/nano-vfprintf_float.c
+++ b/newlib/libc/stdio/nano-vfprintf_float.c
@@ -164,7 +164,7 @@ int
_printf_float (struct _reent *data,
struct _prt_data_t *pdata,
FILE * fp,
- int (*pfunc) (struct _reent *, FILE *, _CONST char *,
+ int (*pfunc) (struct _reent *, FILE *, const char *,
size_t len), va_list * ap)
{
#define _fpvalue (pdata->_double_)
diff --git a/newlib/libc/stdio/nano-vfprintf_i.c b/newlib/libc/stdio/nano-vfprintf_i.c
index 46945b34a..f7da95251 100644
--- a/newlib/libc/stdio/nano-vfprintf_i.c
+++ b/newlib/libc/stdio/nano-vfprintf_i.c
@@ -51,7 +51,7 @@ _printf_common (struct _reent *data,
int *realsz,
FILE *fp,
int (*pfunc)(struct _reent *, FILE *,
- _CONST char *, size_t len))
+ const char *, size_t len))
{
int n;
/*
@@ -106,7 +106,7 @@ error:
}
int
_printf_i (struct _reent *data, struct _prt_data_t *pdata, FILE *fp,
- int (*pfunc)(struct _reent *, FILE *, _CONST char *, size_t len),
+ int (*pfunc)(struct _reent *, FILE *, const char *, size_t len),
va_list *ap)
{
/* Field size expanded by dprec. */
diff --git a/newlib/libc/stdio/nano-vfprintf_local.h b/newlib/libc/stdio/nano-vfprintf_local.h
index 83b479e56..51e1df815 100644
--- a/newlib/libc/stdio/nano-vfprintf_local.h
+++ b/newlib/libc/stdio/nano-vfprintf_local.h
@@ -215,11 +215,11 @@ _printf_common (struct _reent *data,
int *realsz,
FILE *fp,
int (*pfunc)(struct _reent *, FILE *,
- _CONST char *, size_t len));
+ const char *, size_t len));
extern int
_printf_i (struct _reent *data, struct _prt_data_t *pdata, FILE *fp,
- int (*pfunc)(struct _reent *, FILE *, _CONST char *, size_t len),
+ int (*pfunc)(struct _reent *, FILE *, const char *, size_t len),
va_list *ap);
/* Make _printf_float weak symbol, so it won't be linked in if target program
@@ -229,6 +229,6 @@ _printf_float (struct _reent *data,
struct _prt_data_t *pdata,
FILE *fp,
int (*pfunc)(struct _reent *, FILE *,
- _CONST char *, size_t len),
+ const char *, size_t len),
va_list *ap) _ATTRIBUTE((__weak__));
#endif
diff --git a/newlib/libc/stdio/nano-vfscanf.c b/newlib/libc/stdio/nano-vfscanf.c
index 479f9776f..0196b285a 100644
--- a/newlib/libc/stdio/nano-vfscanf.c
+++ b/newlib/libc/stdio/nano-vfscanf.c
@@ -137,7 +137,7 @@ Supporting OS subroutines required:
int
_DEFUN(VFSCANF, (fp, fmt, ap),
register FILE *fp,
- _CONST char *fmt,
+ const char *fmt,
va_list ap)
{
CHECK_INIT(_REENT, fp);
@@ -151,7 +151,7 @@ _EXFUN(vfiscanf, (FILE *, const char *, __VALIST)
int
_DEFUN(__SVFSCANF, (fp, fmt0, ap),
register FILE *fp,
- char _CONST *fmt0,
+ char const *fmt0,
va_list ap)
{
return __SVFSCANF_R (_REENT, fp, fmt0, ap);
@@ -163,7 +163,7 @@ int
_DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
struct _reent *data,
register FILE *fp,
- _CONST char *fmt,
+ const char *fmt,
va_list ap)
{
CHECK_INIT(data, fp);
@@ -262,7 +262,7 @@ int
_DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
struct _reent *rptr,
register FILE *fp,
- char _CONST *fmt0,
+ char const *fmt0,
va_list ap)
{
register u_char *fmt = (u_char *) fmt0;
diff --git a/newlib/libc/stdio/perror.c b/newlib/libc/stdio/perror.c
index cd1829180..cda8a1112 100644
--- a/newlib/libc/stdio/perror.c
+++ b/newlib/libc/stdio/perror.c
@@ -61,7 +61,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
_VOID
_DEFUN(_perror_r, (ptr, s),
struct _reent *ptr,
- _CONST char *s)
+ const char *s)
{
char *error;
int dummy;
@@ -83,7 +83,7 @@ _DEFUN(_perror_r, (ptr, s),
_VOID
_DEFUN(perror, (s),
- _CONST char *s)
+ const char *s)
{
_perror_r (_REENT, s);
}
diff --git a/newlib/libc/stdio/puts.c b/newlib/libc/stdio/puts.c
index 36cc83203..89a9485bb 100644
--- a/newlib/libc/stdio/puts.c
+++ b/newlib/libc/stdio/puts.c
@@ -67,7 +67,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(_puts_r, (ptr, s),
struct _reent *ptr,
- _CONST char * s)
+ const char * s)
{
#ifdef _FVWRITE_IN_STREAMIO
int result;
@@ -126,7 +126,7 @@ err:
int
_DEFUN(puts, (s),
- char _CONST * s)
+ char const * s)
{
return _puts_r (_REENT, s);
}
diff --git a/newlib/libc/stdio/putw.c b/newlib/libc/stdio/putw.c
index 1e3c78c3e..5377d87d3 100644
--- a/newlib/libc/stdio/putw.c
+++ b/newlib/libc/stdio/putw.c
@@ -53,7 +53,7 @@ _DEFUN(putw, (w, fp),
int w,
register FILE *fp)
{
- if (fwrite ((_CONST char*)&w, sizeof (w), 1, fp) != 1)
+ if (fwrite ((const char*)&w, sizeof (w), 1, fp) != 1)
return EOF;
return 0;
}
diff --git a/newlib/libc/stdio/remove.c b/newlib/libc/stdio/remove.c
index 18c468d61..810b282ac 100644
--- a/newlib/libc/stdio/remove.c
+++ b/newlib/libc/stdio/remove.c
@@ -61,7 +61,7 @@ Supporting OS subroutine required: <<unlink>>.
int
_DEFUN(_remove_r, (ptr, filename),
struct _reent *ptr,
- _CONST char *filename)
+ const char *filename)
{
if (_unlink_r (ptr, filename) == -1)
return -1;
@@ -73,7 +73,7 @@ _DEFUN(_remove_r, (ptr, filename),
int
_DEFUN(remove, (filename),
- _CONST char *filename)
+ const char *filename)
{
return _remove_r (_REENT, filename);
}
diff --git a/newlib/libc/stdio/rename.c b/newlib/libc/stdio/rename.c
index a2b0d4188..a32770846 100644
--- a/newlib/libc/stdio/rename.c
+++ b/newlib/libc/stdio/rename.c
@@ -55,8 +55,8 @@ Supporting OS subroutines required: <<link>>, <<unlink>>, or <<rename>>.
int
_DEFUN(rename, (old, new),
- _CONST char *old,
- _CONST char *new)
+ const char *old,
+ const char *new)
{
return _rename_r (_REENT, old, new);
}
diff --git a/newlib/libc/stdio/scanf.c b/newlib/libc/stdio/scanf.c
index 23e97b83d..87cbeb7b8 100644
--- a/newlib/libc/stdio/scanf.c
+++ b/newlib/libc/stdio/scanf.c
@@ -29,7 +29,7 @@
int
#ifdef _HAVE_STDC
-scanf(_CONST char *__restrict fmt, ...)
+scanf(const char *__restrict fmt, ...)
#else
scanf(fmt, va_alist)
char *fmt;
@@ -61,7 +61,7 @@ _EXFUN(iscanf, (const char *, ...)
int
#ifdef _HAVE_STDC
-_scanf_r(struct _reent *ptr, _CONST char *__restrict fmt, ...)
+_scanf_r(struct _reent *ptr, const char *__restrict fmt, ...)
#else
_scanf_r(ptr, fmt, va_alist)
struct _reent *ptr;
diff --git a/newlib/libc/stdio/siprintf.c b/newlib/libc/stdio/siprintf.c
index 861fc8d67..e33687563 100644
--- a/newlib/libc/stdio/siprintf.c
+++ b/newlib/libc/stdio/siprintf.c
@@ -107,12 +107,12 @@ int
_DEFUN(_siprintf_r, (ptr, str, fmt),
struct _reent *ptr,
char *str,
- _CONST char *fmt _DOTS)
+ const char *fmt _DOTS)
#else
_siprintf_r(ptr, str, fmt, va_alist)
struct _reent *ptr;
char *str;
- _CONST char *fmt;
+ const char *fmt;
va_dcl
#endif
{
@@ -141,11 +141,11 @@ int
#ifdef _HAVE_STDC
_DEFUN(siprintf, (str, fmt),
char *str,
- _CONST char *fmt _DOTS)
+ const char *fmt _DOTS)
#else
siprintf(str, fmt, va_alist)
char *str;
- _CONST char *fmt;
+ const char *fmt;
va_dcl
#endif
{
diff --git a/newlib/libc/stdio/siscanf.c b/newlib/libc/stdio/siscanf.c
index 81d60d0ba..d5e62b40d 100644
--- a/newlib/libc/stdio/siscanf.c
+++ b/newlib/libc/stdio/siscanf.c
@@ -88,13 +88,13 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifdef _HAVE_STDC
int
_DEFUN(siscanf, (str, fmt),
- _CONST char *str,
- _CONST char *fmt _DOTS)
+ const char *str,
+ const char *fmt _DOTS)
#else
int
siscanf(str, fmt, va_alist)
- _CONST char *str;
- _CONST char *fmt;
+ const char *str;
+ const char *fmt;
va_dcl
#endif
{
@@ -125,14 +125,14 @@ siscanf(str, fmt, va_alist)
int
_DEFUN(_siscanf_r, (ptr, str, fmt),
struct _reent *ptr,
- _CONST char *str,
- _CONST char *fmt _DOTS)
+ const char *str,
+ const char *fmt _DOTS)
#else
int
_siscanf_r(ptr, str, fmt, va_alist)
struct _reent *ptr;
- _CONST char *str;
- _CONST char *fmt;
+ const char *str;
+ const char *fmt;
va_dcl
#endif
{
diff --git a/newlib/libc/stdio/sniprintf.c b/newlib/libc/stdio/sniprintf.c
index 65e5b067f..90e30271e 100644
--- a/newlib/libc/stdio/sniprintf.c
+++ b/newlib/libc/stdio/sniprintf.c
@@ -36,13 +36,13 @@ _DEFUN (_sniprintf_r, (ptr, str, size, fmt),
struct _reent *ptr,
char *str,
size_t size,
- _CONST char *fmt _DOTS)
+ const char *fmt _DOTS)
#else
_sniprintf_r (ptr, str, size, fmt, va_alist)
struct _reent *ptr;
char *str;
size_t size;
- _CONST char *fmt;
+ const char *fmt;
va_dcl
#endif
{
@@ -80,12 +80,12 @@ int
_DEFUN (sniprintf, (str, size, fmt),
char *str,
size_t size,
- _CONST char *fmt _DOTS)
+ const char *fmt _DOTS)
#else
sniprintf (str, size, fmt, va_alist)
char *str;
size_t size;
- _CONST char *fmt;
+ const char *fmt;
va_dcl
#endif
{
diff --git a/newlib/libc/stdio/snprintf.c b/newlib/libc/stdio/snprintf.c
index 2066a56ba..aa7a6364d 100644
--- a/newlib/libc/stdio/snprintf.c
+++ b/newlib/libc/stdio/snprintf.c
@@ -35,13 +35,13 @@ _DEFUN(_snprintf_r, (ptr, str, size, fmt),
struct _reent *ptr,
char *__restrict str,
size_t size,
- _CONST char *__restrict fmt _DOTS)
+ const char *__restrict fmt _DOTS)
#else
_snprintf_r(ptr, str, size, fmt, va_alist)
struct _reent *ptr;
char *str;
size_t size;
- _CONST char *fmt;
+ const char *fmt;
va_dcl
#endif
{
@@ -85,12 +85,12 @@ int
_DEFUN(snprintf, (str, size, fmt),
char *__restrict str,
size_t size,
- _CONST char *__restrict fmt _DOTS)
+ const char *__restrict fmt _DOTS)
#else
snprintf(str, size, fmt, va_alist)
char *str;
size_t size;
- _CONST char *fmt;
+ const char *fmt;
va_dcl
#endif
{
diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index 7ed0a0fd4..1948ff158 100644
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -583,12 +583,12 @@ int
_DEFUN(_sprintf_r, (ptr, str, fmt),
struct _reent *ptr,
char *__restrict str,
- _CONST char *__restrict fmt _DOTS)
+ const char *__restrict fmt _DOTS)
#else
_sprintf_r(ptr, str, fmt, va_alist)
struct _reent *ptr;
char *__restrict str;
- _CONST char *__restrict fmt;
+ const char *__restrict fmt;
va_dcl
#endif
{
@@ -623,11 +623,11 @@ int
#ifdef _HAVE_STDC
_DEFUN(sprintf, (str, fmt),
char *__restrict str,
- _CONST char *__restrict fmt _DOTS)
+ const char *__restrict fmt _DOTS)
#else
sprintf(str, fmt, va_alist)
char *str;
- _CONST char *fmt;
+ const char *fmt;
va_dcl
#endif
{
diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index bfec067e9..8a3232525 100644
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -427,13 +427,13 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifdef _HAVE_STDC
int
_DEFUN(sscanf, (str, fmt),
- _CONST char *__restrict str,
- _CONST char * fmt _DOTS)
+ const char *__restrict str,
+ const char * fmt _DOTS)
#else
int
sscanf(str, fmt, va_alist)
- _CONST char *str;
- _CONST char *fmt;
+ const char *str;
+ const char *fmt;
va_dcl
#endif
{
@@ -470,14 +470,14 @@ _EXFUN(siscanf, (const char *, const char *, ...)
int
_DEFUN(_sscanf_r, (ptr, str, fmt),
struct _reent *ptr,
- _CONST char *__restrict str,
- _CONST char *__restrict fmt _DOTS)
+ const char *__restrict str,
+ const char *__restrict fmt _DOTS)
#else
int
_sscanf_r(ptr, str, fmt, va_alist)
struct _reent *ptr;
- _CONST char *__restrict str;
- _CONST char *__restrict fmt;
+ const char *__restrict str;
+ const char *__restrict fmt;
va_dcl
#endif
{
diff --git a/newlib/libc/stdio/swprintf.c b/newlib/libc/stdio/swprintf.c
index 0ddc492ee..47a2657a2 100644
--- a/newlib/libc/stdio/swprintf.c
+++ b/newlib/libc/stdio/swprintf.c
@@ -557,7 +557,7 @@ _DEFUN(_swprintf_r, (ptr, str, size, fmt),
struct _reent *ptr,
wchar_t *str,
size_t size,
- _CONST wchar_t *fmt _DOTS)
+ const wchar_t *fmt _DOTS)
{
int ret;
va_list ap;
@@ -597,7 +597,7 @@ int
_DEFUN(swprintf, (str, size, fmt),
wchar_t *__restrict str,
size_t size,
- _CONST wchar_t *__restrict fmt _DOTS)
+ const wchar_t *__restrict fmt _DOTS)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio/swscanf.c b/newlib/libc/stdio/swscanf.c
index d52d826e3..c8ae05b42 100644
--- a/newlib/libc/stdio/swscanf.c
+++ b/newlib/libc/stdio/swscanf.c
@@ -415,7 +415,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifndef _REENT_ONLY
int
-swscanf (_CONST wchar_t *__restrict str, _CONST wchar_t *__restrict fmt, ...)
+swscanf (const wchar_t *__restrict str, const wchar_t *__restrict fmt, ...)
{
int ret;
va_list ap;
@@ -437,7 +437,7 @@ swscanf (_CONST wchar_t *__restrict str, _CONST wchar_t *__restrict fmt, ...)
#endif /* !_REENT_ONLY */
int
-_swscanf_r (struct _reent *ptr, _CONST wchar_t *str, _CONST wchar_t *fmt, ...)
+_swscanf_r (struct _reent *ptr, const wchar_t *str, const wchar_t *fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio/tmpnam.c b/newlib/libc/stdio/tmpnam.c
index fbd60fc7c..d794a988e 100644
--- a/newlib/libc/stdio/tmpnam.c
+++ b/newlib/libc/stdio/tmpnam.c
@@ -89,8 +89,8 @@ static int
_DEFUN(worker, (ptr, result, part1, part2, part3, part4),
struct _reent *ptr,
char *result,
- _CONST char *part1,
- _CONST char *part2,
+ const char *part1,
+ const char *part2,
int part3,
int *part4)
{
@@ -149,12 +149,12 @@ _DEFUN(_tmpnam_r, (p, s),
char *
_DEFUN(_tempnam_r, (p, dir, pfx),
struct _reent *p,
- _CONST char *dir,
- _CONST char *pfx)
+ const char *dir,
+ const char *pfx)
{
char *filename;
int length;
- _CONST char *prefix = (pfx) ? pfx : "";
+ const char *prefix = (pfx) ? pfx : "";
if (dir == NULL && (dir = getenv ("TMPDIR")) == NULL)
dir = P_tmpdir;
@@ -175,8 +175,8 @@ _DEFUN(_tempnam_r, (p, dir, pfx),
char *
_DEFUN(tempnam, (dir, pfx),
- _CONST char *dir,
- _CONST char *pfx)
+ const char *dir,
+ const char *pfx)
{
return _tempnam_r (_REENT, dir, pfx);
}
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index 29dcb1633..d574928ee 100644
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -201,7 +201,7 @@ int
_DEFUN(__ssputs_r, (ptr, fp, buf, len),
struct _reent *ptr,
FILE *fp,
- _CONST char *buf,
+ const char *buf,
size_t len)
{
register int w;
@@ -275,7 +275,7 @@ _DEFUN(__ssprint_r, (ptr, fp, uio),
register size_t len;
register int w;
register struct __siov *iov;
- register _CONST char *p = NULL;
+ register const char *p = NULL;
iov = uio->uio_iov;
len = 0;
@@ -359,7 +359,7 @@ err:
}
#else /* !INTEGER_ONLY */
#ifndef _FVWRITE_IN_STREAMIO
-int __ssputs_r (struct _reent *, FILE *, _CONST char *, size_t);
+int __ssputs_r (struct _reent *, FILE *, const char *, size_t);
#endif
int __ssprint_r (struct _reent *, FILE *, register struct __suio *);
#endif /* !INTEGER_ONLY */
@@ -372,7 +372,7 @@ int
_DEFUN(__sfputs_r, (ptr, fp, buf, len),
struct _reent *ptr,
FILE *fp,
- _CONST char *buf,
+ const char *buf,
size_t len)
{
register int i;
@@ -442,7 +442,7 @@ out:
}
#else /* !INTEGER_ONLY */
#ifndef _FVWRITE_IN_STREAMIO
-int __sfputs_r (struct _reent *, FILE *, _CONST char *buf, size_t);
+int __sfputs_r (struct _reent *, FILE *, const char *buf, size_t);
#endif
int __sprint_r (struct _reent *, FILE *, register struct __suio *);
#endif /* !INTEGER_ONLY */
@@ -459,7 +459,7 @@ _NOINLINE_STATIC int
_DEFUN(__sbprintf, (rptr, fp, fmt, ap),
struct _reent *rptr,
register FILE *fp,
- _CONST char *fmt,
+ const char *fmt,
va_list ap)
{
int ret;
@@ -644,13 +644,13 @@ _EXFUN(get_arg, (struct _reent *data, int n, char *fmt,
# define GROUPING 0x400 /* use grouping ("'" flag) */
#endif
-int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, _CONST char *, va_list));
+int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, const char *, va_list));
#ifndef STRING_ONLY
int
_DEFUN(VFPRINTF, (fp, fmt0, ap),
FILE * fp,
- _CONST char *fmt0,
+ const char *fmt0,
va_list ap)
{
int result;
@@ -663,7 +663,7 @@ int
_DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
struct _reent *data,
FILE * fp,
- _CONST char *fmt0,
+ const char *fmt0,
va_list ap)
{
register char *fmt; /* format string */
@@ -736,9 +736,9 @@ _DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
* below longer.
*/
#define PADSIZE 16 /* pad chunk size */
- static _CONST char blanks[PADSIZE] =
+ static const char blanks[PADSIZE] =
{' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' '};
- static _CONST char zeroes[PADSIZE] =
+ static const char zeroes[PADSIZE] =
{'0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0'};
#ifdef _MB_CAPABLE
@@ -1459,9 +1459,9 @@ string:
#ifdef _MB_CAPABLE
if (ch == 'S' || (flags & LONGINT)) {
mbstate_t ps;
- _CONST wchar_t *wcp;
+ const wchar_t *wcp;
- wcp = (_CONST wchar_t *)cp;
+ wcp = (const wchar_t *)cp;
size = m = 0;
memset ((_PTR)&ps, '\0', sizeof (mbstate_t));
@@ -1491,7 +1491,7 @@ string:
fp->_flags |= __SERR;
goto error;
}
- wcp = (_CONST wchar_t *)cp;
+ wcp = (const wchar_t *)cp;
}
if (size == 0)
@@ -1974,7 +1974,7 @@ exponent(char *p0, int exp, int fmtch)
the STRING_ONLY/INTEGER_ONLY versions here. */
#if defined (STRING_ONLY) && defined(INTEGER_ONLY)
-_CONST __CH_CLASS __chclass[256] = {
+const __CH_CLASS __chclass[256] = {
/* 00-07 */ OTHER, OTHER, OTHER, OTHER, OTHER, OTHER, OTHER, OTHER,
/* 08-0f */ OTHER, OTHER, OTHER, OTHER, OTHER, OTHER, OTHER, OTHER,
/* 10-17 */ OTHER, OTHER, OTHER, OTHER, OTHER, OTHER, OTHER, OTHER,
@@ -2009,7 +2009,7 @@ _CONST __CH_CLASS __chclass[256] = {
/* f8-ff */ OTHER, OTHER, OTHER, OTHER, OTHER, OTHER, OTHER, OTHER,
};
-_CONST __STATE __state_table[MAX_STATE][MAX_CH_CLASS] = {
+const __STATE __state_table[MAX_STATE][MAX_CH_CLASS] = {
/* '0' '1-9' '$' MODFR SPEC '.' '*' FLAG OTHER */
/* START */ { SFLAG, WDIG, DONE, SMOD, DONE, SDOT, VARW, SFLAG, DONE },
/* SFLAG */ { SFLAG, WDIG, DONE, SMOD, DONE, SDOT, VARW, SFLAG, DONE },
@@ -2024,7 +2024,7 @@ _CONST __STATE __state_table[MAX_STATE][MAX_CH_CLASS] = {
/* VPDIG */ { DONE, DONE, PREC, DONE, DONE, DONE, DONE, DONE, DONE },
};
-_CONST __ACTION __action_table[MAX_STATE][MAX_CH_CLASS] = {
+const __ACTION __action_table[MAX_STATE][MAX_CH_CLASS] = {
/* '0' '1-9' '$' MODFR SPEC '.' '*' FLAG OTHER */
/* START */ { NOOP, NUMBER, NOOP, GETMOD, GETARG, NOOP, NOOP, NOOP, NOOP },
/* SFLAG */ { NOOP, NUMBER, NOOP, GETMOD, GETARG, NOOP, NOOP, NOOP, NOOP },
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index 3f67b2304..bf91dad35 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -226,7 +226,7 @@ typedef unsigned long long u_long_long;
int
_DEFUN(VFSCANF, (fp, fmt, ap),
register FILE *fp,
- _CONST char *fmt,
+ const char *fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -238,7 +238,7 @@ _DEFUN(VFSCANF, (fp, fmt, ap),
int
_DEFUN(__SVFSCANF, (fp, fmt0, ap),
register FILE *fp,
- char _CONST *fmt0,
+ char const *fmt0,
va_list ap)
{
return __SVFSCANF_R (_REENT, fp, fmt0, ap);
@@ -250,7 +250,7 @@ int
_DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
struct _reent *data,
register FILE *fp,
- _CONST char *fmt,
+ const char *fmt,
va_list ap)
{
CHECK_INIT(data, fp);
@@ -405,7 +405,7 @@ int
_DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
struct _reent *rptr,
register FILE *fp,
- char _CONST *fmt0,
+ char const *fmt0,
va_list ap)
{
register u_char *fmt = (u_char *) fmt0;
@@ -574,7 +574,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
#endif
/* `basefix' is used to avoid `if' tests in the integer scanner */
- static _CONST short basefix[17] =
+ static const short basefix[17] =
{10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
/* Macro to support positional arguments */
diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
index 7339ffe53..ad684a249 100644
--- a/newlib/libc/stdio/vfwprintf.c
+++ b/newlib/libc/stdio/vfwprintf.c
@@ -149,7 +149,7 @@ SEEALSO
# undef _NO_LONGLONG
#endif
-int _EXFUN(_VFWPRINTF_R, (struct _reent *, FILE *, _CONST wchar_t *, va_list));
+int _EXFUN(_VFWPRINTF_R, (struct _reent *, FILE *, const wchar_t *, va_list));
/* Defined in vfprintf.c. */
#ifdef _FVWRITE_IN_STREAMIO
# ifdef STRING_ONLY
@@ -164,7 +164,7 @@ int _EXFUN(__SPRINT, (struct _reent *, FILE *, register struct __suio *));
# else
# define __SPRINT __sfputs_r
# endif
-int _EXFUN(__SPRINT, (struct _reent *, FILE *, _CONST char *, size_t));
+int _EXFUN(__SPRINT, (struct _reent *, FILE *, const char *, size_t));
#endif
#ifndef STRING_ONLY
#ifdef _UNBUF_STREAM_OPT
@@ -177,7 +177,7 @@ static int
_DEFUN(__sbwprintf, (rptr, fp, fmt, ap),
struct _reent *rptr,
register FILE *fp,
- _CONST wchar_t *fmt,
+ const wchar_t *fmt,
va_list ap)
{
int ret;
@@ -368,7 +368,7 @@ _EXFUN(get_arg, (struct _reent *data, int n, wchar_t *fmt,
int
_DEFUN(VFWPRINTF, (fp, fmt0, ap),
FILE *__restrict fp,
- _CONST wchar_t *__restrict fmt0,
+ const wchar_t *__restrict fmt0,
va_list ap)
{
int result;
@@ -381,7 +381,7 @@ int
_DEFUN(_VFWPRINTF_R, (data, fp, fmt0, ap),
struct _reent *data,
FILE * fp,
- _CONST wchar_t *fmt0,
+ const wchar_t *fmt0,
va_list ap)
{
register wchar_t *fmt; /* format string */
@@ -452,10 +452,10 @@ _DEFUN(_VFWPRINTF_R, (data, fp, fmt0, ap),
* below longer.
*/
#define PADSIZE 16 /* pad chunk size */
- static _CONST wchar_t blanks[PADSIZE] =
+ static const wchar_t blanks[PADSIZE] =
{L' ',L' ',L' ',L' ',L' ',L' ',L' ',L' ',
L' ',L' ',L' ',L' ',L' ',L' ',L' ',L' '};
- static _CONST wchar_t zeroes[PADSIZE] =
+ static const wchar_t zeroes[PADSIZE] =
{L'0',L'0',L'0',L'0',L'0',L'0',L'0',L'0',
L'0',L'0',L'0',L'0',L'0',L'0',L'0',L'0'};
@@ -519,7 +519,7 @@ _DEFUN(_VFWPRINTF_R, (data, fp, fmt0, ap),
}
#else
#define PRINT(ptr, len) { \
- if (__SPRINT (data, fp, (_CONST char *)(ptr), (len) * sizeof (wchar_t)) == EOF) \
+ if (__SPRINT (data, fp, (const char *)(ptr), (len) * sizeof (wchar_t)) == EOF) \
goto error; \
}
#define PAD(howmany, with) { \
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
index 715f231e3..27b06232b 100644
--- a/newlib/libc/stdio/vfwscanf.c
+++ b/newlib/libc/stdio/vfwscanf.c
@@ -228,7 +228,7 @@ static void * get_arg (int, va_list *, int *, void **);
int
_DEFUN(VFWSCANF, (fp, fmt, ap),
register FILE *__restrict fp,
- _CONST wchar_t *__restrict fmt,
+ const wchar_t *__restrict fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -240,7 +240,7 @@ _DEFUN(VFWSCANF, (fp, fmt, ap),
int
_DEFUN(__SVFWSCANF, (fp, fmt0, ap),
register FILE *fp,
- wchar_t _CONST *fmt0,
+ wchar_t const *fmt0,
va_list ap)
{
return __SVFWSCANF_R (_REENT, fp, fmt0, ap);
@@ -252,7 +252,7 @@ int
_DEFUN(_VFWSCANF_R, (data, fp, fmt, ap),
struct _reent *data,
register FILE *fp,
- _CONST wchar_t *fmt,
+ const wchar_t *fmt,
va_list ap)
{
CHECK_INIT(data, fp);
@@ -344,7 +344,7 @@ int
_DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap),
struct _reent *rptr,
register FILE *fp,
- wchar_t _CONST *fmt0,
+ wchar_t const *fmt0,
va_list ap)
{
register wchar_t *fmt = (wchar_t *) fmt0;
@@ -514,7 +514,7 @@ _DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap),
#endif
/* `basefix' is used to avoid `if' tests in the integer scanner */
- static _CONST short basefix[17] =
+ static const short basefix[17] =
{10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
/* Macro to support positional arguments */
diff --git a/newlib/libc/stdio/viprintf.c b/newlib/libc/stdio/viprintf.c
index ef2a04e2f..950009d4a 100644
--- a/newlib/libc/stdio/viprintf.c
+++ b/newlib/libc/stdio/viprintf.c
@@ -106,7 +106,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
_DEFUN(viprintf, (fmt, ap),
- _CONST char *fmt,
+ const char *fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -120,7 +120,7 @@ _DEFUN(viprintf, (fmt, ap),
int
_DEFUN(_viprintf_r, (ptr, fmt, ap),
struct _reent *ptr,
- _CONST char *fmt,
+ const char *fmt,
va_list ap)
{
_REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/viscanf.c b/newlib/libc/stdio/viscanf.c
index 569fad91c..0c9b13f58 100644
--- a/newlib/libc/stdio/viscanf.c
+++ b/newlib/libc/stdio/viscanf.c
@@ -90,7 +90,7 @@ Supporting OS subroutines required:
int
_DEFUN(viscanf, (fmt, ap),
- _CONST char *fmt,
+ const char *fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -104,7 +104,7 @@ _DEFUN(viscanf, (fmt, ap),
int
_DEFUN(_viscanf_r, (ptr, fmt, ap),
struct _reent *ptr,
- _CONST char *fmt,
+ const char *fmt,
va_list ap)
{
_REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/vprintf.c b/newlib/libc/stdio/vprintf.c
index 26671f70c..289c46cd0 100644
--- a/newlib/libc/stdio/vprintf.c
+++ b/newlib/libc/stdio/vprintf.c
@@ -30,7 +30,7 @@
int
_DEFUN(vprintf, (fmt, ap),
- _CONST char *fmt,
+ const char *fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -49,7 +49,7 @@ _EXFUN(viprintf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vprintf"))));
int
_DEFUN(_vprintf_r, (ptr, fmt, ap),
struct _reent *ptr,
- _CONST char *__restrict fmt,
+ const char *__restrict fmt,
va_list ap)
{
_REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/vscanf.c b/newlib/libc/stdio/vscanf.c
index 2506919c4..260359a3e 100644
--- a/newlib/libc/stdio/vscanf.c
+++ b/newlib/libc/stdio/vscanf.c
@@ -31,7 +31,7 @@
int
_DEFUN(vscanf, (fmt, ap),
- _CONST char *fmt,
+ const char *fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -50,7 +50,7 @@ _EXFUN(viscanf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vscanf"))));
int
_DEFUN(_vscanf_r, (ptr, fmt, ap),
struct _reent *ptr,
- _CONST char *__restrict fmt,
+ const char *__restrict fmt,
va_list ap)
{
_REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/vsiscanf.c b/newlib/libc/stdio/vsiscanf.c
index cf5120fa3..6ad0f4a8d 100644
--- a/newlib/libc/stdio/vsiscanf.c
+++ b/newlib/libc/stdio/vsiscanf.c
@@ -36,8 +36,8 @@
int
_DEFUN(vsiscanf, (str, fmt, ap),
- _CONST char *str,
- _CONST char *fmt,
+ const char *str,
+ const char *fmt,
va_list ap)
{
return _vsiscanf_r (_REENT, str, fmt, ap);
@@ -48,8 +48,8 @@ _DEFUN(vsiscanf, (str, fmt, ap),
int
_DEFUN(_vsiscanf_r, (ptr, str, fmt, ap),
struct _reent *ptr,
- _CONST char *str,
- _CONST char *fmt,
+ const char *str,
+ const char *fmt,
va_list ap)
{
FILE f;
diff --git a/newlib/libc/stdio/vsscanf.c b/newlib/libc/stdio/vsscanf.c
index 706461d47..87d4cd161 100644
--- a/newlib/libc/stdio/vsscanf.c
+++ b/newlib/libc/stdio/vsscanf.c
@@ -36,8 +36,8 @@
int
_DEFUN(vsscanf, (str, fmt, ap),
- _CONST char *__restrict str,
- _CONST char *__restrict fmt,
+ const char *__restrict str,
+ const char *__restrict fmt,
va_list ap)
{
return _vsscanf_r (_REENT, str, fmt, ap);
@@ -54,8 +54,8 @@ _EXFUN(vsiscanf, (const char *, const char *, __VALIST)
int
_DEFUN(_vsscanf_r, (ptr, str, fmt, ap),
struct _reent *ptr,
- _CONST char *__restrict str,
- _CONST char *__restrict fmt,
+ const char *__restrict str,
+ const char *__restrict fmt,
va_list ap)
{
FILE f;
diff --git a/newlib/libc/stdio/vswscanf.c b/newlib/libc/stdio/vswscanf.c
index 0d090f021..90393f528 100644
--- a/newlib/libc/stdio/vswscanf.c
+++ b/newlib/libc/stdio/vswscanf.c
@@ -37,7 +37,7 @@
#ifndef _REENT_ONLY
int
-vswscanf (_CONST wchar_t *__restrict str, _CONST wchar_t * __restrict fmt,
+vswscanf (const wchar_t *__restrict str, const wchar_t * __restrict fmt,
va_list ap)
{
return _vswscanf_r (_REENT, str, fmt, ap);
@@ -46,7 +46,7 @@ vswscanf (_CONST wchar_t *__restrict str, _CONST wchar_t * __restrict fmt,
#endif /* !_REENT_ONLY */
int
-_vswscanf_r (struct _reent *ptr, _CONST wchar_t *str, _CONST wchar_t *fmt,
+_vswscanf_r (struct _reent *ptr, const wchar_t *str, const wchar_t *fmt,
va_list ap)
{
FILE f;
diff --git a/newlib/libc/stdio/vwprintf.c b/newlib/libc/stdio/vwprintf.c
index 191fb70c9..28381363e 100644
--- a/newlib/libc/stdio/vwprintf.c
+++ b/newlib/libc/stdio/vwprintf.c
@@ -27,7 +27,7 @@
int
_DEFUN(vwprintf, (fmt, ap),
- _CONST wchar_t *__restrict fmt,
+ const wchar_t *__restrict fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -41,7 +41,7 @@ _DEFUN(vwprintf, (fmt, ap),
int
_DEFUN(_vwprintf_r, (ptr, fmt, ap),
struct _reent *ptr,
- _CONST wchar_t *fmt,
+ const wchar_t *fmt,
va_list ap)
{
_REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/vwscanf.c b/newlib/libc/stdio/vwscanf.c
index e40bdede5..3945e79c8 100644
--- a/newlib/libc/stdio/vwscanf.c
+++ b/newlib/libc/stdio/vwscanf.c
@@ -32,7 +32,7 @@
#ifndef _REENT_ONLY
int
-vwscanf (_CONST wchar_t *__restrict fmt, va_list ap)
+vwscanf (const wchar_t *__restrict fmt, va_list ap)
{
struct _reent *reent = _REENT;
@@ -43,7 +43,7 @@ vwscanf (_CONST wchar_t *__restrict fmt, va_list ap)
#endif /* !_REENT_ONLY */
int
-_vwscanf_r (struct _reent *ptr, _CONST wchar_t *fmt, va_list ap)
+_vwscanf_r (struct _reent *ptr, const wchar_t *fmt, va_list ap)
{
_REENT_SMALL_CHECK_INIT (ptr);
return __svfwscanf_r (ptr, _stdin_r (ptr), fmt, ap);
diff --git a/newlib/libc/stdio/wscanf.c b/newlib/libc/stdio/wscanf.c
index f953d9f81..5a7c35a08 100644
--- a/newlib/libc/stdio/wscanf.c
+++ b/newlib/libc/stdio/wscanf.c
@@ -26,7 +26,7 @@
#ifndef _REENT_ONLY
int
-wscanf(_CONST wchar_t *__restrict fmt, ...)
+wscanf(const wchar_t *__restrict fmt, ...)
{
int ret;
va_list ap;
@@ -42,7 +42,7 @@ wscanf(_CONST wchar_t *__restrict fmt, ...)
#endif /* !_REENT_ONLY */
int
-_wscanf_r(struct _reent *ptr, _CONST wchar_t *fmt, ...)
+_wscanf_r(struct _reent *ptr, const wchar_t *fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio64/fdopen64.c b/newlib/libc/stdio64/fdopen64.c
index 1a238f732..f0c3c0784 100644
--- a/newlib/libc/stdio64/fdopen64.c
+++ b/newlib/libc/stdio64/fdopen64.c
@@ -38,7 +38,7 @@ FILE *
_DEFUN (_fdopen64_r, (ptr, fd, mode),
struct _reent *ptr,
int fd,
- _CONST char *mode)
+ const char *mode)
{
register FILE *fp;
int flags, oflags;
@@ -110,7 +110,7 @@ _DEFUN (_fdopen64_r, (ptr, fd, mode),
FILE *
_DEFUN (fdopen64, (fd, mode),
int fd,
- _CONST char *mode)
+ const char *mode)
{
return _fdopen64_r (_REENT, fd, mode);
}
diff --git a/newlib/libc/stdio64/fopen64.c b/newlib/libc/stdio64/fopen64.c
index 7edb5d807..6bdf61973 100644
--- a/newlib/libc/stdio64/fopen64.c
+++ b/newlib/libc/stdio64/fopen64.c
@@ -66,8 +66,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
FILE *
_DEFUN (_fopen64_r, (ptr, file, mode),
struct _reent *ptr,
- _CONST char *file,
- _CONST char *mode)
+ const char *file,
+ const char *mode)
{
register FILE *fp;
register int f;
@@ -118,8 +118,8 @@ _DEFUN (_fopen64_r, (ptr, file, mode),
FILE *
_DEFUN (fopen64, (file, mode),
- _CONST char *file,
- _CONST char *mode)
+ const char *file,
+ const char *mode)
{
return _fopen64_r (_REENT, file, mode);
}
diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c
index 6e42d0e3b..02995b98a 100644
--- a/newlib/libc/stdio64/freopen64.c
+++ b/newlib/libc/stdio64/freopen64.c
@@ -77,8 +77,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
FILE *
_DEFUN (_freopen64_r, (ptr, file, mode, fp),
struct _reent *ptr,
- _CONST char *file,
- _CONST char *mode,
+ const char *file,
+ const char *mode,
register FILE *fp)
{
register int f;
@@ -248,8 +248,8 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp),
FILE *
_DEFUN (freopen64, (file, mode, fp),
- _CONST char *file,
- _CONST char *mode,
+ const char *file,
+ const char *mode,
register FILE *fp)
{
return _freopen64_r (_REENT, file, mode, fp);
diff --git a/newlib/libc/stdio64/fsetpos64.c b/newlib/libc/stdio64/fsetpos64.c
index 9cfc10733..f5f6bdacf 100644
--- a/newlib/libc/stdio64/fsetpos64.c
+++ b/newlib/libc/stdio64/fsetpos64.c
@@ -44,7 +44,7 @@ int
_DEFUN (_fsetpos64_r, (ptr, iop, pos),
struct _reent *ptr,
FILE * iop,
- _CONST _fpos64_t * pos)
+ const _fpos64_t * pos)
{
int x = _fseeko64_r (ptr, iop, (_off64_t)(*pos), SEEK_SET);
@@ -58,7 +58,7 @@ _DEFUN (_fsetpos64_r, (ptr, iop, pos),
int
_DEFUN (fsetpos64, (iop, pos),
FILE * iop,
- _CONST _fpos64_t * pos)
+ const _fpos64_t * pos)
{
return _fsetpos64_r (_REENT, iop, pos);
}
diff --git a/newlib/libc/stdlib/__exp10.c b/newlib/libc/stdlib/__exp10.c
index 4e368b830..1ff81a680 100644
--- a/newlib/libc/stdlib/__exp10.c
+++ b/newlib/libc/stdlib/__exp10.c
@@ -9,7 +9,7 @@ double
_DEFUN (__exp10, (x),
unsigned x)
{
- static _CONST double powtab[] =
+ static const double powtab[] =
{1.0,
10.0,
100.0,
diff --git a/newlib/libc/stdlib/atof.c b/newlib/libc/stdlib/atof.c
index 4653d4f93..7dfbd9c55 100644
--- a/newlib/libc/stdlib/atof.c
+++ b/newlib/libc/stdlib/atof.c
@@ -58,7 +58,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
double
_DEFUN (atof, (s),
- _CONST char *s)
+ const char *s)
{
return strtod (s, NULL);
}
diff --git a/newlib/libc/stdlib/atoff.c b/newlib/libc/stdlib/atoff.c
index c97b78fb1..2966254be 100644
--- a/newlib/libc/stdlib/atoff.c
+++ b/newlib/libc/stdlib/atoff.c
@@ -3,7 +3,7 @@
float
_DEFUN (atoff, (s),
- _CONST char *s)
+ const char *s)
{
return strtof (s, NULL);
}
diff --git a/newlib/libc/stdlib/atoi.c b/newlib/libc/stdlib/atoi.c
index 936b381bd..83ad24177 100644
--- a/newlib/libc/stdlib/atoi.c
+++ b/newlib/libc/stdlib/atoi.c
@@ -48,7 +48,7 @@ No supporting OS subroutines are required.
#ifndef _REENT_ONLY
int
_DEFUN (atoi, (s),
- _CONST char *s)
+ const char *s)
{
return (int) strtol (s, NULL, 10);
}
@@ -57,7 +57,7 @@ _DEFUN (atoi, (s),
int
_DEFUN (_atoi_r, (s),
struct _reent *ptr,
- _CONST char *s)
+ 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 8c2f5560d..cad512fbc 100644
--- a/newlib/libc/stdlib/atol.c
+++ b/newlib/libc/stdlib/atol.c
@@ -7,14 +7,14 @@
#ifndef _REENT_ONLY
long
-_DEFUN (atol, (s), _CONST char *s)
+_DEFUN (atol, (s), const char *s)
{
return strtol (s, NULL, 10);
}
#endif /* !_REENT_ONLY */
long
-_DEFUN (_atol_r, (ptr, s), struct _reent *ptr, _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 d0d498349..e853f25eb 100644
--- a/newlib/libc/stdlib/atoll.c
+++ b/newlib/libc/stdlib/atoll.c
@@ -70,7 +70,7 @@ No supporting OS subroutines are required.
#ifndef _REENT_ONLY
long long
_DEFUN(atoll, (str),
- _CONST char *str)
+ const char *str)
{
return strtoll(str, (char **)NULL, 10);
}
@@ -79,7 +79,7 @@ _DEFUN(atoll, (str),
long long
_DEFUN(_atoll_r, (ptr, str),
struct _reent *ptr,
- _CONST char *str)
+ const char *str)
{
return _strtoll_r(ptr, str, (char **)NULL, 10);
}
diff --git a/newlib/libc/stdlib/gdtoa-gethex.c b/newlib/libc/stdlib/gdtoa-gethex.c
index 931ced3a7..18d9cc172 100644
--- a/newlib/libc/stdlib/gdtoa-gethex.c
+++ b/newlib/libc/stdlib/gdtoa-gethex.c
@@ -38,7 +38,7 @@ THIS SOFTWARE.
#include "gd_qnan.h"
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG)
-_CONST unsigned char __hexdig[256]=
+const unsigned char __hexdig[256]=
{
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -149,7 +149,7 @@ gethex (struct _reent *ptr, const char **sp, const FPI *fpi,
Long *exp, _Bigint **bp, int sign, locale_t loc)
{
_Bigint *b;
- _CONST unsigned char *decpt, *s0, *s, *s1;
+ const unsigned char *decpt, *s0, *s, *s1;
int esign, havedig, irv, k, n, nbits, up, zret;
__ULong L, lostbits, *x;
Long e, e1;
@@ -159,7 +159,7 @@ gethex (struct _reent *ptr, const char **sp, const FPI *fpi,
unsigned char decp_end = decimalpoint[decp_len - 1];
havedig = 0;
- s0 = *(_CONST unsigned char **)sp + 2;
+ s0 = *(const unsigned char **)sp + 2;
while(s0[havedig] == '0')
havedig++;
s0 += havedig;
diff --git a/newlib/libc/stdlib/gdtoa-hexnan.c b/newlib/libc/stdlib/gdtoa-hexnan.c
index 22033d90f..fa98646f6 100644
--- a/newlib/libc/stdlib/gdtoa-hexnan.c
+++ b/newlib/libc/stdlib/gdtoa-hexnan.c
@@ -46,11 +46,11 @@ THIS SOFTWARE.
#ifdef INFNAN_CHECK
int
_DEFUN (match, (sp, t),
- _CONST char **sp,
+ const char **sp,
char *t)
{
int c, d;
- _CONST char *s = *sp;
+ const char *s = *sp;
while( (d = *t++) !=0) {
if ((c = *++s) >= 'A' && c <= 'Z')
@@ -81,12 +81,12 @@ _DEFUN (L_shift, (x, x1, i),
int
_DEFUN (hexnan, (sp, fpi, x0),
- _CONST char **sp,
- _CONST FPI *fpi,
+ const char **sp,
+ const FPI *fpi,
__ULong *x0)
{
__ULong c, h, *x, *x1, *xe;
- _CONST char *s;
+ const char *s;
int havedig, hd0, i, nbits;
nbits = fpi->nbits;
@@ -97,7 +97,7 @@ _DEFUN (hexnan, (sp, fpi, x0),
x1 = xe = x;
havedig = hd0 = i = 0;
s = *sp;
- while((c = *(_CONST unsigned char*)++s)) {
+ while((c = *(const unsigned char*)++s)) {
if (!(h = __get_hexdig(c))) {
if (c <= ' ') {
if (hd0 < havedig) {
diff --git a/newlib/libc/stdlib/getenv.c b/newlib/libc/stdlib/getenv.c
index 2d394e240..973a54732 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,
+ register const char *name,
int *offset)
{
return _findenv_r (_REENT, name, offset);
@@ -78,7 +78,7 @@ _DEFUN (_findenv, (name, offset),
char *
_DEFUN (getenv, (name),
- _CONST char *name)
+ const char *name)
{
int offset;
diff --git a/newlib/libc/stdlib/getenv_r.c b/newlib/libc/stdlib/getenv_r.c
index b34c2a9b3..315d283ea 100644
--- a/newlib/libc/stdlib/getenv_r.c
+++ b/newlib/libc/stdlib/getenv_r.c
@@ -76,12 +76,12 @@ static char ***p_environ = &environ;
char *
_DEFUN (_findenv_r, (reent_ptr, name, offset),
struct _reent *reent_ptr,
- register _CONST char *name,
+ register const char *name,
int *offset)
{
register int len;
register char **p;
- _CONST char *c;
+ const char *c;
ENV_LOCK;
@@ -121,7 +121,7 @@ _DEFUN (_findenv_r, (reent_ptr, name, offset),
char *
_DEFUN (_getenv_r, (reent_ptr, name),
struct _reent *reent_ptr,
- _CONST char *name)
+ const char *name)
{
int offset;
diff --git a/newlib/libc/stdlib/ldtoa.c b/newlib/libc/stdlib/ldtoa.c
index a44413cd6..10a7537cc 100644
--- a/newlib/libc/stdlib/ldtoa.c
+++ b/newlib/libc/stdlib/ldtoa.c
@@ -61,13 +61,13 @@ typedef struct
unsigned short equot[NI];
} LDPARMS;
-static void esub (_CONST short unsigned int *a, _CONST short unsigned int *b,
+static void esub (const short unsigned int *a, const short unsigned int *b,
short unsigned int *c, LDPARMS * ldp);
-static void emul (_CONST short unsigned int *a, _CONST short unsigned int *b,
+static void emul (const short unsigned int *a, const short unsigned int *b,
short unsigned int *c, LDPARMS * ldp);
-static void ediv (_CONST short unsigned int *a, _CONST short unsigned int *b,
+static void ediv (const short unsigned int *a, const short unsigned int *b,
short unsigned int *c, LDPARMS * ldp);
-static int ecmp (_CONST short unsigned int *a, _CONST short unsigned int *b);
+static int ecmp (const short unsigned int *a, const short unsigned int *b);
static int enormlz (short unsigned int *x);
static int eshift (short unsigned int *x, int sc);
static void eshup1 (register short unsigned int *x);
@@ -77,7 +77,7 @@ static void eshdn1 (register short unsigned int *x);
static void eshdn8 (register short unsigned int *x);
static void eshdn6 (register short unsigned int *x);
static void eneg (short unsigned int *x);
-static void emov (register _CONST short unsigned int *a,
+static void emov (register const short unsigned int *a,
register short unsigned int *b);
static void eclear (register short unsigned int *x);
static void einfin (register short unsigned int *x, register LDPARMS * ldp);
@@ -111,24 +111,24 @@ static void e113toe (short unsigned int *pe, short unsigned int *y,
#if NE == 10
/* 0.0 */
-static _CONST unsigned short ezero[NE] = { 0x0000, 0x0000, 0x0000, 0x0000,
+static const unsigned short ezero[NE] = { 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
};
/* 1.0E0 */
-static _CONST unsigned short eone[NE] = { 0x0000, 0x0000, 0x0000, 0x0000,
+static const unsigned short eone[NE] = { 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0x3fff,
};
#else
/* 0.0 */
-static _CONST unsigned short ezero[NE] = {
+static const unsigned short ezero[NE] = {
0, 0000000, 0000000, 0000000, 0000000, 0000000,
};
/* 1.0E0 */
-static _CONST unsigned short eone[NE] = {
+static const unsigned short eone[NE] = {
0, 0000000, 0000000, 0000000, 0100000, 0x3fff,
};
@@ -140,7 +140,7 @@ static _CONST unsigned short eone[NE] = {
* messages is bound to the error codes defined
* in mconf.h.
*/
-static _CONST char *_CONST ermsg[7] = {
+static const char *const ermsg[7] = {
"unknown", /* error code 0 */
"domain", /* error code 1 */
"singularity", /* et seq. */
@@ -432,17 +432,17 @@ static int edivm (short unsigned int *den, short unsigned int *num,
LDPARMS * ldp);
static int emulm (short unsigned int *a, short unsigned int *b,
LDPARMS * ldp);
-static int eisneg (_CONST short unsigned int *x);
-static int eisinf (_CONST short unsigned int *x);
-static void emovi (_CONST short unsigned int *a, short unsigned int *b);
+static int eisneg (const short unsigned int *x);
+static int eisinf (const short unsigned int *x);
+static void emovi (const short unsigned int *a, short unsigned int *b);
static void emovo (short unsigned int *a, short unsigned int *b,
LDPARMS * ldp);
static void emovz (register short unsigned int *a,
register short unsigned int *b);
static void ecleaz (register short unsigned int *xi);
-static void eadd1 (_CONST short unsigned int *a, _CONST short unsigned int *b,
+static void eadd1 (const short unsigned int *a, const short unsigned int *b,
short unsigned int *c, int subflg, LDPARMS * ldp);
-static int eisnan (_CONST short unsigned int *x);
+static int eisnan (const short unsigned int *x);
static int eiisnan (short unsigned int *x);
#ifdef DEC
@@ -473,7 +473,7 @@ eclear (register short unsigned int *x)
*/
static void
-emov (register _CONST short unsigned int *a, register short unsigned int *b)
+emov (register const short unsigned int *a, register short unsigned int *b)
{
register int i;
@@ -506,7 +506,7 @@ eneg (short unsigned int *x)
* else return zero.
*/
static int
-eisneg (_CONST short unsigned int *x)
+eisneg (const short unsigned int *x)
{
#ifdef NANS
@@ -524,7 +524,7 @@ eisneg (_CONST short unsigned int *x)
* else return zero.
*/
static int
-eisinf (_CONST short unsigned int *x)
+eisinf (const short unsigned int *x)
{
if ((x[NE - 1] & 0x7fff) == 0x7fff)
@@ -542,7 +542,7 @@ eisinf (_CONST short unsigned int *x)
/* Check if e-type number is not a number.
*/
static int
-eisnan (_CONST short unsigned int *x)
+eisnan (const short unsigned int *x)
{
#ifdef NANS
@@ -612,9 +612,9 @@ einfin (register short unsigned int *x, register LDPARMS * ldp)
* converting it to internal format.
*/
static void
-emovi (_CONST short unsigned int *a, short unsigned int *b)
+emovi (const short unsigned int *a, short unsigned int *b)
{
- register _CONST unsigned short *p;
+ register const unsigned short *p;
register unsigned short *q;
int i;
@@ -1421,7 +1421,7 @@ mdfin:
*/
static void
-esub (_CONST short unsigned int *a, _CONST short unsigned int *b,
+esub (const short unsigned int *a, const short unsigned int *b,
short unsigned int *c, LDPARMS * ldp)
{
@@ -1452,7 +1452,7 @@ esub (_CONST short unsigned int *a, _CONST short unsigned int *b,
static void
-eadd1 (_CONST short unsigned int *a, _CONST short unsigned int *b,
+eadd1 (const short unsigned int *a, const short unsigned int *b,
short unsigned int *c, int subflg, LDPARMS * ldp)
{
unsigned short ai[NI], bi[NI], ci[NI];
@@ -1563,7 +1563,7 @@ done:
; ediv( a, b, c, ldp ); c = b / a
*/
static void
-ediv (_CONST short unsigned int *a, _CONST short unsigned int *b,
+ediv (const short unsigned int *a, const short unsigned int *b,
short unsigned int *c, LDPARMS * ldp)
{
unsigned short ai[NI], bi[NI];
@@ -1669,7 +1669,7 @@ dnzro2:
; emul( a, b, c, ldp ); c = b * a
*/
static void
-emul (_CONST short unsigned int *a, _CONST short unsigned int *b,
+emul (const short unsigned int *a, const short unsigned int *b,
short unsigned int *c, LDPARMS * ldp)
{
unsigned short ai[NI], bi[NI];
@@ -2415,7 +2415,7 @@ toe24 (short unsigned int *x, short unsigned int *y)
* -2 if either a or b is a NaN.
*/
static int
-ecmp (_CONST short unsigned int *a, _CONST short unsigned int *b)
+ecmp (const short unsigned int *a, const short unsigned int *b)
{
unsigned short ai[NI], bi[NI];
register unsigned short *p, *q;
@@ -2627,7 +2627,7 @@ normdn:
#define MAXP 4096
#if NE == 10
-static _CONST unsigned short etens[NTEN + 1][NE] = {
+static const unsigned short etens[NTEN + 1][NE] = {
{0x6576, 0x4a92, 0x804a, 0x153f,
0xc94c, 0x979a, 0x8a20, 0x5202, 0xc460, 0x7525,}, /* 10**4096 */
{0x6a32, 0xce52, 0x329a, 0x28ce,
@@ -2656,7 +2656,7 @@ static _CONST unsigned short etens[NTEN + 1][NE] = {
0x0000, 0x0000, 0x0000, 0x0000, 0xa000, 0x4002,}, /* 10**1 */
};
-static _CONST unsigned short emtens[NTEN + 1][NE] = {
+static const unsigned short emtens[NTEN + 1][NE] = {
{0x2030, 0xcffc, 0xa1c3, 0x8123,
0x2de3, 0x9fde, 0xd2ce, 0x04c8, 0xa6dd, 0x0ad8,}, /* 10**-4096 */
{0x8264, 0xd2cb, 0xf2ea, 0x12d4,
@@ -2685,7 +2685,7 @@ static _CONST unsigned short emtens[NTEN + 1][NE] = {
0xcccc, 0xcccc, 0xcccc, 0xcccc, 0xcccc, 0x3ffb,}, /* 10**-1 */
};
#else
-static _CONST unsigned short etens[NTEN + 1][NE] = {
+static const unsigned short etens[NTEN + 1][NE] = {
{0xc94c, 0x979a, 0x8a20, 0x5202, 0xc460, 0x7525,}, /* 10**4096 */
{0xa74d, 0x5de4, 0xc53d, 0x3b5d, 0x9e8b, 0x5a92,}, /* 10**2048 */
{0x650d, 0x0c17, 0x8175, 0x7586, 0xc976, 0x4d48,},
@@ -2701,7 +2701,7 @@ static _CONST unsigned short etens[NTEN + 1][NE] = {
{0x0000, 0x0000, 0x0000, 0x0000, 0xa000, 0x4002,}, /* 10**1 */
};
-static _CONST unsigned short emtens[NTEN + 1][NE] = {
+static const unsigned short emtens[NTEN + 1][NE] = {
{0x2de4, 0x9fde, 0xd2ce, 0x04c8, 0xa6dd, 0x0ad8,}, /* 10**-4096 */
{0x4925, 0x2de4, 0x3436, 0x534f, 0xceae, 0x256b,}, /* 10**-2048 */
{0x87a6, 0xc0bd, 0xda57, 0x82a5, 0xa2a6, 0x32b5,},
@@ -2973,7 +2973,7 @@ etoasc (short unsigned int *x, char *string, int ndigits, int outformat,
{
long digit;
unsigned short y[NI], t[NI], u[NI], w[NI];
- _CONST unsigned short *p, *r, *ten;
+ const unsigned short *p, *r, *ten;
unsigned short sign;
int i, j, k, expon, rndsav, ndigs;
char *s, *ss;
@@ -3328,7 +3328,7 @@ asctoeg (char *ss, short unsigned int *y, int oprec, LDPARMS * ldp)
int k, trail, c, rndsav;
long lexp;
unsigned short nsign;
- _CONST unsigned short *p;
+ const unsigned short *p;
char *sp, *s, *lstr;
int lenldstr;
int mflag = 0;
@@ -3654,7 +3654,7 @@ aexit:
*
* efloor( x, y, ldp );
*/
-static _CONST unsigned short bmask[] = {
+static const unsigned short bmask[] = {
0xffff,
0xfffe,
0xfffc,
@@ -3756,47 +3756,47 @@ eiremain (short unsigned int *den, short unsigned int *num, LDPARMS * ldp)
*/
#ifdef MIEEE
#if !defined(__mips)
-static _CONST unsigned short nan113[8] = {
+static const unsigned short nan113[8] = {
0x7fff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
};
-static _CONST unsigned short nan64[6] = {
+static const unsigned short nan64[6] = {
0x7fff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
};
-static _CONST unsigned short nan53[4] = { 0x7fff, 0xffff, 0xffff, 0xffff };
-static _CONST unsigned short nan24[2] = { 0x7fff, 0xffff };
+static const unsigned short nan53[4] = { 0x7fff, 0xffff, 0xffff, 0xffff };
+static const unsigned short nan24[2] = { 0x7fff, 0xffff };
#elif defined(__mips_nan2008) /* __mips */
-static _CONST unsigned short nan113[8] = { 0x7fff, 0x8000, 0, 0, 0, 0, 0, 0 };
-static _CONST unsigned short nan64[6] = { 0x7fff, 0xc000, 0, 0, 0, 0 };
-static _CONST unsigned short nan53[4] = { 0x7ff8, 0, 0, 0 };
-static _CONST unsigned short nan24[2] = { 0x7fc0, 0 };
+static const unsigned short nan113[8] = { 0x7fff, 0x8000, 0, 0, 0, 0, 0, 0 };
+static const unsigned short nan64[6] = { 0x7fff, 0xc000, 0, 0, 0, 0 };
+static const unsigned short nan53[4] = { 0x7ff8, 0, 0, 0 };
+static const unsigned short nan24[2] = { 0x7fc0, 0 };
#else /* __mips && !__mips_nan2008 */
-static _CONST unsigned short nan113[8] = {
+static const unsigned short nan113[8] = {
0x7fff, 0x7fff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
};
-static _CONST unsigned short nan64[6] = {
+static const unsigned short nan64[6] = {
0x7fff, 0xbfff, 0xffff, 0xffff, 0xffff, 0xffff
};
-static _CONST unsigned short nan53[4] = { 0x7ff7, 0xffff, 0xffff, 0xffff };
-static _CONST unsigned short nan24[2] = { 0x7fbf, 0xffff };
+static const unsigned short nan53[4] = { 0x7ff7, 0xffff, 0xffff, 0xffff };
+static const unsigned short nan24[2] = { 0x7fbf, 0xffff };
#endif /* __mips && !__mips_nan2008 */
#else /* !MIEEE */
#if !defined(__mips) || defined(__mips_nan2008)
-static _CONST unsigned short nan113[8] = { 0, 0, 0, 0, 0, 0, 0x8000, 0x7fff };
-static _CONST unsigned short nan64[6] = { 0, 0, 0, 0, 0xc000, 0x7fff };
-static _CONST unsigned short nan53[4] = { 0, 0, 0, 0x7ff8 };
-static _CONST unsigned short nan24[2] = { 0, 0x7fc0 };
+static const unsigned short nan113[8] = { 0, 0, 0, 0, 0, 0, 0x8000, 0x7fff };
+static const unsigned short nan64[6] = { 0, 0, 0, 0, 0xc000, 0x7fff };
+static const unsigned short nan53[4] = { 0, 0, 0, 0x7ff8 };
+static const unsigned short nan24[2] = { 0, 0x7fc0 };
#else /* __mips && !__mips_nan2008 */
-static _CONST unsigned short nan113[8] = {
+static const unsigned short nan113[8] = {
0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0x7fff, 0x7fff
};
-static _CONST unsigned short nan64[6] = {
+static const unsigned short nan64[6] = {
0xffff, 0xffff, 0xffff, 0xffff, 0xbfff, 0x7fff
};
-static _CONST unsigned short nan53[4] = { 0xffff, 0xffff, 0xffff, 0x7ff7 };
-static _CONST unsigned short nan24[2] = { 0xffff, 0x7fbf };
+static const unsigned short nan53[4] = { 0xffff, 0xffff, 0xffff, 0x7ff7 };
+static const unsigned short nan24[2] = { 0xffff, 0x7fbf };
#endif /* __mips && !__mips_nan2008 */
#endif /* !MIEEE */
@@ -3805,7 +3805,7 @@ static void
enan (short unsigned int *nan, int size)
{
int i, n;
- _CONST unsigned short *p;
+ const unsigned short *p;
switch (size)
{
diff --git a/newlib/libc/stdlib/mprec.c b/newlib/libc/stdlib/mprec.c
index cb6866d50..bd1c691d9 100644
--- a/newlib/libc/stdlib/mprec.c
+++ b/newlib/libc/stdlib/mprec.c
@@ -193,7 +193,7 @@ _DEFUN (multadd, (ptr, b, m, a),
_Bigint *
_DEFUN (s2b, (ptr, s, nd0, nd, y9),
struct _reent * ptr,
- _CONST char *s,
+ const char *s,
int nd0,
int nd,
__ULong y9)
@@ -424,7 +424,7 @@ _DEFUN (pow5mult,
{
_Bigint *b1, *p5, *p51;
int i;
- static _CONST int p05[3] = {5, 25, 125};
+ static const int p05[3] = {5, 25, 125};
if ((i = k & 3) != 0)
b = multadd (ptr, b, p05[i - 1], 0);
@@ -951,7 +951,7 @@ _DEFUN (ratio, (a, b), _Bigint * a, _Bigint * b)
}
-_CONST double
+const double
tens[] =
{
1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9,
@@ -961,16 +961,16 @@ _CONST double
};
#if !defined(_DOUBLE_IS_32BITS) && !defined(__v800)
-_CONST double bigtens[] =
+const double bigtens[] =
{1e16, 1e32, 1e64, 1e128, 1e256};
-_CONST double tinytens[] =
+const double tinytens[] =
{1e-16, 1e-32, 1e-64, 1e-128, 1e-256};
#else
-_CONST double bigtens[] =
+const double bigtens[] =
{1e16, 1e32};
-_CONST double tinytens[] =
+const double tinytens[] =
{1e-16, 1e-32};
#endif
diff --git a/newlib/libc/stdlib/mprec.h b/newlib/libc/stdlib/mprec.h
index 330c3981b..a98120aa4 100644
--- a/newlib/libc/stdlib/mprec.h
+++ b/newlib/libc/stdlib/mprec.h
@@ -401,7 +401,7 @@ _Bigint * _EXFUN(lshift,(struct _reent *p, _Bigint *b, int k));
int _EXFUN(match,(const char**, char*));
_Bigint * _EXFUN(diff,(struct _reent *p, _Bigint *a, _Bigint *b));
int _EXFUN(cmp,(_Bigint *a, _Bigint *b));
-int _EXFUN(gethex,(struct _reent *p, _CONST char **sp, _CONST struct FPI *fpi, Long *exp, _Bigint **bp, int sign, locale_t loc));
+int _EXFUN(gethex,(struct _reent *p, const char **sp, const struct FPI *fpi, Long *exp, _Bigint **bp, int sign, locale_t loc));
double _EXFUN(ratio,(_Bigint *a, _Bigint *b));
__ULong _EXFUN(any_on,(_Bigint *b, int k));
void _EXFUN(copybits,(__ULong *c, int n, _Bigint *b));
@@ -419,16 +419,16 @@ int _strtodg_l (struct _reent *p, const char *s00, char **se,
unsigned char _EXFUN(__hexdig_fun,(unsigned char));
#endif /* !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG) */
#ifdef INFNAN_CHECK
-int _EXFUN(hexnan,(_CONST char **sp, _CONST struct FPI *fpi, __ULong *x0));
+int _EXFUN(hexnan,(const char **sp, const struct FPI *fpi, __ULong *x0));
#endif
#define Bcopy(x,y) memcpy((char *)&x->_sign, (char *)&y->_sign, y->_wds*sizeof(__Long) + 2*sizeof(int))
-extern _CONST double tinytens[];
-extern _CONST double bigtens[];
-extern _CONST double tens[];
+extern const double tinytens[];
+extern const double bigtens[];
+extern const double tens[];
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG)
-extern _CONST unsigned char __hexdig[];
+extern const unsigned char __hexdig[];
#endif /* !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG) */
diff --git a/newlib/libc/stdlib/setenv.c b/newlib/libc/stdlib/setenv.c
index 7e8949417..c963a3343 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,
- _CONST char *value,
+ const char *name,
+ const char *value,
int rewrite)
{
return _setenv_r (_REENT, name, value, rewrite);
@@ -46,7 +46,7 @@ _DEFUN (setenv, (name, value, rewrite),
*/
int
_DEFUN (unsetenv, (name),
- _CONST char *name)
+ const char *name)
{
return _unsetenv_r (_REENT, name);
}
diff --git a/newlib/libc/stdlib/setenv_r.c b/newlib/libc/stdlib/setenv_r.c
index 75f21733e..b3bc1fcce 100644
--- a/newlib/libc/stdlib/setenv_r.c
+++ b/newlib/libc/stdlib/setenv_r.c
@@ -51,8 +51,8 @@ extern char *_findenv_r _PARAMS ((struct _reent *, const char *, int *));
int
_DEFUN (_setenv_r, (reent_ptr, name, value, rewrite),
struct _reent *reent_ptr,
- _CONST char *name,
- _CONST char *value,
+ const char *name,
+ const char *value,
int rewrite)
{
static int alloced; /* if allocated space before */
@@ -135,7 +135,7 @@ _DEFUN (_setenv_r, (reent_ptr, name, value, rewrite),
int
_DEFUN (_unsetenv_r, (reent_ptr, name),
struct _reent *reent_ptr,
- _CONST char *name)
+ const char *name)
{
register char **P;
int offset;
diff --git a/newlib/libc/stdlib/strtod.c b/newlib/libc/stdlib/strtod.c
index e3c9b7f17..1abff4fe2 100644
--- a/newlib/libc/stdlib/strtod.c
+++ b/newlib/libc/stdlib/strtod.c
@@ -152,7 +152,7 @@ THIS SOFTWARE.
#undef tinytens
/* The factor of 2^106 in tinytens[4] helps us avoid setting the underflow */
/* flag unnecessarily. It leads to a song and dance at the end of strtod. */
-static _CONST double tinytens[] = { 1e-16, 1e-32,
+static const double tinytens[] = { 1e-16, 1e-32,
#ifdef _DOUBLE_IS_32BITS
0.0, 0.0, 0.0
#else
@@ -243,7 +243,7 @@ _strtod_l (struct _reent *ptr, const char *__restrict s00, char **__restrict se,
#endif
int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, decpt, dsign,
e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
- _CONST char *s, *s0, *s1;
+ const char *s, *s0, *s1;
double aadj, adj;
U aadj1, rv, rv0;
Long L;
@@ -288,7 +288,7 @@ _strtod_l (struct _reent *ptr, const char *__restrict s00, char **__restrict se,
if (*s == '0') {
#ifndef NO_HEX_FP
{
- static _CONST FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI };
+ static const FPI fpi = { 53, 1-1023-53+1, 2046-1023-53+1, 1, SI };
Long exp;
__ULong bits[2];
switch(s[1]) {
@@ -415,7 +415,7 @@ _strtod_l (struct _reent *ptr, const char *__restrict s00, char **__restrict se,
#ifdef INFNAN_CHECK
/* Check for Nan and Infinity */
__ULong bits[2];
- static _CONST FPI fpinan = /* only 52 explicit bits */
+ static const FPI fpinan = /* only 52 explicit bits */
{ 52, 1-1023-53+1, 2046-1023-53+1, 1, SI };
if (!decpt)
switch(c) {
@@ -1254,7 +1254,7 @@ _strtod_l (struct _reent *ptr, const char *__restrict s00, char **__restrict se,
double
_DEFUN (_strtod_r, (ptr, s00, se),
struct _reent *ptr,
- _CONST char *__restrict s00,
+ 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, 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,
+ 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 7ffa6a95d..a366680e4 100644
--- a/newlib/libc/stdlib/strtol.c
+++ b/newlib/libc/stdlib/strtol.c
@@ -214,7 +214,7 @@ _strtol_l (struct _reent *rptr, const char *__restrict nptr,
long
_DEFUN (_strtol_r, (rptr, nptr, endptr, base),
struct _reent *rptr,
- _CONST char *__restrict nptr,
+ const char *__restrict nptr,
char **__restrict endptr,
int base)
{
@@ -232,7 +232,7 @@ strtol_l (const char *__restrict s, char **__restrict ptr, int base,
long
_DEFUN (strtol, (s, ptr, base),
- _CONST char *__restrict s,
+ const char *__restrict s,
char **__restrict ptr,
int base)
{
diff --git a/newlib/libc/stdlib/strtoll.c b/newlib/libc/stdlib/strtoll.c
index 51752655a..9fc832393 100644
--- a/newlib/libc/stdlib/strtoll.c
+++ b/newlib/libc/stdlib/strtoll.c
@@ -133,7 +133,7 @@ No supporting OS subroutines are required.
* Convert a string to a long long integer.
*/
static long long
-_strtoll_l (struct _reent *rptr, _CONST char *__restrict nptr,
+_strtoll_l (struct _reent *rptr, const char *__restrict nptr,
char **__restrict endptr, int base, locale_t loc)
{
register const unsigned char *s = (const unsigned char *)nptr;
@@ -216,7 +216,7 @@ _strtoll_l (struct _reent *rptr, _CONST char *__restrict nptr,
long long
_DEFUN (_strtoll_r, (rptr, nptr, endptr, base),
struct _reent *rptr,
- _CONST char *__restrict nptr,
+ const char *__restrict nptr,
char **__restrict endptr,
int base)
{
@@ -234,7 +234,7 @@ strtoll_l (const char *__restrict s, char **__restrict ptr, int base,
long long
_DEFUN (strtoll, (s, ptr, base),
- _CONST char *__restrict s,
+ const char *__restrict s,
char **__restrict ptr,
int base)
{
diff --git a/newlib/libc/stdlib/strtoul.c b/newlib/libc/stdlib/strtoul.c
index e18472254..5a816dab1 100644
--- a/newlib/libc/stdlib/strtoul.c
+++ b/newlib/libc/stdlib/strtoul.c
@@ -193,7 +193,7 @@ _strtoul_l (struct _reent *rptr, const char *__restrict nptr,
unsigned long
_DEFUN (_strtoul_r, (rptr, nptr, endptr, base),
struct _reent *rptr,
- _CONST char *__restrict nptr,
+ const char *__restrict nptr,
char **__restrict endptr,
int base)
{
@@ -211,7 +211,7 @@ strtoul_l (const char *__restrict s, char **__restrict ptr, int base,
unsigned long
_DEFUN (strtoul, (s, ptr, base),
- _CONST char *__restrict s,
+ const char *__restrict s,
char **__restrict ptr,
int base)
{
diff --git a/newlib/libc/stdlib/strtoull.c b/newlib/libc/stdlib/strtoull.c
index 4dfb28f79..0f7c9e385 100644
--- a/newlib/libc/stdlib/strtoull.c
+++ b/newlib/libc/stdlib/strtoull.c
@@ -191,7 +191,7 @@ _strtoull_l (struct _reent *rptr, const char *__restrict nptr,
unsigned long long
_DEFUN (_strtoull_r, (rptr, nptr, endptr, base),
struct _reent *rptr,
- _CONST char *__restrict nptr,
+ const char *__restrict nptr,
char **__restrict endptr,
int base)
{
@@ -209,7 +209,7 @@ strtoull_l (const char *__restrict s, char **__restrict ptr, int base,
unsigned long long
_DEFUN (strtoull, (s, ptr, base),
- _CONST char *__restrict s,
+ const char *__restrict s,
char **__restrict ptr,
int base)
{
diff --git a/newlib/libc/stdlib/system.c b/newlib/libc/stdlib/system.c
index f172e5de9..0df7d60d3 100644
--- a/newlib/libc/stdlib/system.c
+++ b/newlib/libc/stdlib/system.c
@@ -53,13 +53,13 @@ Supporting OS subroutines required: <<_exit>>, <<_execve>>, <<_fork_r>>,
#include <reent.h>
#if defined (unix) || defined (__CYGWIN__)
-static int _EXFUN(do_system, (struct _reent *ptr, _CONST char *s));
+static int _EXFUN(do_system, (struct _reent *ptr, const char *s));
#endif
int
_DEFUN(_system_r, (ptr, s),
struct _reent *ptr,
- _CONST char *s)
+ const char *s)
{
#if defined(HAVE_SYSTEM)
return _system (s);
@@ -94,7 +94,7 @@ _DEFUN(_system_r, (ptr, s),
int
_DEFUN(system, (s),
- _CONST char *s)
+ const char *s)
{
return _system_r (_REENT, s);
}
@@ -112,7 +112,7 @@ static char ***p_environ = &environ;
static int
_DEFUN(do_system, (ptr, s),
struct _reent *ptr,
- _CONST char *s)
+ const char *s)
{
char *argv[4];
int pid, status;
@@ -144,7 +144,7 @@ _DEFUN(do_system, (ptr, s),
static int
_DEFUN(do_system, (ptr, s),
struct _reent *ptr,
- _CONST char *s)
+ const char *s)
{
char *argv[4];
int pid, status;
diff --git a/newlib/libc/stdlib/wcstod.c b/newlib/libc/stdlib/wcstod.c
index 239f8d2c0..8a72e6fe3 100644
--- a/newlib/libc/stdlib/wcstod.c
+++ b/newlib/libc/stdlib/wcstod.c
@@ -216,7 +216,7 @@ _wcstod_l (struct _reent *ptr, const wchar_t *nptr, wchar_t **endptr,
double
_DEFUN (_wcstod_r, (ptr, nptr, endptr),
struct _reent *ptr,
- _CONST wchar_t *nptr,
+ const wchar_t *nptr,
wchar_t **endptr)
{
return _wcstod_l (ptr, nptr, endptr, __get_current_locale ());
@@ -225,7 +225,7 @@ _DEFUN (_wcstod_r, (ptr, nptr, endptr),
float
_DEFUN (_wcstof_r, (ptr, nptr, endptr),
struct _reent *ptr,
- _CONST wchar_t *nptr,
+ 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, 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,
+ 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 1f5fd4b3a..324d75ee1 100644
--- a/newlib/libc/stdlib/wcstol.c
+++ b/newlib/libc/stdlib/wcstol.c
@@ -215,7 +215,7 @@ _wcstol_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
long
_DEFUN (_wcstol_r, (rptr, nptr, endptr, base),
struct _reent *rptr,
- _CONST wchar_t *nptr,
+ const wchar_t *nptr,
wchar_t **endptr,
int base)
{
@@ -233,7 +233,7 @@ wcstol_l (const wchar_t *__restrict s, wchar_t **__restrict ptr, int base,
long
_DEFUN (wcstol, (s, ptr, base),
- _CONST wchar_t *__restrict s,
+ const wchar_t *__restrict s,
wchar_t **__restrict ptr,
int base)
{
diff --git a/newlib/libc/stdlib/wcstoll.c b/newlib/libc/stdlib/wcstoll.c
index be9500027..00db2adf0 100644
--- a/newlib/libc/stdlib/wcstoll.c
+++ b/newlib/libc/stdlib/wcstoll.c
@@ -215,7 +215,7 @@ _wcstoll_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
long long
_DEFUN (_wcstoll_r, (rptr, nptr, endptr, base),
struct _reent *rptr,
- _CONST wchar_t *nptr,
+ const wchar_t *nptr,
wchar_t **endptr,
int base)
{
@@ -233,7 +233,7 @@ 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,
+ const wchar_t *__restrict s,
wchar_t **__restrict ptr,
int base)
{
diff --git a/newlib/libc/stdlib/wcstoul.c b/newlib/libc/stdlib/wcstoul.c
index 2470bfa71..5c54ec591 100644
--- a/newlib/libc/stdlib/wcstoul.c
+++ b/newlib/libc/stdlib/wcstoul.c
@@ -194,7 +194,7 @@ _wcstoul_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
unsigned long
_DEFUN (_wcstoul_r, (rptr, nptr, endptr, base),
struct _reent *rptr,
- _CONST wchar_t *nptr,
+ const wchar_t *nptr,
wchar_t **endptr,
int base)
{
@@ -212,7 +212,7 @@ 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,
+ const wchar_t *__restrict s,
wchar_t **__restrict ptr,
int base)
{
diff --git a/newlib/libc/stdlib/wcstoull.c b/newlib/libc/stdlib/wcstoull.c
index 55ab3cae6..4724d6150 100644
--- a/newlib/libc/stdlib/wcstoull.c
+++ b/newlib/libc/stdlib/wcstoull.c
@@ -210,7 +210,7 @@ _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,
- _CONST wchar_t *nptr,
+ const wchar_t *nptr,
wchar_t **endptr,
int base)
{
@@ -228,7 +228,7 @@ 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,
+ const wchar_t *__restrict s,
wchar_t **__restrict ptr,
int base)
{
diff --git a/newlib/libc/string/bcmp.c b/newlib/libc/string/bcmp.c
index 342237742..29afe828c 100644
--- a/newlib/libc/string/bcmp.c
+++ b/newlib/libc/string/bcmp.c
@@ -33,8 +33,8 @@ QUICKREF
int
_DEFUN (bcmp, (m1, m2, n),
- _CONST void *m1,
- _CONST void *m2,
+ const void *m1,
+ const void *m2,
size_t n)
{
diff --git a/newlib/libc/string/bcopy.c b/newlib/libc/string/bcopy.c
index 1ad8b3e41..d6cb0c97a 100644
--- a/newlib/libc/string/bcopy.c
+++ b/newlib/libc/string/bcopy.c
@@ -25,7 +25,7 @@ QUICKREF
void
_DEFUN (bcopy, (b1, b2, length),
- _CONST void *b1,
+ const void *b1,
void *b2,
size_t length)
{
diff --git a/newlib/libc/string/index.c b/newlib/libc/string/index.c
index 756bbff3e..13519b435 100644
--- a/newlib/libc/string/index.c
+++ b/newlib/libc/string/index.c
@@ -32,7 +32,7 @@ QUICKREF
char *
_DEFUN (index, (s, c),
- _CONST char *s,
+ const char *s,
int c)
{
return strchr (s, c);
diff --git a/newlib/libc/string/memccpy.c b/newlib/libc/string/memccpy.c
index 6e49a1c6d..b03b504c1 100644
--- a/newlib/libc/string/memccpy.c
+++ b/newlib/libc/string/memccpy.c
@@ -58,7 +58,7 @@ PORTABILITY
_PTR
_DEFUN (memccpy, (dst0, src0, endchar, len0),
_PTR __restrict dst0,
- _CONST _PTR __restrict src0,
+ const _PTR __restrict src0,
int endchar0,
size_t len0)
{
@@ -82,9 +82,9 @@ _DEFUN (memccpy, (dst0, src0, endchar, len0),
#else
_PTR ptr = NULL;
char *dst = dst0;
- _CONST char *src = src0;
+ const char *src = src0;
long *aligned_dst;
- _CONST long *aligned_src;
+ const long *aligned_src;
char endchar = endchar0 & 0xff;
/* If the size is small, or either SRC or DST is unaligned,
diff --git a/newlib/libc/string/memchr.c b/newlib/libc/string/memchr.c
index a6c5556d7..9660ed383 100644
--- a/newlib/libc/string/memchr.c
+++ b/newlib/libc/string/memchr.c
@@ -63,11 +63,11 @@ QUICKREF
_PTR
_DEFUN (memchr, (src_void, c, length),
- _CONST _PTR src_void,
+ const _PTR src_void,
int c,
size_t length)
{
- _CONST unsigned char *src = (_CONST unsigned char *) src_void;
+ const unsigned char *src = (const unsigned char *) src_void;
unsigned char d = c;
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/memcmp.c b/newlib/libc/string/memcmp.c
index 1af9219de..37d653a26 100644
--- a/newlib/libc/string/memcmp.c
+++ b/newlib/libc/string/memcmp.c
@@ -44,8 +44,8 @@ QUICKREF
int
_DEFUN (memcmp, (m1, m2, n),
- _CONST _PTR m1,
- _CONST _PTR m2,
+ const _PTR m1,
+ const _PTR m2,
size_t n)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/memcpy.c b/newlib/libc/string/memcpy.c
index 3d0dca209..919379053 100644
--- a/newlib/libc/string/memcpy.c
+++ b/newlib/libc/string/memcpy.c
@@ -46,7 +46,7 @@ QUICKREF
_PTR
_DEFUN (memcpy, (dst0, src0, len0),
_PTR __restrict dst0,
- _CONST _PTR __restrict src0,
+ const _PTR __restrict src0,
size_t len0)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
@@ -63,9 +63,9 @@ _DEFUN (memcpy, (dst0, src0, len0),
return save;
#else
char *dst = dst0;
- _CONST char *src = src0;
+ const char *src = src0;
long *aligned_dst;
- _CONST long *aligned_src;
+ const long *aligned_src;
/* If the size is small, or either SRC or DST is unaligned,
then punt into the byte copy loop. This should be rare. */
diff --git a/newlib/libc/string/memmove.c b/newlib/libc/string/memmove.c
index 10a3dfd2b..e50ab587a 100644
--- a/newlib/libc/string/memmove.c
+++ b/newlib/libc/string/memmove.c
@@ -52,12 +52,12 @@ _PTR
__inhibit_loop_to_libcall
_DEFUN (memmove, (dst_void, src_void, length),
_PTR dst_void,
- _CONST _PTR src_void,
+ const _PTR src_void,
size_t length)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
char *dst = dst_void;
- _CONST char *src = src_void;
+ const char *src = src_void;
if (src < dst && dst < src + length)
{
@@ -80,9 +80,9 @@ _DEFUN (memmove, (dst_void, src_void, length),
return dst_void;
#else
char *dst = dst_void;
- _CONST char *src = src_void;
+ const char *src = src_void;
long *aligned_dst;
- _CONST long *aligned_src;
+ const long *aligned_src;
if (src < dst && dst < src + length)
{
diff --git a/newlib/libc/string/mempcpy.c b/newlib/libc/string/mempcpy.c
index 74c453b47..79cbf2350 100644
--- a/newlib/libc/string/mempcpy.c
+++ b/newlib/libc/string/mempcpy.c
@@ -45,7 +45,7 @@ PORTABILITY
_PTR
_DEFUN (mempcpy, (dst0, src0, len0),
_PTR dst0,
- _CONST _PTR src0,
+ const _PTR src0,
size_t len0)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
@@ -60,9 +60,9 @@ _DEFUN (mempcpy, (dst0, src0, len0),
return dst;
#else
char *dst = dst0;
- _CONST char *src = src0;
+ const char *src = src0;
long *aligned_dst;
- _CONST long *aligned_src;
+ const long *aligned_src;
/* If the size is small, or either SRC or DST is unaligned,
then punt into the byte copy loop. This should be rare. */
diff --git a/newlib/libc/string/memrchr.c b/newlib/libc/string/memrchr.c
index 6a2c03e4e..7a28e2733 100644
--- a/newlib/libc/string/memrchr.c
+++ b/newlib/libc/string/memrchr.c
@@ -63,11 +63,11 @@ QUICKREF
_PTR
_DEFUN (memrchr, (src_void, c, length),
- _CONST _PTR src_void,
+ const _PTR src_void,
int c,
size_t length)
{
- _CONST unsigned char *src = (_CONST unsigned char *) src_void + length - 1;
+ const unsigned char *src = (const unsigned char *) src_void + length - 1;
unsigned char d = c;
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/rawmemchr.c b/newlib/libc/string/rawmemchr.c
index 51fe8e37e..b2078dc27 100644
--- a/newlib/libc/string/rawmemchr.c
+++ b/newlib/libc/string/rawmemchr.c
@@ -62,10 +62,10 @@ QUICKREF
_PTR
_DEFUN (rawmemchr, (src_void, c),
- _CONST _PTR src_void,
+ const _PTR src_void,
int c)
{
- _CONST unsigned char *src = (_CONST unsigned char *) src_void;
+ const unsigned char *src = (const unsigned char *) src_void;
unsigned char d = c;
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/rindex.c b/newlib/libc/string/rindex.c
index e18fcb667..0c7f153cf 100644
--- a/newlib/libc/string/rindex.c
+++ b/newlib/libc/string/rindex.c
@@ -32,7 +32,7 @@ QUICKREF
char *
_DEFUN (rindex, (s, c),
- _CONST char *s,
+ const char *s,
int c)
{
return strrchr (s, c);
diff --git a/newlib/libc/string/stpcpy.c b/newlib/libc/string/stpcpy.c
index 5e00b24a2..3933036cc 100644
--- a/newlib/libc/string/stpcpy.c
+++ b/newlib/libc/string/stpcpy.c
@@ -55,11 +55,11 @@ QUICKREF
char*
_DEFUN (stpcpy, (dst, src),
char *__restrict dst,
- _CONST char *__restrict src)
+ const char *__restrict src)
{
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
long *aligned_dst;
- _CONST long *aligned_src;
+ const long *aligned_src;
/* If SRC or DEST is unaligned, then copy bytes. */
if (!UNALIGNED (src, dst))
diff --git a/newlib/libc/string/stpncpy.c b/newlib/libc/string/stpncpy.c
index 9e8a12950..69fa8515a 100644
--- a/newlib/libc/string/stpncpy.c
+++ b/newlib/libc/string/stpncpy.c
@@ -63,14 +63,14 @@ QUICKREF
char *
_DEFUN (stpncpy, (dst, src),
char *__restrict dst,
- _CONST char *__restrict src,
+ const char *__restrict src,
size_t count)
{
char *ret = NULL;
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
long *aligned_dst;
- _CONST long *aligned_src;
+ const long *aligned_src;
/* If SRC and DEST is aligned and count large enough, then copy words. */
if (!UNALIGNED (src, dst) && !TOO_SMALL (count))
diff --git a/newlib/libc/string/strcasecmp.c b/newlib/libc/string/strcasecmp.c
index 1ee8f0ebf..4a48aa69a 100644
--- a/newlib/libc/string/strcasecmp.c
+++ b/newlib/libc/string/strcasecmp.c
@@ -37,14 +37,14 @@ QUICKREF
int
_DEFUN (strcasecmp, (s1, s2),
- _CONST char *s1,
- _CONST char *s2)
+ const char *s1,
+ const char *s2)
{
int d = 0;
for ( ; ; )
{
- _CONST int c1 = tolower(*s1++);
- _CONST int c2 = tolower(*s2++);
+ const int c1 = tolower(*s1++);
+ const int c2 = tolower(*s2++);
if (((d = c1 - c2) != 0) || (c2 == '\0'))
break;
}
diff --git a/newlib/libc/string/strcasestr.c b/newlib/libc/string/strcasestr.c
index 71ade6664..1cc5f6ed7 100644
--- a/newlib/libc/string/strcasestr.c
+++ b/newlib/libc/string/strcasestr.c
@@ -91,8 +91,8 @@ QUICKREF
*/
char *
_DEFUN (strcasestr, (s, find),
- _CONST char *s,
- _CONST char *find)
+ const char *s,
+ const char *find)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strcat.c b/newlib/libc/string/strcat.c
index 96de39ba2..ac9bb8e15 100644
--- a/newlib/libc/string/strcat.c
+++ b/newlib/libc/string/strcat.c
@@ -56,7 +56,7 @@ QUICKREF
char *
_DEFUN (strcat, (s1, s2),
char *__restrict s1,
- _CONST char *__restrict s2)
+ const char *__restrict s2)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
char *s = s1;
diff --git a/newlib/libc/string/strchr.c b/newlib/libc/string/strchr.c
index f293612d5..05503d178 100644
--- a/newlib/libc/string/strchr.c
+++ b/newlib/libc/string/strchr.c
@@ -53,10 +53,10 @@ QUICKREF
char *
_DEFUN (strchr, (s1, i),
- _CONST char *s1,
+ const char *s1,
int i)
{
- _CONST unsigned char *s = (_CONST unsigned char *)s1;
+ const unsigned char *s = (const unsigned char *)s1;
unsigned char c = i;
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strchrnul.c b/newlib/libc/string/strchrnul.c
index 3d110b920..14fd4e2ec 100644
--- a/newlib/libc/string/strchrnul.c
+++ b/newlib/libc/string/strchrnul.c
@@ -32,7 +32,7 @@ QUICKREF
char *
_DEFUN (strchrnul, (s1, i),
- _CONST char *s1,
+ const char *s1,
int i)
{
char *s = strchr(s1, i);
diff --git a/newlib/libc/string/strcmp.c b/newlib/libc/string/strcmp.c
index c117c38ff..6c1a0386d 100644
--- a/newlib/libc/string/strcmp.c
+++ b/newlib/libc/string/strcmp.c
@@ -53,8 +53,8 @@ QUICKREF
int
_DEFUN (strcmp, (s1, s2),
- _CONST char *s1,
- _CONST char *s2)
+ const char *s1,
+ const char *s2)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
while (*s1 != '\0' && *s1 == *s2)
diff --git a/newlib/libc/string/strcoll.c b/newlib/libc/string/strcoll.c
index d95a42e2b..fae999a64 100644
--- a/newlib/libc/string/strcoll.c
+++ b/newlib/libc/string/strcoll.c
@@ -37,8 +37,8 @@ QUICKREF
int
_DEFUN (strcoll, (a, b),
- _CONST char *a,
- _CONST char *b)
+ const char *a,
+ const char *b)
{
return strcmp (a, b);
diff --git a/newlib/libc/string/strcpy.c b/newlib/libc/string/strcpy.c
index 4354472d3..3505b800a 100644
--- a/newlib/libc/string/strcpy.c
+++ b/newlib/libc/string/strcpy.c
@@ -54,7 +54,7 @@ QUICKREF
char*
_DEFUN (strcpy, (dst0, src0),
char *dst0,
- _CONST char *src0)
+ const char *src0)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
char *s = dst0;
@@ -65,9 +65,9 @@ _DEFUN (strcpy, (dst0, src0),
return s;
#else
char *dst = dst0;
- _CONST char *src = src0;
+ const char *src = src0;
long *aligned_dst;
- _CONST long *aligned_src;
+ const long *aligned_src;
/* If SRC or DEST is unaligned, then copy bytes. */
if (!UNALIGNED (src, dst))
diff --git a/newlib/libc/string/strcspn.c b/newlib/libc/string/strcspn.c
index f0e30c80c..589054bae 100644
--- a/newlib/libc/string/strcspn.c
+++ b/newlib/libc/string/strcspn.c
@@ -27,11 +27,11 @@ PORTABILITY
size_t
_DEFUN (strcspn, (s1, s2),
- _CONST char *s1,
- _CONST char *s2)
+ const char *s1,
+ const char *s2)
{
- _CONST char *s = s1;
- _CONST char *c;
+ const char *s = s1;
+ const char *c;
while (*s1)
{
diff --git a/newlib/libc/string/strdup.c b/newlib/libc/string/strdup.c
index dbb069264..6ea2dd570 100644
--- a/newlib/libc/string/strdup.c
+++ b/newlib/libc/string/strdup.c
@@ -5,7 +5,7 @@
#include <string.h>
char *
-_DEFUN (strdup, (str), _CONST char *str)
+_DEFUN (strdup, (str), const char *str)
{
return _strdup_r (_REENT, str);
}
diff --git a/newlib/libc/string/strdup_r.c b/newlib/libc/string/strdup_r.c
index 474ec9668..9cdee80f4 100644
--- a/newlib/libc/string/strdup_r.c
+++ b/newlib/libc/string/strdup_r.c
@@ -5,7 +5,7 @@
char *
_DEFUN (_strdup_r, (reent_ptr, str),
struct _reent *reent_ptr,
- _CONST char *str)
+ const char *str)
{
size_t len = strlen (str) + 1;
char *copy = _malloc_r (reent_ptr, len);
diff --git a/newlib/libc/string/strlcat.c b/newlib/libc/string/strlcat.c
index c606f3b30..2f99294af 100644
--- a/newlib/libc/string/strlcat.c
+++ b/newlib/libc/string/strlcat.c
@@ -44,7 +44,7 @@ static char *rcsid = "$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp
size_t
_DEFUN (strlcat, (dst, src, siz),
char *dst,
- _CONST char *src,
+ const char *src,
size_t siz)
{
register char *d = dst;
diff --git a/newlib/libc/string/strlcpy.c b/newlib/libc/string/strlcpy.c
index 300ac82c1..2dffed5e3 100644
--- a/newlib/libc/string/strlcpy.c
+++ b/newlib/libc/string/strlcpy.c
@@ -42,7 +42,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp
size_t
_DEFUN (strlcpy, (dst, src, siz),
char *dst,
- _CONST char *src,
+ const char *src,
size_t siz)
{
register char *d = dst;
diff --git a/newlib/libc/string/strlen.c b/newlib/libc/string/strlen.c
index 2e8c09f7f..df76d5fc2 100644
--- a/newlib/libc/string/strlen.c
+++ b/newlib/libc/string/strlen.c
@@ -50,9 +50,9 @@ QUICKREF
size_t
_DEFUN (strlen, (str),
- _CONST char *str)
+ const char *str)
{
- _CONST char *start = str;
+ const char *start = str;
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
unsigned long *aligned_addr;
diff --git a/newlib/libc/string/strncasecmp.c b/newlib/libc/string/strncasecmp.c
index a30fccf81..2a6f6265d 100644
--- a/newlib/libc/string/strncasecmp.c
+++ b/newlib/libc/string/strncasecmp.c
@@ -38,15 +38,15 @@ QUICKREF
int
_DEFUN (strncasecmp, (s1, s2, n),
- _CONST char *s1,
- _CONST char *s2,
+ const char *s1,
+ const char *s2,
size_t n)
{
int d = 0;
for ( ; n != 0; n--)
{
- _CONST int c1 = tolower(*s1++);
- _CONST int c2 = tolower(*s2++);
+ const int c1 = tolower(*s1++);
+ const int c2 = tolower(*s2++);
if (((d = c1 - c2) != 0) || (c2 == '\0'))
break;
}
diff --git a/newlib/libc/string/strncat.c b/newlib/libc/string/strncat.c
index f800221c6..2411cf124 100644
--- a/newlib/libc/string/strncat.c
+++ b/newlib/libc/string/strncat.c
@@ -60,7 +60,7 @@ QUICKREF
char *
_DEFUN (strncat, (s1, s2, n),
char *__restrict s1,
- _CONST char *__restrict s2,
+ const char *__restrict s2,
size_t n)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strncmp.c b/newlib/libc/string/strncmp.c
index 98a31d32b..685d19290 100644
--- a/newlib/libc/string/strncmp.c
+++ b/newlib/libc/string/strncmp.c
@@ -53,8 +53,8 @@ QUICKREF
int
_DEFUN (strncmp, (s1, s2, n),
- _CONST char *s1,
- _CONST char *s2,
+ const char *s1,
+ const char *s2,
size_t n)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strncpy.c b/newlib/libc/string/strncpy.c
index 91b274590..abbe43bc7 100644
--- a/newlib/libc/string/strncpy.c
+++ b/newlib/libc/string/strncpy.c
@@ -61,12 +61,12 @@ QUICKREF
char *
_DEFUN (strncpy, (dst0, src0),
char *__restrict dst0,
- _CONST char *__restrict src0,
+ const char *__restrict src0,
size_t count)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
char *dscan;
- _CONST char *sscan;
+ const char *sscan;
dscan = dst0;
sscan = src0;
@@ -82,9 +82,9 @@ _DEFUN (strncpy, (dst0, src0),
return dst0;
#else
char *dst = dst0;
- _CONST char *src = src0;
+ const char *src = src0;
long *aligned_dst;
- _CONST long *aligned_src;
+ const long *aligned_src;
/* If SRC and DEST is aligned and count large enough, then copy words. */
if (!UNALIGNED (src, dst) && !TOO_SMALL (count))
diff --git a/newlib/libc/string/strndup.c b/newlib/libc/string/strndup.c
index 64e9ae68e..c241ca544 100644
--- a/newlib/libc/string/strndup.c
+++ b/newlib/libc/string/strndup.c
@@ -7,7 +7,7 @@
char *
_DEFUN (strndup, (str, n),
- _CONST char *str,
+ const char *str,
size_t n)
{
return _strndup_r (_REENT, str, n);
diff --git a/newlib/libc/string/strndup_r.c b/newlib/libc/string/strndup_r.c
index c8ec072fa..3c7e8ee4f 100644
--- a/newlib/libc/string/strndup_r.c
+++ b/newlib/libc/string/strndup_r.c
@@ -5,10 +5,10 @@
char *
_DEFUN (_strndup_r, (reent_ptr, str, n),
struct _reent *reent_ptr,
- _CONST char *str,
+ const char *str,
size_t n)
{
- _CONST char *ptr = str;
+ const char *ptr = str;
size_t len;
char *copy;
diff --git a/newlib/libc/string/strnlen.c b/newlib/libc/string/strnlen.c
index 4978f726d..42f460fea 100644
--- a/newlib/libc/string/strnlen.c
+++ b/newlib/libc/string/strnlen.c
@@ -31,10 +31,10 @@ PORTABILITY
size_t
_DEFUN (strnlen, (str, n),
- _CONST char *str,
+ const char *str,
size_t n)
{
- _CONST char *start = str;
+ const char *start = str;
while (n-- > 0 && *str)
str++;
diff --git a/newlib/libc/string/strpbrk.c b/newlib/libc/string/strpbrk.c
index f589fbdac..f70efc1ea 100644
--- a/newlib/libc/string/strpbrk.c
+++ b/newlib/libc/string/strpbrk.c
@@ -26,10 +26,10 @@ PORTABILITY
char *
_DEFUN (strpbrk, (s1, s2),
- _CONST char *s1,
- _CONST char *s2)
+ const char *s1,
+ const char *s2)
{
- _CONST char *c = s2;
+ const char *c = s2;
if (!*s1)
return (char *) NULL;
diff --git a/newlib/libc/string/strrchr.c b/newlib/libc/string/strrchr.c
index 721bb91dc..4aafd509a 100644
--- a/newlib/libc/string/strrchr.c
+++ b/newlib/libc/string/strrchr.c
@@ -31,10 +31,10 @@ QUICKREF
char *
_DEFUN (strrchr, (s, i),
- _CONST char *s,
+ const char *s,
int i)
{
- _CONST char *last = NULL;
+ const char *last = NULL;
if (i)
{
diff --git a/newlib/libc/string/strspn.c b/newlib/libc/string/strspn.c
index 287da4d7e..22ccd0bf8 100644
--- a/newlib/libc/string/strspn.c
+++ b/newlib/libc/string/strspn.c
@@ -31,11 +31,11 @@ QUICKREF
size_t
_DEFUN (strspn, (s1, s2),
- _CONST char *s1,
- _CONST char *s2)
+ const char *s1,
+ const char *s2)
{
- _CONST char *s = s1;
- _CONST char *c;
+ const char *s = s1;
+ const char *c;
while (*s1)
{
diff --git a/newlib/libc/string/strstr.c b/newlib/libc/string/strstr.c
index 94fe297e7..749edbce6 100644
--- a/newlib/libc/string/strstr.c
+++ b/newlib/libc/string/strstr.c
@@ -40,8 +40,8 @@ QUICKREF
char *
_DEFUN (strstr, (searchee, lookfor),
- _CONST char *searchee,
- _CONST char *lookfor)
+ const char *searchee,
+ const char *lookfor)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strxfrm.c b/newlib/libc/string/strxfrm.c
index 55b81b335..13c51becf 100644
--- a/newlib/libc/string/strxfrm.c
+++ b/newlib/libc/string/strxfrm.c
@@ -48,7 +48,7 @@ QUICKREF
size_t
_DEFUN (strxfrm, (s1, s2, n),
char *__restrict s1,
- _CONST char *__restrict s2,
+ const char *__restrict s2,
size_t n)
{
size_t res;
diff --git a/newlib/libc/string/swab.c b/newlib/libc/string/swab.c
index b08066875..1c14a4c48 100644
--- a/newlib/libc/string/swab.c
+++ b/newlib/libc/string/swab.c
@@ -19,7 +19,7 @@ PORTABILITY
void
_DEFUN (swab, (b1, b2, length),
- _CONST void *b1,
+ const void *b1,
void *b2,
ssize_t length)
{
diff --git a/newlib/libc/string/wcpcpy.c b/newlib/libc/string/wcpcpy.c
index 0fda226e7..942fad19c 100644
--- a/newlib/libc/string/wcpcpy.c
+++ b/newlib/libc/string/wcpcpy.c
@@ -28,7 +28,7 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcpcpy, (s1, s2),
wchar_t *__restrict s1,
- _CONST wchar_t *__restrict s2)
+ const wchar_t *__restrict s2)
{
while ((*s1++ = *s2++))
;
diff --git a/newlib/libc/string/wcpncpy.c b/newlib/libc/string/wcpncpy.c
index f643b1e43..11f4d7c1f 100644
--- a/newlib/libc/string/wcpncpy.c
+++ b/newlib/libc/string/wcpncpy.c
@@ -35,7 +35,7 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcpncpy, (dst, src, count),
wchar_t *__restrict dst,
- _CONST wchar_t *__restrict src,
+ const wchar_t *__restrict src,
size_t count)
{
wchar_t *ret = NULL;
diff --git a/newlib/libc/string/wcscasecmp.c b/newlib/libc/string/wcscasecmp.c
index f23e37227..483754997 100644
--- a/newlib/libc/string/wcscasecmp.c
+++ b/newlib/libc/string/wcscasecmp.c
@@ -37,8 +37,8 @@ QUICKREF
int
_DEFUN (wcscasecmp, (s1, s2),
- _CONST wchar_t *s1,
- _CONST wchar_t *s2)
+ const wchar_t *s1,
+ const wchar_t *s2)
{
int d = 0;
for ( ; ; )
diff --git a/newlib/libc/string/wcscat.c b/newlib/libc/string/wcscat.c
index 900c3cc52..40b7774e5 100644
--- a/newlib/libc/string/wcscat.c
+++ b/newlib/libc/string/wcscat.c
@@ -63,11 +63,11 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcscat, (s1, s2),
wchar_t *__restrict s1,
- _CONST wchar_t *__restrict s2)
+ const wchar_t *__restrict s2)
{
wchar_t *p;
wchar_t *q;
- _CONST wchar_t *r;
+ const wchar_t *r;
p = s1;
while (*p)
diff --git a/newlib/libc/string/wcschr.c b/newlib/libc/string/wcschr.c
index 7590009e9..f883f5443 100644
--- a/newlib/libc/string/wcschr.c
+++ b/newlib/libc/string/wcschr.c
@@ -59,10 +59,10 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcschr, (s, c),
- _CONST wchar_t * s,
+ const wchar_t * s,
wchar_t c)
{
- _CONST wchar_t *p;
+ const wchar_t *p;
p = s;
do
diff --git a/newlib/libc/string/wcscmp.c b/newlib/libc/string/wcscmp.c
index f14eb5d8d..1fb35755c 100644
--- a/newlib/libc/string/wcscmp.c
+++ b/newlib/libc/string/wcscmp.c
@@ -68,8 +68,8 @@ No supporting OS subroutines are required.
*/
int
_DEFUN (wcscmp, (s1, s2),
- _CONST wchar_t * s1,
- _CONST wchar_t * s2)
+ const wchar_t * s1,
+ const wchar_t * s2)
{
while (*s1 == *s2++)
diff --git a/newlib/libc/string/wcscoll.c b/newlib/libc/string/wcscoll.c
index 27a12456e..7d6b927f8 100644
--- a/newlib/libc/string/wcscoll.c
+++ b/newlib/libc/string/wcscoll.c
@@ -34,8 +34,8 @@ PORTABILITY
int
_DEFUN (wcscoll, (a, b),
- _CONST wchar_t *a,
- _CONST wchar_t *b)
+ const wchar_t *a,
+ const wchar_t *b)
{
return wcscmp (a, b);
diff --git a/newlib/libc/string/wcscpy.c b/newlib/libc/string/wcscpy.c
index 2dff63996..679e9c543 100644
--- a/newlib/libc/string/wcscpy.c
+++ b/newlib/libc/string/wcscpy.c
@@ -59,10 +59,10 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcscpy, (s1, s2),
wchar_t *__restrict s1,
- _CONST wchar_t *__restrict s2)
+ const wchar_t *__restrict s2)
{
wchar_t *p;
- _CONST wchar_t *q;
+ const wchar_t *q;
*s1 = '\0';
p = s1;
diff --git a/newlib/libc/string/wcscspn.c b/newlib/libc/string/wcscspn.c
index 355499699..54bca2fa7 100644
--- a/newlib/libc/string/wcscspn.c
+++ b/newlib/libc/string/wcscspn.c
@@ -57,11 +57,11 @@ No supporting OS subroutines are required.
size_t
_DEFUN (wcscspn, (s, set),
- _CONST wchar_t * s,
- _CONST wchar_t * set)
+ const wchar_t * s,
+ const wchar_t * set)
{
- _CONST wchar_t *p;
- _CONST wchar_t *q;
+ const wchar_t *p;
+ const wchar_t *q;
p = s;
while (*p)
diff --git a/newlib/libc/string/wcslcat.c b/newlib/libc/string/wcslcat.c
index 1015c4c36..dd96d3049 100644
--- a/newlib/libc/string/wcslcat.c
+++ b/newlib/libc/string/wcslcat.c
@@ -70,11 +70,11 @@ No supporting OS subroutines are required.
size_t
_DEFUN (wcslcat, (dst, src, siz),
wchar_t * dst,
- _CONST wchar_t * src,
+ const wchar_t * src,
size_t siz)
{
wchar_t *d = dst;
- _CONST wchar_t *s = src;
+ const wchar_t *s = src;
size_t n = siz;
size_t dlen;
diff --git a/newlib/libc/string/wcslcpy.c b/newlib/libc/string/wcslcpy.c
index 396dda71a..a21f8c8fc 100644
--- a/newlib/libc/string/wcslcpy.c
+++ b/newlib/libc/string/wcslcpy.c
@@ -64,11 +64,11 @@ No supporting OS subroutines are required.
size_t
_DEFUN (wcslcpy, (dst, src, siz),
wchar_t * dst,
- _CONST wchar_t * src,
+ const wchar_t * src,
size_t siz)
{
wchar_t *d = dst;
- _CONST wchar_t *s = src;
+ const wchar_t *s = src;
size_t n = siz;
/* Copy as many bytes as will fit */
diff --git a/newlib/libc/string/wcslen.c b/newlib/libc/string/wcslen.c
index ebef17285..c92757708 100644
--- a/newlib/libc/string/wcslen.c
+++ b/newlib/libc/string/wcslen.c
@@ -56,9 +56,9 @@ No supporting OS subroutines are required.
size_t
_DEFUN (wcslen, (s),
- _CONST wchar_t * s)
+ const wchar_t * s)
{
- _CONST wchar_t *p;
+ const wchar_t *p;
p = s;
while (*p)
diff --git a/newlib/libc/string/wcsncasecmp.c b/newlib/libc/string/wcsncasecmp.c
index 90f310158..7abb154ee 100644
--- a/newlib/libc/string/wcsncasecmp.c
+++ b/newlib/libc/string/wcsncasecmp.c
@@ -38,8 +38,8 @@ QUICKREF
int
_DEFUN (wcsncasecmp, (s1, s2, n),
- _CONST wchar_t *s1,
- _CONST wchar_t *s2,
+ const wchar_t *s1,
+ const wchar_t *s2,
size_t n)
{
int d = 0;
diff --git a/newlib/libc/string/wcsncat.c b/newlib/libc/string/wcsncat.c
index 57dc9031b..3c344b46e 100644
--- a/newlib/libc/string/wcsncat.c
+++ b/newlib/libc/string/wcsncat.c
@@ -64,12 +64,12 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcsncat, (s1, s2, n),
wchar_t *__restrict s1,
- _CONST wchar_t *__restrict s2,
+ const wchar_t *__restrict s2,
size_t n)
{
wchar_t *p;
wchar_t *q;
- _CONST wchar_t *r;
+ const wchar_t *r;
p = s1;
while (*p)
diff --git a/newlib/libc/string/wcsncmp.c b/newlib/libc/string/wcsncmp.c
index 83b899d84..2dc7660f4 100644
--- a/newlib/libc/string/wcsncmp.c
+++ b/newlib/libc/string/wcsncmp.c
@@ -64,8 +64,8 @@ No supporting OS subroutines are required.
int
_DEFUN (wcsncmp, (s1, s2, n),
- _CONST wchar_t * s1,
- _CONST wchar_t * s2,
+ const wchar_t * s1,
+ const wchar_t * s2,
size_t n)
{
diff --git a/newlib/libc/string/wcsncpy.c b/newlib/libc/string/wcsncpy.c
index d09b95df7..324dad3a2 100644
--- a/newlib/libc/string/wcsncpy.c
+++ b/newlib/libc/string/wcsncpy.c
@@ -37,7 +37,7 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcsncpy, (s1, s2, n),
wchar_t *__restrict s1,
- _CONST wchar_t *__restrict s2,
+ const wchar_t *__restrict s2,
size_t n)
{
wchar_t *dscan=s1;
diff --git a/newlib/libc/string/wcsnlen.c b/newlib/libc/string/wcsnlen.c
index e9715e749..cc7d66e10 100644
--- a/newlib/libc/string/wcsnlen.c
+++ b/newlib/libc/string/wcsnlen.c
@@ -53,10 +53,10 @@ PORTABILITY
size_t
_DEFUN(wcsnlen, (s, maxlen),
- _CONST wchar_t *s,
+ const wchar_t *s,
size_t maxlen)
{
- _CONST wchar_t *p;
+ const wchar_t *p;
p = s;
while (*p && maxlen-- > 0)
diff --git a/newlib/libc/string/wcspbrk.c b/newlib/libc/string/wcspbrk.c
index b4d8230cc..ecda7affe 100644
--- a/newlib/libc/string/wcspbrk.c
+++ b/newlib/libc/string/wcspbrk.c
@@ -58,11 +58,11 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcspbrk, (s, set),
- _CONST wchar_t * s,
- _CONST wchar_t * set)
+ const wchar_t * s,
+ const wchar_t * set)
{
- _CONST wchar_t *p;
- _CONST wchar_t *q;
+ const wchar_t *p;
+ const wchar_t *q;
p = s;
while (*p)
diff --git a/newlib/libc/string/wcsrchr.c b/newlib/libc/string/wcsrchr.c
index 68f1e28b6..f12ccc202 100644
--- a/newlib/libc/string/wcsrchr.c
+++ b/newlib/libc/string/wcsrchr.c
@@ -61,10 +61,10 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcsrchr, (s, c),
- _CONST wchar_t * s,
+ const wchar_t * s,
wchar_t c)
{
- _CONST wchar_t *p;
+ const wchar_t *p;
p = s;
while (*p)
diff --git a/newlib/libc/string/wcsspn.c b/newlib/libc/string/wcsspn.c
index 8e8ce6c69..196816821 100644
--- a/newlib/libc/string/wcsspn.c
+++ b/newlib/libc/string/wcsspn.c
@@ -57,11 +57,11 @@ No supporting OS subroutines are required.
size_t
_DEFUN (wcsspn, (s, set),
- _CONST wchar_t * s,
- _CONST wchar_t * set)
+ const wchar_t * s,
+ const wchar_t * set)
{
- _CONST wchar_t *p;
- _CONST wchar_t *q;
+ const wchar_t *p;
+ const wchar_t *q;
p = s;
while (*p)
diff --git a/newlib/libc/string/wcsstr.c b/newlib/libc/string/wcsstr.c
index 2fdec0f97..d5a031452 100644
--- a/newlib/libc/string/wcsstr.c
+++ b/newlib/libc/string/wcsstr.c
@@ -62,12 +62,12 @@ PORTABILITY
wchar_t *
_DEFUN (wcsstr, (big, little),
- _CONST wchar_t *__restrict big,
- _CONST wchar_t *__restrict little)
+ const wchar_t *__restrict big,
+ const wchar_t *__restrict little)
{
- _CONST wchar_t *p;
- _CONST wchar_t *q;
- _CONST wchar_t *r;
+ const wchar_t *p;
+ const wchar_t *q;
+ const wchar_t *r;
if (!*little)
{
diff --git a/newlib/libc/string/wcswidth.c b/newlib/libc/string/wcswidth.c
index 3764883a9..19abfd92d 100644
--- a/newlib/libc/string/wcswidth.c
+++ b/newlib/libc/string/wcswidth.c
@@ -35,7 +35,7 @@ PORTABILITY
int
_DEFUN (wcswidth, (pwcs, n),
- _CONST wchar_t *pwcs,
+ const wchar_t *pwcs,
size_t n)
{
diff --git a/newlib/libc/string/wcsxfrm.c b/newlib/libc/string/wcsxfrm.c
index 6911b21e2..78d7da566 100644
--- a/newlib/libc/string/wcsxfrm.c
+++ b/newlib/libc/string/wcsxfrm.c
@@ -38,7 +38,7 @@ PORTABILITY
size_t
_DEFUN (wcsxfrm, (a, b, n),
wchar_t *__restrict a,
- _CONST wchar_t *__restrict b,
+ const wchar_t *__restrict b,
size_t n)
{
diff --git a/newlib/libc/string/wcwidth.c b/newlib/libc/string/wcwidth.c
index acb15d0dc..a8c73a542 100644
--- a/newlib/libc/string/wcwidth.c
+++ b/newlib/libc/string/wcwidth.c
@@ -164,7 +164,7 @@ bisearch(wint_t ucs, const struct interval *table, int max)
int
_DEFUN (__wcwidth, (ucs),
- _CONST wint_t ucs)
+ const wint_t ucs)
{
#ifdef _MB_CAPABLE
/* sorted list of non-overlapping intervals of East Asian Ambiguous
@@ -330,7 +330,7 @@ _DEFUN (__wcwidth, (ucs),
int
_DEFUN (wcwidth, (wc),
- _CONST wchar_t wc)
+ const wchar_t wc)
{
wint_t wi = wc;
diff --git a/newlib/libc/string/wmemchr.c b/newlib/libc/string/wmemchr.c
index 2a6f8e1a4..8db2f64cc 100644
--- a/newlib/libc/string/wmemchr.c
+++ b/newlib/libc/string/wmemchr.c
@@ -64,7 +64,7 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wmemchr, (s, c, n),
- _CONST wchar_t * s,
+ const wchar_t * s,
wchar_t c,
size_t n)
{
diff --git a/newlib/libc/string/wmemcmp.c b/newlib/libc/string/wmemcmp.c
index bfe1e69b4..abb9ed6ff 100644
--- a/newlib/libc/string/wmemcmp.c
+++ b/newlib/libc/string/wmemcmp.c
@@ -63,8 +63,8 @@ No supporting OS subroutines are required.
int
_DEFUN (wmemcmp, (s1, s2, n),
- _CONST wchar_t * s1,
- _CONST wchar_t * s2,
+ const wchar_t * s1,
+ const wchar_t * s2,
size_t n)
{
size_t i;
diff --git a/newlib/libc/string/wmemcpy.c b/newlib/libc/string/wmemcpy.c
index 9e4fdc517..ad1aa24bc 100644
--- a/newlib/libc/string/wmemcpy.c
+++ b/newlib/libc/string/wmemcpy.c
@@ -63,7 +63,7 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wmemcpy, (d, s, n),
wchar_t *__restrict d,
- _CONST wchar_t *__restrict s,
+ const wchar_t *__restrict s,
size_t n)
{
diff --git a/newlib/libc/string/wmemmove.c b/newlib/libc/string/wmemmove.c
index 567f55afd..22b5a987d 100644
--- a/newlib/libc/string/wmemmove.c
+++ b/newlib/libc/string/wmemmove.c
@@ -68,7 +68,7 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wmemmove, (d, s, n),
wchar_t * d,
- _CONST wchar_t * s,
+ const wchar_t * s,
size_t n)
{
diff --git a/newlib/libc/string/wmempcpy.c b/newlib/libc/string/wmempcpy.c
index f11485262..7354e81da 100644
--- a/newlib/libc/string/wmempcpy.c
+++ b/newlib/libc/string/wmempcpy.c
@@ -36,7 +36,7 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wmempcpy, (d, s, n),
wchar_t *__restrict d,
- _CONST wchar_t *__restrict s,
+ const wchar_t *__restrict s,
size_t n)
{
return (wchar_t *) mempcpy (d, s, n * sizeof (wchar_t));
diff --git a/newlib/libc/sys/linux/getpwent.c b/newlib/libc/sys/linux/getpwent.c
index 9479021e3..adf607e02 100644
--- a/newlib/libc/sys/linux/getpwent.c
+++ b/newlib/libc/sys/linux/getpwent.c
@@ -4,7 +4,7 @@
struct passwd *
_DEFUN (getpwnam, (name),
- _CONST char *name)
+ const char *name)
{
errno = ENOSYS;
return NULL;
diff --git a/newlib/libc/sys/linux/pwrite.c b/newlib/libc/sys/linux/pwrite.c
index c2b79ad13..2db2935ed 100644
--- a/newlib/libc/sys/linux/pwrite.c
+++ b/newlib/libc/sys/linux/pwrite.c
@@ -9,7 +9,7 @@ ssize_t
_DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
struct _reent *rptr,
int fd,
- _CONST _PTR buf,
+ const _PTR buf,
size_t n,
off_t off)
{
@@ -35,7 +35,7 @@ _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
ssize_t
_DEFUN (__libc_pwrite, (fd, buf, n, off),
int fd,
- _CONST _PTR buf,
+ const _PTR buf,
size_t n,
off_t off)
{
diff --git a/newlib/libc/sys/linux/sys/errno.h b/newlib/libc/sys/linux/sys/errno.h
index 82c84c944..86a6968fe 100644
--- a/newlib/libc/sys/linux/sys/errno.h
+++ b/newlib/libc/sys/linux/sys/errno.h
@@ -15,7 +15,7 @@
extern int *__errno _PARAMS ((void));
#endif
-extern __IMPORT _CONST char * _CONST _sys_errlist[];
+extern __IMPORT const char * const _sys_errlist[];
extern __IMPORT int _sys_nerr;
#define __errno_r(ptr) ((ptr)->_errno)
diff --git a/newlib/libc/sys/phoenix/sys/errno.h b/newlib/libc/sys/phoenix/sys/errno.h
index e3ec2a40e..82aab6d0c 100644
--- a/newlib/libc/sys/phoenix/sys/errno.h
+++ b/newlib/libc/sys/phoenix/sys/errno.h
@@ -34,7 +34,7 @@ extern int *__errno _PARAMS ((void));
#endif
/* Don't use these variables directly. Use strerror instead. */
-extern __IMPORT _CONST char * _CONST _sys_errlist[];
+extern __IMPORT const char * const _sys_errlist[];
extern __IMPORT int _sys_nerr;
#define __errno_r(ptr) ((ptr)->_errno)
diff --git a/newlib/libc/syscalls/sysexecve.c b/newlib/libc/syscalls/sysexecve.c
index 3471e893f..1a593117d 100644
--- a/newlib/libc/syscalls/sysexecve.c
+++ b/newlib/libc/syscalls/sysexecve.c
@@ -5,9 +5,9 @@
int
_DEFUN (execve, (name, argv, env),
- _CONST char *name,
- char *_CONST argv[],
- char *_CONST env[])
+ const char *name,
+ char *const argv[],
+ char *const env[])
{
return _execve_r (_REENT, name, argv, env);
}
diff --git a/newlib/libc/syscalls/syslink.c b/newlib/libc/syscalls/syslink.c
index afcf3559e..188040e4e 100644
--- a/newlib/libc/syscalls/syslink.c
+++ b/newlib/libc/syscalls/syslink.c
@@ -5,8 +5,8 @@
int
_DEFUN (link, (old, new),
- _CONST char *old,
- _CONST char *new)
+ const char *old,
+ const char *new)
{
return _link_r (_REENT, old, new);
}
diff --git a/newlib/libc/syscalls/sysstat.c b/newlib/libc/syscalls/sysstat.c
index 4f4cd8a78..3e0287ec8 100644
--- a/newlib/libc/syscalls/sysstat.c
+++ b/newlib/libc/syscalls/sysstat.c
@@ -6,7 +6,7 @@
int
_DEFUN (stat, (file, pstat),
- _CONST char *file,
+ const char *file,
struct stat *pstat)
{
return _stat_r (_REENT, file, pstat);
diff --git a/newlib/libc/syscalls/sysunlink.c b/newlib/libc/syscalls/sysunlink.c
index 1399a80e5..06b4fc086 100644
--- a/newlib/libc/syscalls/sysunlink.c
+++ b/newlib/libc/syscalls/sysunlink.c
@@ -5,7 +5,7 @@
int
_DEFUN (unlink, (file),
- _CONST char *file)
+ const char *file)
{
return _unlink_r (_REENT, file);
}
diff --git a/newlib/libc/time/asctime.c b/newlib/libc/time/asctime.c
index b9345f581..cbecd94f1 100644
--- a/newlib/libc/time/asctime.c
+++ b/newlib/libc/time/asctime.c
@@ -49,7 +49,7 @@ ANSI C requires <<asctime>>.
char *
_DEFUN (asctime, (tim_p),
- _CONST struct tm *tim_p)
+ const struct tm *tim_p)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/time/asctime_r.c b/newlib/libc/time/asctime_r.c
index c38e32f41..93e3fc27f 100644
--- a/newlib/libc/time/asctime_r.c
+++ b/newlib/libc/time/asctime_r.c
@@ -7,13 +7,13 @@
char *
_DEFUN (asctime_r, (tim_p, result),
- _CONST struct tm *__restrict tim_p,
+ const struct tm *__restrict tim_p,
char *__restrict result)
{
- static _CONST char day_name[7][3] = {
+ static const char day_name[7][3] = {
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
};
- static _CONST char mon_name[12][3] = {
+ static const char mon_name[12][3] = {
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
};
diff --git a/newlib/libc/time/ctime.c b/newlib/libc/time/ctime.c
index 160eb9948..f0592f469 100644
--- a/newlib/libc/time/ctime.c
+++ b/newlib/libc/time/ctime.c
@@ -38,7 +38,7 @@ ANSI C requires <<ctime>>.
char *
_DEFUN (ctime, (tim_p),
- _CONST time_t * tim_p)
+ const time_t * tim_p)
{
return asctime (localtime (tim_p));
}
diff --git a/newlib/libc/time/ctime_r.c b/newlib/libc/time/ctime_r.c
index 3546142dd..4ab0ba77d 100644
--- a/newlib/libc/time/ctime_r.c
+++ b/newlib/libc/time/ctime_r.c
@@ -6,7 +6,7 @@
char *
_DEFUN (ctime_r, (tim_p, result),
- _CONST time_t * tim_p,
+ const time_t * tim_p,
char * result)
{
diff --git a/newlib/libc/time/gmtime.c b/newlib/libc/time/gmtime.c
index c62a212f7..e74a16157 100644
--- a/newlib/libc/time/gmtime.c
+++ b/newlib/libc/time/gmtime.c
@@ -51,7 +51,7 @@ ANSI C requires <<gmtime>>.
struct tm *
_DEFUN (gmtime, (tim_p),
- _CONST time_t * tim_p)
+ const time_t * tim_p)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/time/gmtime_r.c b/newlib/libc/time/gmtime_r.c
index 01f95ebf7..dcc5dd166 100644
--- a/newlib/libc/time/gmtime_r.c
+++ b/newlib/libc/time/gmtime_r.c
@@ -47,11 +47,11 @@
struct tm *
_DEFUN (gmtime_r, (tim_p, res),
- _CONST time_t *__restrict tim_p,
+ const time_t *__restrict tim_p,
struct tm *__restrict res)
{
long days, rem;
- _CONST time_t lcltime = *tim_p;
+ const time_t lcltime = *tim_p;
int era, weekday, year;
unsigned erayear, yearday, month, day;
unsigned long eraday;
diff --git a/newlib/libc/time/lcltime.c b/newlib/libc/time/lcltime.c
index 0129335a5..493df80d1 100644
--- a/newlib/libc/time/lcltime.c
+++ b/newlib/libc/time/lcltime.c
@@ -44,7 +44,7 @@ ANSI C requires <<localtime>>.
struct tm *
_DEFUN (localtime, (tim_p),
- _CONST time_t * tim_p)
+ const time_t * tim_p)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/time/lcltime_r.c b/newlib/libc/time/lcltime_r.c
index 9abf683a7..3eba498c3 100644
--- a/newlib/libc/time/lcltime_r.c
+++ b/newlib/libc/time/lcltime_r.c
@@ -17,14 +17,14 @@
struct tm *
_DEFUN (localtime_r, (tim_p, res),
- _CONST time_t *__restrict tim_p,
+ const time_t *__restrict tim_p,
struct tm *__restrict res)
{
long offset;
int hours, mins, secs;
int year;
- __tzinfo_type *_CONST tz = __gettzinfo ();
- _CONST int *ip;
+ __tzinfo_type *const tz = __gettzinfo ();
+ const int *ip;
res = gmtime_r (tim_p, res);
diff --git a/newlib/libc/time/local.h b/newlib/libc/time/local.h
index af5793af9..dd9d76666 100644
--- a/newlib/libc/time/local.h
+++ b/newlib/libc/time/local.h
@@ -21,7 +21,7 @@
int _EXFUN (__tzcalc_limits, (int __year));
-extern _CONST int __month_lengths[2][MONSPERYEAR];
+extern const int __month_lengths[2][MONSPERYEAR];
_VOID _EXFUN(_tzset_unlocked_r, (struct _reent *));
_VOID _EXFUN(_tzset_unlocked, (_VOID));
diff --git a/newlib/libc/time/mktime.c b/newlib/libc/time/mktime.c
index 4849ea407..1f0d9ba27 100644
--- a/newlib/libc/time/mktime.c
+++ b/newlib/libc/time/mktime.c
@@ -50,12 +50,12 @@ ANSI C requires <<mktime>>.
#define _SEC_IN_HOUR 3600L
#define _SEC_IN_DAY 86400L
-static _CONST int DAYS_IN_MONTH[12] =
+static const int DAYS_IN_MONTH[12] =
{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
#define _DAYS_IN_MONTH(x) ((x == 1) ? days_in_feb : DAYS_IN_MONTH[x])
-static _CONST int _DAYS_BEFORE_MONTH[12] =
+static const int _DAYS_BEFORE_MONTH[12] =
{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
#define _ISLEAP(y) (((y) % 4) == 0 && (((y) % 100) != 0 || (((y)+1900) % 400) == 0))
diff --git a/newlib/libc/time/month_lengths.c b/newlib/libc/time/month_lengths.c
index 2871802f0..03fac2f07 100644
--- a/newlib/libc/time/month_lengths.c
+++ b/newlib/libc/time/month_lengths.c
@@ -8,7 +8,7 @@
#include "local.h"
-_CONST int __month_lengths[2][MONSPERYEAR] = {
+const int __month_lengths[2][MONSPERYEAR] = {
{31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
{31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}
} ;
diff --git a/newlib/libc/time/strftime.c b/newlib/libc/time/strftime.c
index 54df9b2e1..4ed84fb23 100644
--- a/newlib/libc/time/strftime.c
+++ b/newlib/libc/time/strftime.c
@@ -341,7 +341,7 @@ locale, hard-coding the "C" locale settings.
# error "YEAR_BASE < 0"
#endif
-static _CONST int dname_len[7] =
+static const int dname_len[7] =
{6, 6, 7, 9, 8, 6, 8};
/* Using the tm_year, tm_wday, and tm_yday components of TIM_P, return
@@ -349,7 +349,7 @@ static _CONST int dname_len[7] =
numbering used in "%g%G%V", avoiding overflow. */
static int
_DEFUN (iso_year_adjust, (tim_p),
- _CONST struct tm *tim_p)
+ const struct tm *tim_p)
{
/* Account for fact that tm_year==0 is year 1900. */
int leap = isleap (tim_p->tm_year + (YEAR_BASE
@@ -1434,8 +1434,8 @@ size_t
_DEFUN (strftime, (s, maxsize, format, tim_p),
CHAR *__restrict s,
size_t maxsize,
- _CONST CHAR *__restrict format,
- _CONST struct tm *__restrict tim_p)
+ const CHAR *__restrict format,
+ const struct tm *__restrict tim_p)
{
#ifdef _WANT_C99_TIME_FORMATS
era_info_t *era_info = NULL;
diff --git a/newlib/libc/time/strptime.c b/newlib/libc/time/strptime.c
index 2ec001a1e..12b2ef469 100644
--- a/newlib/libc/time/strptime.c
+++ b/newlib/libc/time/strptime.c
@@ -45,7 +45,7 @@
#define _ctloc(x) (_CurrentTimeLocale->x)
-static _CONST int _DAYS_BEFORE_MONTH[12] =
+static const int _DAYS_BEFORE_MONTH[12] =
{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
#define SET_MDAY 1
diff --git a/newlib/libc/time/tzcalc_limits.c b/newlib/libc/time/tzcalc_limits.c
index 8a0bda3da..fe785058d 100644
--- a/newlib/libc/time/tzcalc_limits.c
+++ b/newlib/libc/time/tzcalc_limits.c
@@ -16,7 +16,7 @@ _DEFUN (__tzcalc_limits, (year),
{
int days, year_days, years;
int i, j;
- __tzinfo_type *_CONST tz = __gettzinfo ();
+ __tzinfo_type *const tz = __gettzinfo ();
if (year < EPOCH_YEAR)
return 0;
@@ -44,9 +44,9 @@ _DEFUN (__tzcalc_limits, (year),
days = year_days + tz->__tzrule[i].d;
else
{
- _CONST int yleap = isleap(year);
+ const int yleap = isleap(year);
int m_day, m_wday, wday_diff;
- _CONST int *_CONST ip = __month_lengths[yleap];
+ const int *const ip = __month_lengths[yleap];
days = year_days;
diff --git a/newlib/libc/unix/getut.c b/newlib/libc/unix/getut.c
index cf054cb46..c3a9b626c 100644
--- a/newlib/libc/unix/getut.c
+++ b/newlib/libc/unix/getut.c
@@ -31,7 +31,7 @@ endutent ()
}
void
-utmpname (_CONST char *file)
+utmpname (const char *file)
{
utmp_file = strdup (file);
}
diff --git a/newlib/libc/unix/pwrite.c b/newlib/libc/unix/pwrite.c
index 2256a30ca..3bf759bd0 100644
--- a/newlib/libc/unix/pwrite.c
+++ b/newlib/libc/unix/pwrite.c
@@ -42,7 +42,7 @@ ssize_t
_DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
struct _reent *rptr,
int fd,
- _CONST _PTR buf,
+ const _PTR buf,
size_t n,
off_t off)
{
@@ -68,7 +68,7 @@ _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
ssize_t
_DEFUN (pwrite, (fd, buf, n, off),
int fd,
- _CONST _PTR buf,
+ const _PTR buf,
size_t n,
off_t off)
{
diff --git a/newlib/libc/xdr/xdr_mem.c b/newlib/libc/xdr/xdr_mem.c
index b49dc3b8f..16d128774 100644
--- a/newlib/libc/xdr/xdr_mem.c
+++ b/newlib/libc/xdr/xdr_mem.c
@@ -55,22 +55,22 @@
static void _EXFUN (xdrmem_destroy, (XDR *));
static bool_t _EXFUN (xdrmem_getlong_aligned, (XDR *, long *));
-static bool_t _EXFUN (xdrmem_putlong_aligned, (XDR *, _CONST long *));
+static bool_t _EXFUN (xdrmem_putlong_aligned, (XDR *, const long *));
static bool_t _EXFUN (xdrmem_getlong_unaligned, (XDR *, long *));
-static bool_t _EXFUN (xdrmem_putlong_unaligned, (XDR *, _CONST long *));
+static bool_t _EXFUN (xdrmem_putlong_unaligned, (XDR *, const long *));
static bool_t _EXFUN (xdrmem_getbytes, (XDR *, char *, u_int));
-static bool_t _EXFUN (xdrmem_putbytes, (XDR *, _CONST char *, u_int));
+static bool_t _EXFUN (xdrmem_putbytes, (XDR *, const char *, u_int));
/* XXX: w/64-bit pointers, u_int not enough! */
static u_int _EXFUN (xdrmem_getpos, (XDR *));
static bool_t _EXFUN (xdrmem_setpos, (XDR *, u_int));
static int32_t * _EXFUN (xdrmem_inline_aligned, (XDR *, u_int));
static int32_t * _EXFUN (xdrmem_inline_unaligned, (XDR *, u_int));
static bool_t _EXFUN (xdrmem_getint32_aligned, (XDR *, int32_t *));
-static bool_t _EXFUN (xdrmem_putint32_aligned, (XDR *, _CONST int32_t *));
+static bool_t _EXFUN (xdrmem_putint32_aligned, (XDR *, const int32_t *));
static bool_t _EXFUN (xdrmem_getint32_unaligned, (XDR *, int32_t *));
-static bool_t _EXFUN (xdrmem_putint32_unaligned, (XDR *, _CONST int32_t *));
+static bool_t _EXFUN (xdrmem_putint32_unaligned, (XDR *, const int32_t *));
-static _CONST struct xdr_ops xdrmem_ops_aligned = {
+static const struct xdr_ops xdrmem_ops_aligned = {
xdrmem_getlong_aligned,
xdrmem_putlong_aligned,
xdrmem_getbytes,
@@ -83,7 +83,7 @@ static _CONST struct xdr_ops xdrmem_ops_aligned = {
xdrmem_putint32_aligned
};
-static _CONST struct xdr_ops xdrmem_ops_unaligned = {
+static const struct xdr_ops xdrmem_ops_unaligned = {
xdrmem_getlong_unaligned,
xdrmem_putlong_unaligned,
xdrmem_getbytes,
@@ -137,7 +137,7 @@ _DEFUN (xdrmem_getlong_aligned, (xdrs, lp),
static bool_t
_DEFUN (xdrmem_putlong_aligned, (xdrs, lp),
XDR * xdrs,
- _CONST long *lp)
+ const long *lp)
{
if (xdrs->x_handy < sizeof (int32_t))
return FALSE;
@@ -166,7 +166,7 @@ _DEFUN (xdrmem_getlong_unaligned, (xdrs, lp),
static bool_t
_DEFUN (xdrmem_putlong_unaligned, (xdrs, lp),
XDR * xdrs,
- _CONST long *lp)
+ const long *lp)
{
u_int32_t l;
@@ -196,7 +196,7 @@ _DEFUN (xdrmem_getbytes, (xdrs, addr, len),
static bool_t
_DEFUN (xdrmem_putbytes, (xdrs, addr, len),
XDR * xdrs,
- _CONST char *addr,
+ const char *addr,
u_int len)
{
if (xdrs->x_handy < len)
@@ -275,7 +275,7 @@ _DEFUN (xdrmem_getint32_aligned, (xdrs, ip),
static bool_t
_DEFUN (xdrmem_putint32_aligned, (xdrs, ip),
XDR *xdrs,
- _CONST int32_t *ip)
+ const int32_t *ip)
{
if (xdrs->x_handy < sizeof(int32_t))
return FALSE;
@@ -304,7 +304,7 @@ _DEFUN (xdrmem_getint32_unaligned, (xdrs, ip),
static bool_t
_DEFUN (xdrmem_putint32_unaligned, (xdrs, ip),
XDR *xdrs,
- _CONST int32_t *ip)
+ const int32_t *ip)
{
u_int32_t l;
diff --git a/newlib/libc/xdr/xdr_private.c b/newlib/libc/xdr/xdr_private.c
index ea557fa03..79358a518 100644
--- a/newlib/libc/xdr/xdr_private.c
+++ b/newlib/libc/xdr/xdr_private.c
@@ -36,7 +36,7 @@ _DEFUN (xdr_set_vprintf, (fnptr),
void
_DEFUN (xdr_vwarnx, (format, ap),
- _CONST char *format,
+ const char *format,
va_list ap)
{
if (xdr_vprintf)
@@ -49,7 +49,7 @@ _DEFUN (xdr_vwarnx, (format, ap),
void
_DEFUN (xdr_warnx, (fmt),
- _CONST char *fmt _DOTS)
+ const char *fmt _DOTS)
{
va_list ap;
va_start (ap, fmt);
diff --git a/newlib/libc/xdr/xdr_rec.c b/newlib/libc/xdr/xdr_rec.c
index 0caadd6d5..367c3cb64 100644
--- a/newlib/libc/xdr/xdr_rec.c
+++ b/newlib/libc/xdr/xdr_rec.c
@@ -73,17 +73,17 @@ enum xprt_stat
};
static bool_t _EXFUN (xdrrec_getlong, (XDR *, long *));
-static bool_t _EXFUN (xdrrec_putlong, (XDR *, _CONST long *));
+static bool_t _EXFUN (xdrrec_putlong, (XDR *, const long *));
static bool_t _EXFUN (xdrrec_getbytes, (XDR *, char *, u_int));
-static bool_t _EXFUN (xdrrec_putbytes, (XDR *, _CONST char *, u_int));
+static bool_t _EXFUN (xdrrec_putbytes, (XDR *, const char *, u_int));
static u_int _EXFUN (xdrrec_getpos, (XDR *));
static bool_t _EXFUN (xdrrec_setpos, (XDR *, u_int));
static int32_t * _EXFUN (xdrrec_inline, (XDR *, u_int));
static void _EXFUN (xdrrec_destroy, (XDR *));
static bool_t _EXFUN (xdrrec_getint32, (XDR *, int32_t *));
-static bool_t _EXFUN (xdrrec_putint32, (XDR *, _CONST int32_t *));
+static bool_t _EXFUN (xdrrec_putint32, (XDR *, const int32_t *));
-static _CONST struct xdr_ops xdrrec_ops = {
+static const struct xdr_ops xdrrec_ops = {
xdrrec_getlong,
xdrrec_putlong,
xdrrec_getbytes,
@@ -290,7 +290,7 @@ _DEFUN (xdrrec_getlong, (xdrs, lp),
static bool_t
_DEFUN (xdrrec_putlong, (xdrs, lp),
XDR * xdrs,
- _CONST long *lp)
+ const long *lp)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
int32_t *dest_lp = ((int32_t *) (void *) (rstrm->out_finger));
@@ -345,7 +345,7 @@ _DEFUN (xdrrec_getbytes, (xdrs, addr, len),
static bool_t
_DEFUN (xdrrec_putbytes, (xdrs, addr, len),
XDR * xdrs,
- _CONST char *addr,
+ const char *addr,
u_int len)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -522,7 +522,7 @@ _DEFUN (xdrrec_getint32, (xdrs, ip),
static bool_t
_DEFUN (xdrrec_putint32, (xdrs, ip),
XDR *xdrs,
- _CONST int32_t *ip)
+ const int32_t *ip)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
int32_t *dest_ip = ((int32_t *) (void *) (rstrm->out_finger));
diff --git a/newlib/libc/xdr/xdr_sizeof.c b/newlib/libc/xdr/xdr_sizeof.c
index 34d1e6036..fe7aaa723 100644
--- a/newlib/libc/xdr/xdr_sizeof.c
+++ b/newlib/libc/xdr/xdr_sizeof.c
@@ -45,7 +45,7 @@
static bool_t
_DEFUN (x_putlong, (xdrs, longp),
XDR * xdrs,
- _CONST long *longp)
+ const long *longp)
{
xdrs->x_handy += BYTES_PER_XDR_UNIT;
return TRUE;
@@ -134,7 +134,7 @@ _DEFUN (x_destroy, (xdrs),
static bool_t
_DEFUN (x_putint32, (xdrs, int32p),
XDR *xdrs,
- _CONST int32_t *int32p)
+ const int32_t *int32p)
{
xdrs->x_handy += BYTES_PER_XDR_UNIT;
return TRUE;
diff --git a/newlib/libc/xdr/xdr_stdio.c b/newlib/libc/xdr/xdr_stdio.c
index 5bb4b13f1..e6513e5d0 100644
--- a/newlib/libc/xdr/xdr_stdio.c
+++ b/newlib/libc/xdr/xdr_stdio.c
@@ -52,19 +52,19 @@
static void _EXFUN (xdrstdio_destroy, (XDR *));
static bool_t _EXFUN (xdrstdio_getlong, (XDR *, long *));
-static bool_t _EXFUN (xdrstdio_putlong, (XDR *, _CONST long *));
+static bool_t _EXFUN (xdrstdio_putlong, (XDR *, const long *));
static bool_t _EXFUN (xdrstdio_getbytes, (XDR *, char *, u_int));
-static bool_t _EXFUN (xdrstdio_putbytes, (XDR *, _CONST char *, u_int));
+static bool_t _EXFUN (xdrstdio_putbytes, (XDR *, const char *, u_int));
static u_int _EXFUN (xdrstdio_getpos, (XDR *));
static bool_t _EXFUN (xdrstdio_setpos, (XDR *, u_int));
static int32_t * _EXFUN (xdrstdio_inline, (XDR *, u_int));
static bool_t _EXFUN (xdrstdio_getint32, (XDR*, int32_t *));
-static bool_t _EXFUN (xdrstdio_putint32, (XDR*, _CONST int32_t *));
+static bool_t _EXFUN (xdrstdio_putint32, (XDR*, const int32_t *));
/*
* Ops vector for stdio type XDR
*/
-static _CONST struct xdr_ops xdrstdio_ops = {
+static const struct xdr_ops xdrstdio_ops = {
xdrstdio_getlong, /* deseraialize a long int */
xdrstdio_putlong, /* seraialize a long int */
xdrstdio_getbytes, /* deserialize counted bytes */
@@ -123,7 +123,7 @@ _DEFUN (xdrstdio_getlong, (xdrs, lp),
static bool_t
_DEFUN (xdrstdio_putlong, (xdrs, lp),
XDR * xdrs,
- _CONST long *lp)
+ const long *lp)
{
u_int32_t temp = htonl ((u_int32_t) * lp);
@@ -147,7 +147,7 @@ _DEFUN (xdrstdio_getbytes, (xdrs, addr, len),
static bool_t
_DEFUN (xdrstdio_putbytes, (xdrs, addr, len),
XDR * xdrs,
- _CONST char *addr,
+ const char *addr,
u_int len)
{
if ((len != 0) && (fwrite (addr, (size_t) len, 1,
@@ -206,7 +206,7 @@ _DEFUN (xdrstdio_getint32, (xdrs, ip),
static bool_t
_DEFUN (xdrstdio_putint32, (xdrs, ip),
XDR *xdrs,
- _CONST int32_t *ip)
+ const int32_t *ip)
{
int32_t temp = htonl (*ip);
diff --git a/newlib/libm/test/string.c b/newlib/libm/test/string.c
index e97dfcc62..e66117fb6 100644
--- a/newlib/libm/test/string.c
+++ b/newlib/libm/test/string.c
@@ -3,7 +3,7 @@
#include <errno.h>
-_CONST char *it = "<UNSET>"; /* Routine name for message routines. */
+const char *it = "<UNSET>"; /* Routine name for message routines. */
int errors = 0;
/* Complain if condition is not true. */
diff --git a/newlib/libm/test/test.c b/newlib/libm/test/test.c
index b25e4b963..365c4c843 100644
--- a/newlib/libm/test/test.c
+++ b/newlib/libm/test/test.c
@@ -55,10 +55,10 @@ bt();
}
-static _CONST char *iname = "foo";
+static const char *iname = "foo";
void
_DEFUN(newfunc,(string),
- _CONST char *string)
+ const char *string)
{
if (strcmp(iname, string))
{
diff --git a/newlib/libm/test/test.h b/newlib/libm/test/test.h
index f58fcc96d..440c3850e 100644
--- a/newlib/libm/test/test.h
+++ b/newlib/libm/test/test.h
@@ -142,4 +142,4 @@ void _EXFUN(test_iok, (int, int));
void _EXFUN(test_eok, (int, int));
void _EXFUN(test_sok, (char *, char*));
void _EXFUN(test_scok, (char *, char*, int));
-void _EXFUN(newfunc,(_CONST char *));
+void _EXFUN(newfunc,(const char *));
diff --git a/winsup/cygwin/libc/strptime.cc b/winsup/cygwin/libc/strptime.cc
index 081aca385..4cd9256bc 100644
--- a/winsup/cygwin/libc/strptime.cc
+++ b/winsup/cygwin/libc/strptime.cc
@@ -68,7 +68,7 @@ __weak_alias(strptime,_strptime)
#define ALT_O 0x02
#define LEGAL_ALT(x) { if (alt_format & ~(x)) return NULL; }
-static _CONST int _DAYS_BEFORE_MONTH[12] =
+static const int _DAYS_BEFORE_MONTH[12] =
{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
#define SET_MDAY 1
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 13/17] ansification: remove _EXFNPTR, _EXPARM
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
` (4 preceding siblings ...)
2017-12-07 18:20 ` [PATCH v2 14/17] ansification: remove _EXFUN, _EXFUN_NOTHROW Yaakov Selkowitz
@ 2017-12-07 18:20 ` Yaakov Selkowitz
2017-12-07 18:20 ` [PATCH v2 02/17] ansification: remove _CONST Yaakov Selkowitz
` (11 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:20 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
newlib/libc/iconv/lib/conv.h | 28 ++++++++++++------------
newlib/libc/iconv/lib/ucsconv.h | 48 ++++++++++++++++++++---------------------
newlib/libc/include/_ansi.h | 4 ----
newlib/libc/include/rpc/xdr.h | 26 +++++++++++-----------
newlib/libc/include/sys/reent.h | 30 +++++++++++++-------------
newlib/libc/search/bsearch.c | 2 +-
newlib/libc/stdio/fseeko.c | 2 +-
newlib/libc/stdio64/fseeko64.c | 2 +-
newlib/libc/stdlib/atexit.c | 2 +-
newlib/libc/stdlib/on_exit.c | 2 +-
newlib/libc/xdr/xdr_private.h | 2 +-
newlib/libc/xdr/xdr_rec.c | 4 ++--
newlib/libc/xdr/xdr_sizeof.c | 6 +++---
13 files changed, 77 insertions(+), 81 deletions(-)
diff --git a/newlib/libc/iconv/lib/conv.h b/newlib/libc/iconv/lib/conv.h
index 89da4b224..658ab9152 100644
--- a/newlib/libc/iconv/lib/conv.h
+++ b/newlib/libc/iconv/lib/conv.h
@@ -63,9 +63,9 @@ typedef struct
* Pointer to conversion-specific data if success. In case of error
* returns NULL and sets current thread's/process's errno.
*/
- void *_EXFNPTR(open, (struct _reent *rptr,
+ void *(*open) (struct _reent *rptr,
const char *to,
- const char *from));
+ const char *from);
/*
* close - close conversion.
@@ -81,8 +81,8 @@ typedef struct
* When successful, returns (size_t)0. In case of error, sets current
* thread's/process's errno and returns (size_t)-1 (same as iconv_open()).
*/
- size_t _EXFNPTR(close, (struct _reent *rptr,
- void *data));
+ size_t (*close) (struct _reent *rptr,
+ void *data);
/* convert - perform encoding conversion.
*
@@ -114,13 +114,13 @@ typedef struct
* Reversible conversions are not counted. In case of error, sets current
* thread's/process's errno and returns (size_t)-1 (same as iconv()).
*/
- size_t _EXFNPTR(convert, (struct _reent *rptr,
+ size_t (*convert) (struct _reent *rptr,
void *data,
const unsigned char **inbuf,
size_t *inbytesleft,
unsigned char **outbuf,
size_t *outbytesleft,
- int flags));
+ int flags);
/*
* get_state - get current shift state.
@@ -135,9 +135,9 @@ typedef struct
* If 'direction' is 0, "from" encoding is tested, else
* "to" encoding is tested.
*/
- void _EXFNPTR(get_state, (void *data,
+ void (*get_state) (void *data,
mbstate_t *state,
- int direction));
+ int direction);
/*
* set_state - set shift state.
@@ -154,9 +154,9 @@ typedef struct
* "to" encoding is set.
* Returns 0 if '*state' object has right format, -1 else.
*/
- int _EXFNPTR(set_state, (void *data,
+ int (*set_state) (void *data,
mbstate_t *state,
- int direction));
+ int direction);
/*
* get_mb_cur_max - get maximum character length in bytes.
@@ -170,8 +170,8 @@ typedef struct
* If 'direction' is 0, "from" encoding is tested, else
* "to" encoding is tested.
*/
- int _EXFNPTR(get_mb_cur_max, (void *data,
- int direction));
+ int (*get_mb_cur_max) (void *data,
+ int direction);
/*
* is_stateful - is encoding stateful or stateless.
@@ -185,8 +185,8 @@ typedef struct
* If 'direction' is 0, "from" encoding is tested, else
* "to" encoding is tested.
*/
- int _EXFNPTR(is_stateful, (void *data,
- int direction));
+ int (*is_stateful) (void *data,
+ int direction);
} iconv_conversion_handlers_t;
diff --git a/newlib/libc/iconv/lib/ucsconv.h b/newlib/libc/iconv/lib/ucsconv.h
index 391daed35..2c3d8c647 100644
--- a/newlib/libc/iconv/lib/ucsconv.h
+++ b/newlib/libc/iconv/lib/ucsconv.h
@@ -68,8 +68,8 @@ typedef struct
* Returns CES-specific data pointer if success. In case of error returns
* NULL and sets current thread's/process's errno.
*/
- void *_EXFNPTR(init, (struct _reent *rptr,
- const char *encoding));
+ void *(*init) (struct _reent *rptr,
+ const char *encoding);
/*
* close - close CES converter.
@@ -84,8 +84,8 @@ typedef struct
* Returns (size_t)0 if success. In case of error returns (size_t)-1 and
* sets current thread's/process's errno.
*/
- size_t _EXFNPTR(close, (struct _reent *rptr,
- void *data));
+ size_t (*close) (struct _reent *rptr,
+ void *data);
/*
* get_mb_cur_max - get maximum character length in bytes.
@@ -96,7 +96,7 @@ typedef struct
* DESCRIPTION:
* Returns encoding's maximum character length.
*/
- int _EXFNPTR(get_mb_cur_max, (void *data));
+ int (*get_mb_cur_max) (void *data);
/*
* get_state - get current shift state.
@@ -108,8 +108,8 @@ typedef struct
* DESCRIPTION:
* Returns encoding's current shift sequence.
*/
- void _EXFNPTR(get_state, (void *data,
- mbstate_t *state));
+ void (*get_state) (void *data,
+ mbstate_t *state);
/*
* set_state - set shift state.
@@ -123,8 +123,8 @@ typedef struct
* object is zero-object - reset current shift state.
* Returns 0 if '*state' object has right format, -1 else.
*/
- int _EXFNPTR(set_state, (void *data,
- mbstate_t *state));
+ int (*set_state) (void *data,
+ mbstate_t *state);
/*
* is_stateful - is encoding stateful state.
@@ -135,7 +135,7 @@ typedef struct
* DESCRIPTION:
* Returns 0 if encoding is stateless, else returns 1.
*/
- int _EXFNPTR(is_stateful, (void *data));
+ int (*is_stateful) (void *data);
/*
* convert_to_ucs - convert character to UCS.
@@ -155,9 +155,9 @@ typedef struct
* returns ICONV_CES_INVALID_CHARACTER. If invalid or incomplete bytes
* sequence was met, returns ICONV_CES_BAD_SEQUENCE.
*/
- ucs4_t _EXFNPTR(convert_to_ucs, (void *data,
+ ucs4_t (*convert_to_ucs) (void *data,
const unsigned char **inbuf,
- size_t *inbytesleft));
+ size_t *inbytesleft);
} iconv_to_ucs_ces_handlers_t;
@@ -172,26 +172,26 @@ typedef struct
typedef struct
{
/* Same as in iconv_to_ucs_ces_handlers_t */
- void *_EXFNPTR(init, (struct _reent *rptr,
- const char *encoding));
+ void *(*init) (struct _reent *rptr,
+ const char *encoding);
/* Same as in iconv_to_ucs_ces_handlers_t */
- size_t _EXFNPTR(close, (struct _reent *rptr,
- void *data));
+ size_t (*close) (struct _reent *rptr,
+ void *data);
/* Same as in iconv_to_ucs_ces_handlers_t */
- int _EXFNPTR(get_mb_cur_max, (void *data));
+ int (*get_mb_cur_max) (void *data);
/* Same as in iconv_to_ucs_ces_handlers_t */
- void _EXFNPTR(get_state, (void *data,
- mbstate_t *state));
+ void (*get_state) (void *data,
+ mbstate_t *state);
/* Same as in iconv_to_ucs_ces_handlers_t */
- int _EXFNPTR(set_state, (void *data,
- mbstate_t *state));
+ int (*set_state) (void *data,
+ mbstate_t *state);
/* Same as in iconv_to_ucs_ces_handlers_t */
- int _EXFNPTR(is_stateful, (void *data));
+ int (*is_stateful) (void *data);
/*
* convert_from_ucs - convert UCS character to destination encoding.
@@ -215,10 +215,10 @@ typedef struct
* If there is no corresponding character in destination encoding, returns
* ICONV_CES_INVALID_CHARACTER.
*/
- size_t _EXFNPTR(convert_from_ucs, (void *data,
+ size_t (*convert_from_ucs) (void *data,
ucs4_t in,
unsigned char **outbuf,
- size_t *outbytesleft));
+ size_t *outbytesleft);
} iconv_from_ucs_ces_handlers_t;
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index 951617520..3e2490088 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -50,13 +50,9 @@
#ifdef __CYGWIN__
#define _EXFUN_NOTHROW(name, proto) __cdecl name proto _NOTHROW
#define _EXFUN(name, proto) __cdecl name proto
-#define _EXPARM(name, proto) (* __cdecl name) proto
-#define _EXFNPTR(name, proto) (__cdecl * name) proto
#else
#define _EXFUN_NOTHROW(name, proto) name proto _NOTHROW
#define _EXFUN(name, proto) name proto
-#define _EXPARM(name, proto) (* name) proto
-#define _EXFNPTR(name, proto) (* name) proto
#endif
#ifndef _LONG_DOUBLE
#define _LONG_DOUBLE long double
diff --git a/newlib/libc/include/rpc/xdr.h b/newlib/libc/include/rpc/xdr.h
index 40ddc1cdd..bda8e9926 100644
--- a/newlib/libc/include/rpc/xdr.h
+++ b/newlib/libc/include/rpc/xdr.h
@@ -111,34 +111,34 @@ typedef struct __rpc_xdr
const struct xdr_ops
{
/* get a long from underlying stream */
- bool_t _EXFNPTR (x_getlong, (struct __rpc_xdr *, long *));
+ bool_t (*x_getlong) (struct __rpc_xdr *, long *);
/* put a long to " */
- bool_t _EXFNPTR (x_putlong, (struct __rpc_xdr *, const long *));
+ bool_t (*x_putlong) (struct __rpc_xdr *, const long *);
/* get some bytes from " */
- bool_t _EXFNPTR (x_getbytes, (struct __rpc_xdr *, char *, u_int));
+ bool_t (*x_getbytes) (struct __rpc_xdr *, char *, u_int);
/* put some bytes to " */
- bool_t _EXFNPTR (x_putbytes, (struct __rpc_xdr *, const char *, u_int));
+ bool_t (*x_putbytes) (struct __rpc_xdr *, const char *, u_int);
/* returns bytes off from beginning */
- u_int _EXFNPTR (x_getpostn, (struct __rpc_xdr *));
+ u_int (*x_getpostn) (struct __rpc_xdr *);
/* lets you reposition the stream */
- bool_t _EXFNPTR (x_setpostn, (struct __rpc_xdr *, u_int));
+ bool_t (*x_setpostn) (struct __rpc_xdr *, u_int);
/* buf quick ptr to buffered data */
- int32_t * _EXFNPTR (x_inline, (struct __rpc_xdr *, u_int));
+ int32_t * (*x_inline) (struct __rpc_xdr *, u_int);
/* free privates of this xdr_stream */
- void _EXFNPTR (x_destroy, (struct __rpc_xdr *));
+ void (*x_destroy) (struct __rpc_xdr *);
/* get an int32 from this xdr_stream */
- bool_t _EXFNPTR (x_getint32, (struct __rpc_xdr *, int32_t *));
+ bool_t (*x_getint32) (struct __rpc_xdr *, int32_t *);
/* put an int32 to the underlying stream */
- bool_t _EXFNPTR (x_putint32, (struct __rpc_xdr *, const int32_t *));
+ bool_t (*x_putint32) (struct __rpc_xdr *, const int32_t *);
} *x_ops;
char *x_public; /* users' data */
@@ -156,7 +156,7 @@ typedef struct __rpc_xdr
* allocate dynamic storage of the appropriate size and return it.
* bool_t (*xdrproc_t)(XDR *, some_type *)
*/
-typedef bool_t _EXFNPTR(xdrproc_t, (XDR *, ...));
+typedef bool_t (*xdrproc_t) (XDR *, ...);
/*
* Operations defined on a XDR handle
@@ -366,8 +366,8 @@ extern void _EXFUN (xdrstdio_create, (XDR *, FILE *, enum xdr_op));
/* XDR pseudo records for tcp */
extern void _EXFUN (xdrrec_create, (XDR *, u_int, u_int, void *,
- int _EXPARM (, (void *, void *, int)),
- int _EXPARM (, (void *, void *, int))));
+ int (*) (void *, void *, int),
+ int (*) (void *, void *, int)));
/* make end of xdr record */
extern bool_t _EXFUN (xdrrec_endofrecord, (XDR *, bool_t));
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index cfb79edd3..54fdf96f1 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -194,13 +194,13 @@ struct __sFILE {
/* operations */
void * _cookie; /* cookie passed to io functions */
- _READ_WRITE_RETURN_TYPE _EXFNPTR(_read, (struct _reent *, void *,
- char *, _READ_WRITE_BUFSIZE_TYPE));
- _READ_WRITE_RETURN_TYPE _EXFNPTR(_write, (struct _reent *, void *,
+ _READ_WRITE_RETURN_TYPE (*_read) (struct _reent *, void *,
+ char *, _READ_WRITE_BUFSIZE_TYPE);
+ _READ_WRITE_RETURN_TYPE (*_write) (struct _reent *, void *,
const char *,
- _READ_WRITE_BUFSIZE_TYPE));
- _fpos_t _EXFNPTR(_seek, (struct _reent *, void *, _fpos_t, int));
- int _EXFNPTR(_close, (struct _reent *, void *));
+ _READ_WRITE_BUFSIZE_TYPE);
+ _fpos_t (*_seek) (struct _reent *, void *, _fpos_t, int);
+ int (*_close) (struct _reent *, void *);
/* separate buffer for long sequences of ungetc() */
struct __sbuf _ub; /* ungetc buffer */
@@ -250,13 +250,13 @@ struct __sFILE64 {
/* operations */
void * _cookie; /* cookie passed to io functions */
- _READ_WRITE_RETURN_TYPE _EXFNPTR(_read, (struct _reent *, void *,
- char *, _READ_WRITE_BUFSIZE_TYPE));
- _READ_WRITE_RETURN_TYPE _EXFNPTR(_write, (struct _reent *, void *,
+ _READ_WRITE_RETURN_TYPE (*_read) (struct _reent *, void *,
+ char *, _READ_WRITE_BUFSIZE_TYPE);
+ _READ_WRITE_RETURN_TYPE (*_write) (struct _reent *, void *,
const char *,
- _READ_WRITE_BUFSIZE_TYPE));
- _fpos_t _EXFNPTR(_seek, (struct _reent *, void *, _fpos_t, int));
- int _EXFNPTR(_close, (struct _reent *, void *));
+ _READ_WRITE_BUFSIZE_TYPE);
+ _fpos_t (*_seek) (struct _reent *, void *, _fpos_t, int);
+ int (*_close) (struct _reent *, void *);
/* separate buffer for long sequences of ungetc() */
struct __sbuf _ub; /* ungetc buffer */
@@ -275,7 +275,7 @@ struct __sFILE64 {
int _flags2; /* for future use */
_off64_t _offset; /* current lseek offset */
- _fpos64_t _EXFNPTR(_seek64, (struct _reent *, void *, _fpos64_t, int));
+ _fpos64_t (*_seek64) (struct _reent *, void *, _fpos64_t, int);
#ifndef __SINGLE_THREAD__
_flock_t _lock; /* for thread-safety locking */
@@ -391,7 +391,7 @@ struct _reent
struct _mprec *_mp;
- void _EXFNPTR(__cleanup, (struct _reent *));
+ void (*__cleanup) (struct _reent *);
int _gamma_signgam;
@@ -584,7 +584,7 @@ struct _reent
int __sdidinit; /* 1 means stdio has been init'd */
- void _EXFNPTR(__cleanup, (struct _reent *));
+ void (*__cleanup) (struct _reent *);
/* used by mprec routines */
struct _Bigint *_result;
diff --git a/newlib/libc/search/bsearch.c b/newlib/libc/search/bsearch.c
index 2f1dc9d77..29b787425 100644
--- a/newlib/libc/search/bsearch.c
+++ b/newlib/libc/search/bsearch.c
@@ -60,7 +60,7 @@ bsearch (const void *key,
const void *base,
size_t nmemb,
size_t size,
- int _EXFNPTR(compar, (const void *, const void *)))
+ int (*compar) (const void *, const void *))
{
void *current;
size_t lower = 0;
diff --git a/newlib/libc/stdio/fseeko.c b/newlib/libc/stdio/fseeko.c
index 7ca86161c..3e0f9e90b 100644
--- a/newlib/libc/stdio/fseeko.c
+++ b/newlib/libc/stdio/fseeko.c
@@ -98,7 +98,7 @@ _fseeko_r (struct _reent *ptr,
_off_t offset,
int whence)
{
- _fpos_t _EXFNPTR(seekfn, (struct _reent *, void *, _fpos_t, int));
+ _fpos_t (*seekfn) (struct _reent *, void *, _fpos_t, int);
_fpos_t target;
_fpos_t curoff = 0;
size_t n;
diff --git a/newlib/libc/stdio64/fseeko64.c b/newlib/libc/stdio64/fseeko64.c
index 085855d4b..0672086a3 100644
--- a/newlib/libc/stdio64/fseeko64.c
+++ b/newlib/libc/stdio64/fseeko64.c
@@ -90,7 +90,7 @@ _fseeko64_r (struct _reent *ptr,
_off64_t offset,
int whence)
{
- _fpos64_t _EXFNPTR(seekfn, (struct _reent *, void *, _fpos64_t, int));
+ _fpos64_t (*seekfn) (struct _reent *, void *, _fpos64_t, int);
_fpos64_t target, curoff;
size_t n;
diff --git a/newlib/libc/stdlib/atexit.c b/newlib/libc/stdlib/atexit.c
index 1d300bd0f..63617f821 100644
--- a/newlib/libc/stdlib/atexit.c
+++ b/newlib/libc/stdlib/atexit.c
@@ -53,7 +53,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
*/
int
-atexit (void _EXFNPTR(fn, (void)))
+atexit (void (*fn) (void))
{
return __register_exitproc (__et_atexit, fn, NULL, NULL);
}
diff --git a/newlib/libc/stdlib/on_exit.c b/newlib/libc/stdlib/on_exit.c
index ce6bac68e..2eaf03564 100644
--- a/newlib/libc/stdlib/on_exit.c
+++ b/newlib/libc/stdlib/on_exit.c
@@ -66,7 +66,7 @@ const void * const __on_exit_dummy = &__on_exit_args;
*/
int
-on_exit (void _EXFNPTR(fn, (int, void *)),
+on_exit (void (*fn) (int, void *),
void *arg)
{
return __register_exitproc (__et_onexit, (void (*)(void)) fn, arg, NULL);
diff --git a/newlib/libc/xdr/xdr_private.h b/newlib/libc/xdr/xdr_private.h
index 2b4581866..3b071d668 100644
--- a/newlib/libc/xdr/xdr_private.h
+++ b/newlib/libc/xdr/xdr_private.h
@@ -41,7 +41,7 @@
extern "C" {
#endif
-typedef void _EXFNPTR (xdr_vprintf_t, (const char *, va_list));
+typedef void (*xdr_vprintf_t) (const char *, va_list);
xdr_vprintf_t _EXFUN (xdr_set_vprintf, (xdr_vprintf_t));
diff --git a/newlib/libc/xdr/xdr_rec.c b/newlib/libc/xdr/xdr_rec.c
index f46a9a3fa..9051d522f 100644
--- a/newlib/libc/xdr/xdr_rec.c
+++ b/newlib/libc/xdr/xdr_rec.c
@@ -173,8 +173,8 @@ xdrrec_create (XDR * xdrs,
u_int sendsize,
u_int recvsize,
void *tcp_handle,
- int _EXPARM (readit, (void *, void *, int)),
- int _EXPARM (writeit, (void *, void *, int)))
+ int (*readit) (void *, void *, int),
+ int (*writeit) (void *, void *, int))
{
RECSTREAM *rstrm;
/* Although sendsize and recvsize are u_int, we require
diff --git a/newlib/libc/xdr/xdr_sizeof.c b/newlib/libc/xdr/xdr_sizeof.c
index bf02cf5e7..e086d30e7 100644
--- a/newlib/libc/xdr/xdr_sizeof.c
+++ b/newlib/libc/xdr/xdr_sizeof.c
@@ -142,9 +142,9 @@ xdr_sizeof (xdrproc_t func,
struct xdr_ops ops;
bool_t stat;
/* to stop ANSI-C compiler from complaining */
- typedef bool_t _EXFNPTR (dummyfunc1, (XDR *, long *));
- typedef bool_t _EXFNPTR (dummyfunc2, (XDR *, caddr_t, u_int));
- typedef bool_t _EXFNPTR (dummyfunc3, (XDR *, int32_t *));
+ typedef bool_t (*dummyfunc1) (XDR *, long *);
+ typedef bool_t (*dummyfunc2) (XDR *, caddr_t, u_int);
+ typedef bool_t (*dummyfunc3) (XDR *, int32_t *);
ops.x_putlong = x_putlong;
ops.x_putbytes = x_putbytes;
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 06/17] ansification: remove _VOID_PTR
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
` (6 preceding siblings ...)
2017-12-07 18:20 ` [PATCH v2 02/17] ansification: remove _CONST Yaakov Selkowitz
@ 2017-12-07 18:20 ` Yaakov Selkowitz
2017-12-07 18:26 ` [PATCH v2 09/17] ansification: remove _DEFUN_VOID Yaakov Selkowitz
` (9 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:20 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
newlib/libc/iconv/ces/euc.c | 24 +++++++++---------
newlib/libc/iconv/ces/table-pcs.c | 16 ++++++------
newlib/libc/iconv/ces/table.c | 40 ++++++++++++++---------------
newlib/libc/iconv/ces/ucs-2-internal.c | 6 ++---
newlib/libc/iconv/ces/ucs-2.c | 14 +++++------
newlib/libc/iconv/ces/ucs-4-internal.c | 6 ++---
newlib/libc/iconv/ces/ucs-4.c | 14 +++++------
newlib/libc/iconv/ces/us-ascii.c | 6 ++---
newlib/libc/iconv/ces/utf-16.c | 20 +++++++--------
newlib/libc/iconv/ces/utf-8.c | 6 ++---
newlib/libc/iconv/lib/aliasesi.c | 2 +-
newlib/libc/iconv/lib/conv.h | 28 ++++++++++-----------
newlib/libc/iconv/lib/iconv.c | 18 ++++++-------
newlib/libc/iconv/lib/iconvnls.c | 6 ++---
newlib/libc/iconv/lib/local.h | 3 ---
newlib/libc/iconv/lib/nullconv.c | 16 ++++++------
newlib/libc/iconv/lib/ucsconv.c | 22 ++++++++--------
newlib/libc/iconv/lib/ucsconv.h | 46 +++++++++++++++++-----------------
18 files changed, 145 insertions(+), 148 deletions(-)
diff --git a/newlib/libc/iconv/ces/euc.c b/newlib/libc/iconv/ces/euc.c
index ab309a585..fb0a50e90 100644
--- a/newlib/libc/iconv/ces/euc.c
+++ b/newlib/libc/iconv/ces/euc.c
@@ -62,7 +62,7 @@ typedef struct
int mb_cur_max;
euc_cs_desc_t *desc;
- _VOID_PTR data[MAX_CS_NUM];
+ void *data[MAX_CS_NUM];
} euc_data_t;
#if defined (_ICONV_TO_ENCODING_EUC_JP) \
@@ -100,7 +100,7 @@ static euc_cs_desc_t euc_kr_cs_desc [] =
#endif
#if defined (ICONV_FROM_UCS_CES_EUC)
-static _VOID_PTR
+static void *
_DEFUN(euc_from_ucs_init, (rptr, encoding),
struct _reent *rptr,
const char *encoding)
@@ -160,14 +160,14 @@ error:
_iconv_from_ucs_ces_handlers_table.close (rptr, data);
return NULL;
error1:
- _free_r (rptr, (_VOID_PTR)data);
+ _free_r (rptr, (void *)data);
return NULL;
}
static size_t
_DEFUN(euc_from_ucs_close, (rptr, data),
struct _reent *rptr,
- _VOID_PTR data)
+ void *data)
{
int i;
size_t res = 0;
@@ -186,7 +186,7 @@ _DEFUN(euc_from_ucs_close, (rptr, data),
static size_t
_DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data,
+ void *data,
register ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -260,7 +260,7 @@ _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
#endif /* ICONV_FROM_UCS_CES_EUC */
#if defined (ICONV_TO_UCS_CES_EUC)
-static _VOID_PTR
+static void *
_DEFUN(euc_to_ucs_init, (rptr, encoding),
struct _reent *rptr,
const char *encoding)
@@ -320,14 +320,14 @@ error:
_iconv_to_ucs_ces_handlers_table.close (rptr, data);
return NULL;
error1:
- _free_r (rptr, (_VOID_PTR)data);
+ _free_r (rptr, (void *)data);
return NULL;
}
static size_t
_DEFUN(euc_to_ucs_close, (rptr, data),
struct _reent *rptr,
- _VOID_PTR data)
+ void *data)
{
int i;
size_t res = 0;
@@ -346,7 +346,7 @@ _DEFUN(euc_to_ucs_close, (rptr, data),
static ucs4_t
_DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data,
+ void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -366,8 +366,8 @@ _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
for (i = 1; d->desc[i].csname != NULL; i++)
{
- if (memcmp((const _VOID_PTR)(*inbuf),
- (const _VOID_PTR)d->desc[i].prefix,
+ if (memcmp((const void *)(*inbuf),
+ (const void *)d->desc[i].prefix,
d->desc[i].prefixbytes) == 0)
{
if (((int)*inbytesleft - d->desc[i].prefixbytes - d->desc[i].bytes) < 0)
@@ -433,7 +433,7 @@ _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
static int
_DEFUN(euc_get_mb_cur_max, (data),
- _VOID_PTR data)
+ void *data)
{
return ((euc_data_t *)data)->mb_cur_max;
}
diff --git a/newlib/libc/iconv/ces/table-pcs.c b/newlib/libc/iconv/ces/table-pcs.c
index 1bab90986..77b820bae 100644
--- a/newlib/libc/iconv/ces/table-pcs.c
+++ b/newlib/libc/iconv/ces/table-pcs.c
@@ -41,7 +41,7 @@
#if defined (ICONV_FROM_UCS_CES_TABLE_PCS)
static size_t
_DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data,
+ void *data,
ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -64,7 +64,7 @@ _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
outbytesleft);
}
-static _VOID_PTR
+static void *
_DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
struct _reent *rptr,
const char *encoding)
@@ -75,14 +75,14 @@ _DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
static size_t
_DEFUN(table_pcs_from_ucs_close, (rptr, data),
struct _reent *rptr,
- _VOID_PTR data)
+ void *data)
{
return _iconv_from_ucs_ces_handlers_table.close (rptr, data);
}
static int
_DEFUN(table_pcs_from_ucs_get_mb_cur_max, (data),
- _VOID_PTR data)
+ void *data)
{
return _iconv_from_ucs_ces_handlers_table.get_mb_cur_max (data);
}
@@ -92,7 +92,7 @@ _DEFUN(table_pcs_from_ucs_get_mb_cur_max, (data),
#if defined (ICONV_TO_UCS_CES_TABLE_PCS)
static ucs4_t
_DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data,
+ void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -112,7 +112,7 @@ _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
inbytesleft);
}
-static _VOID_PTR
+static void *
_DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
struct _reent *rptr,
const char *encoding)
@@ -123,14 +123,14 @@ _DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
static size_t
_DEFUN(table_pcs_to_ucs_close, (rptr, data),
struct _reent *rptr,
- _VOID_PTR data)
+ void *data)
{
return _iconv_to_ucs_ces_handlers_table.close (rptr, data);
}
static int
_DEFUN(table_pcs_to_ucs_get_mb_cur_max, (data),
- _VOID_PTR data)
+ void *data)
{
return _iconv_to_ucs_ces_handlers_table.get_mb_cur_max (data);
}
diff --git a/newlib/libc/iconv/ces/table.c b/newlib/libc/iconv/ces/table.c
index c02831a5b..969c0944b 100644
--- a/newlib/libc/iconv/ces/table.c
+++ b/newlib/libc/iconv/ces/table.c
@@ -76,19 +76,19 @@ _EXFUN(load_file, (struct _reent *rptr, const char *name, int direction));
static size_t
_DEFUN(table_close, (rptr, data),
struct _reent *rptr,
- _VOID_PTR data)
+ void *data)
{
const iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
if (ccsp->type == TABLE_EXTERNAL)
- _free_r (rptr, (_VOID_PTR)ccsp->tbl);
+ _free_r (rptr, (void *)ccsp->tbl);
- _free_r( rptr, (_VOID_PTR)ccsp);
+ _free_r( rptr, (void *)ccsp);
return 0;
}
#if defined (ICONV_FROM_UCS_CES_TABLE)
-static _VOID_PTR
+static void *
_DEFUN(table_init_from_ucs, (rptr, encoding),
struct _reent *rptr,
const char *encoding)
@@ -116,11 +116,11 @@ _DEFUN(table_init_from_ucs, (rptr, encoding),
ccsp->optimization = biccsp->from_ucs_type;
ccsp->tbl = biccsp->from_ucs;
- return (_VOID_PTR)ccsp;
+ return (void *)ccsp;
}
#ifdef _ICONV_ENABLE_EXTERNAL_CCS
- return (_VOID_PTR)load_file (rptr, encoding, 1);
+ return (void *)load_file (rptr, encoding, 1);
#else
return NULL;
#endif
@@ -128,7 +128,7 @@ _DEFUN(table_init_from_ucs, (rptr, encoding),
static size_t
_DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data,
+ void *data,
ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -171,7 +171,7 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
#endif /* ICONV_FROM_UCS_CES_TABLE */
#if defined (ICONV_TO_UCS_CES_TABLE)
-static _VOID_PTR
+static void *
_DEFUN(table_init_to_ucs, (rptr, encoding),
struct _reent *rptr,
const char *encoding)
@@ -199,11 +199,11 @@ _DEFUN(table_init_to_ucs, (rptr, encoding),
ccsp->optimization = biccsp->to_ucs_type;
ccsp->tbl = biccsp->to_ucs;
- return (_VOID_PTR)ccsp;
+ return (void *)ccsp;
}
#ifdef _ICONV_ENABLE_EXTERNAL_CCS
- return (_VOID_PTR)load_file (rptr, encoding, 0);
+ return (void *)load_file (rptr, encoding, 0);
#else
return NULL;
#endif
@@ -211,7 +211,7 @@ _DEFUN(table_init_to_ucs, (rptr, encoding),
static ucs4_t
_DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data,
+ void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -254,7 +254,7 @@ _DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
static int
_DEFUN(table_get_mb_cur_max, (data),
- _VOID_PTR data)
+ void *data)
{
return ((iconv_ccs_desc_t *)data)->bits/8;
}
@@ -490,7 +490,7 @@ _DEFUN(load_file, (rptr, name, direction),
if ((buf = (const unsigned char *)_malloc_r (rptr, hdrlen)) == NULL)
goto error2;
- if (_read_r (rptr, fd, (_VOID_PTR)buf, hdrlen) != hdrlen)
+ if (_read_r (rptr, fd, (void *)buf, hdrlen) != hdrlen)
goto error3;
if (_16BIT_ELT (EXTTABLE_VERSION_OFF) != TABLE_VERSION_1
@@ -559,33 +559,33 @@ _DEFUN(load_file, (rptr, name, direction),
goto error4;
if (_lseek_r (rptr, fd, off, SEEK_SET) == (off_t)-1
- || _read_r (rptr, fd, (_VOID_PTR)ccsp->tbl, tbllen) != tbllen)
+ || _read_r (rptr, fd, (void *)ccsp->tbl, tbllen) != tbllen)
goto error5;
goto normal_exit;
error5:
- _free_r (rptr, (_VOID_PTR)ccsp->tbl);
+ _free_r (rptr, (void *)ccsp->tbl);
ccsp->tbl = NULL;
error4:
- _free_r (rptr, (_VOID_PTR)ccsp);
+ _free_r (rptr, (void *)ccsp);
ccsp = NULL;
error3:
normal_exit:
- _free_r (rptr, (_VOID_PTR)buf);
+ _free_r (rptr, (void *)buf);
error2:
if (_close_r (rptr, fd) == -1)
{
if (ccsp != NULL)
{
if (ccsp->tbl != NULL)
- _free_r (rptr, (_VOID_PTR)ccsp->tbl);
- _free_r (rptr, (_VOID_PTR)ccsp);
+ _free_r (rptr, (void *)ccsp->tbl);
+ _free_r (rptr, (void *)ccsp);
}
ccsp = NULL;
}
error1:
- _free_r (rptr, (_VOID_PTR)fname);
+ _free_r (rptr, (void *)fname);
return ccsp;
}
#endif
diff --git a/newlib/libc/iconv/ces/ucs-2-internal.c b/newlib/libc/iconv/ces/ucs-2-internal.c
index 7aed01e88..2c9169473 100644
--- a/newlib/libc/iconv/ces/ucs-2-internal.c
+++ b/newlib/libc/iconv/ces/ucs-2-internal.c
@@ -45,7 +45,7 @@
#if defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
static size_t
_DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data,
+ void *data,
register ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -67,7 +67,7 @@ _DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL)
static ucs4_t
_DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data,
+ void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -90,7 +90,7 @@ _DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft),
static int
_DEFUN(ucs_2_internal_get_mb_cur_max, (data),
- _VOID_PTR data)
+ void *data)
{
return 2;
}
diff --git a/newlib/libc/iconv/ces/ucs-2.c b/newlib/libc/iconv/ces/ucs-2.c
index 7d03ee890..a99562eec 100644
--- a/newlib/libc/iconv/ces/ucs-2.c
+++ b/newlib/libc/iconv/ces/ucs-2.c
@@ -49,7 +49,7 @@
#define UCS_2BE "ucs_2be"
#define UCS_2LE "ucs_2le"
-static _VOID_PTR
+static void *
_DEFUN(ucs_2_init, (rptr, encoding),
struct _reent *rptr,
const char *encoding)
@@ -57,20 +57,20 @@ _DEFUN(ucs_2_init, (rptr, encoding),
int *data;
if ((data = (int *) _malloc_r(rptr, sizeof (int))) == NULL)
- return (_VOID_PTR)NULL;
+ return (void *)NULL;
if (strcmp (encoding, UCS_2LE) == 0)
*data = UCS_2_LITTLE_ENDIAN;
else
*data = UCS_2_BIG_ENDIAN;
- return (_VOID_PTR)data;
+ return (void *)data;
}
static size_t
_DEFUN(ucs_2_close, (rptr, data),
struct _reent *rptr,
- _VOID_PTR data)
+ void *data)
{
_free_r (rptr, data);
return 0;
@@ -79,7 +79,7 @@ _DEFUN(ucs_2_close, (rptr, data),
#if defined (ICONV_FROM_UCS_CES_UCS_2)
static size_t
_DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data,
+ void *data,
ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -106,7 +106,7 @@ _DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UCS_2)
static ucs4_t
_DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data,
+ void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -133,7 +133,7 @@ _DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft),
static int
_DEFUN(ucs_2_get_mb_cur_max, (data),
- _VOID_PTR data)
+ void *data)
{
return 2;
}
diff --git a/newlib/libc/iconv/ces/ucs-4-internal.c b/newlib/libc/iconv/ces/ucs-4-internal.c
index 1df5f3fc6..a5c6d7e09 100644
--- a/newlib/libc/iconv/ces/ucs-4-internal.c
+++ b/newlib/libc/iconv/ces/ucs-4-internal.c
@@ -45,7 +45,7 @@
#if defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
static size_t
_DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data,
+ void *data,
register ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -67,7 +67,7 @@ _DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL)
static ucs4_t
_DEFUN(ucs_4_internal_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data,
+ void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -90,7 +90,7 @@ _DEFUN(ucs_4_internal_convert_to_ucs, (data, inbuf, inbytesleft),
static int
_DEFUN(ucs_4_internal_get_mb_cur_max, (data),
- _VOID_PTR data)
+ void *data)
{
return 2;
}
diff --git a/newlib/libc/iconv/ces/ucs-4.c b/newlib/libc/iconv/ces/ucs-4.c
index 8fbfa6aa1..0009981fe 100644
--- a/newlib/libc/iconv/ces/ucs-4.c
+++ b/newlib/libc/iconv/ces/ucs-4.c
@@ -50,7 +50,7 @@
#define UCS_4BE "ucs_4be"
#define UCS_4LE "ucs_4le"
-static _VOID_PTR
+static void *
_DEFUN(ucs_4_init, (rptr, encoding),
struct _reent *rptr,
const char *encoding)
@@ -58,20 +58,20 @@ _DEFUN(ucs_4_init, (rptr, encoding),
int *data;
if ((data = (int *)_malloc_r (rptr, sizeof(int))) == NULL)
- return (_VOID_PTR)NULL;
+ return (void *)NULL;
if (strcmp (encoding, UCS_4LE) == 0)
*data = UCS_4_LITTLE_ENDIAN;
else
*data = UCS_4_BIG_ENDIAN;
- return (_VOID_PTR)data;
+ return (void *)data;
}
static size_t
_DEFUN(ucs_4_close, (rptr, data),
struct _reent *rptr,
- _VOID_PTR data)
+ void *data)
{
_free_r(rptr, data);
return 0;
@@ -81,7 +81,7 @@ _DEFUN(ucs_4_close, (rptr, data),
#if defined (ICONV_FROM_UCS_CES_UCS_4)
static size_t
_DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data,
+ void *data,
ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -108,7 +108,7 @@ _DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UCS_4)
static ucs4_t
_DEFUN(ucs_4_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data,
+ void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -135,7 +135,7 @@ _DEFUN(ucs_4_convert_to_ucs, (data, inbuf, inbytesleft),
static int
_DEFUN(ucs_4_get_mb_cur_max, (data),
- _VOID_PTR data)
+ void *data)
{
return 4;
}
diff --git a/newlib/libc/iconv/ces/us-ascii.c b/newlib/libc/iconv/ces/us-ascii.c
index 1fc7c5d89..e6a665070 100644
--- a/newlib/libc/iconv/ces/us-ascii.c
+++ b/newlib/libc/iconv/ces/us-ascii.c
@@ -41,7 +41,7 @@
#if defined (ICONV_FROM_UCS_CES_US_ASCII)
static size_t
_DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data,
+ void *data,
ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -61,7 +61,7 @@ _DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_US_ASCII)
static ucs4_t
_DEFUN(us_ascii_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data,
+ void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -84,7 +84,7 @@ _DEFUN(us_ascii_convert_to_ucs, (data, inbuf, inbytesleft),
static int
_DEFUN(us_ascii_get_mb_cur_max, (data),
- _VOID_PTR data)
+ void *data)
{
return 2;
}
diff --git a/newlib/libc/iconv/ces/utf-16.c b/newlib/libc/iconv/ces/utf-16.c
index fee97b0ee..dd62a5dea 100644
--- a/newlib/libc/iconv/ces/utf-16.c
+++ b/newlib/libc/iconv/ces/utf-16.c
@@ -60,14 +60,14 @@
static size_t
_DEFUN(utf_16_close, (rptr, data),
struct _reent *rptr,
- _VOID_PTR data)
+ void *data)
{
_free_r(rptr, data);
return 0;
}
#if defined (ICONV_FROM_UCS_CES_UTF_16)
-static _VOID_PTR
+static void *
_DEFUN(utf_16_init_from_ucs, (rptr, encoding),
struct _reent *rptr,
const char *encoding)
@@ -75,7 +75,7 @@ _DEFUN(utf_16_init_from_ucs, (rptr, encoding),
int *data;
if ((data = (int *)_malloc_r (rptr, sizeof (int))) == NULL)
- return (_VOID_PTR)NULL;
+ return (void *)NULL;
if (strcmp (encoding, UTF_16LE) == 0)
*data = UTF16_LITTLE_ENDIAN;
@@ -84,12 +84,12 @@ _DEFUN(utf_16_init_from_ucs, (rptr, encoding),
else
*data = UTF16_SYSTEM_ENDIAN;
- return (_VOID_PTR)data;
+ return (void *)data;
}
static size_t
_DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data,
+ void *data,
register ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -169,7 +169,7 @@ _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
#endif /* ICONV_FROM_UCS_CES_UTF_16 */
#if defined (ICONV_TO_UCS_CES_UTF_16)
-static _VOID_PTR
+static void *
_DEFUN(utf_16_init_to_ucs, (rptr, encoding),
struct _reent *rptr,
const char *encoding)
@@ -177,7 +177,7 @@ _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
int *data;
if ((data = (int *)_malloc_r (rptr, sizeof (int))) == NULL)
- return (_VOID_PTR)NULL;
+ return (void *)NULL;
if (strcmp (encoding, UTF_16BE) == 0)
*data = UTF16_BIG_ENDIAN;
@@ -186,12 +186,12 @@ _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
else
*data = UTF16_UNDEFINED;
- return (_VOID_PTR)data;
+ return (void *)data;
}
static ucs4_t
_DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data,
+ void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -269,7 +269,7 @@ _DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
static int
_DEFUN(utf_16_get_mb_cur_max, (data),
- _VOID_PTR data)
+ void *data)
{
return 6;
}
diff --git a/newlib/libc/iconv/ces/utf-8.c b/newlib/libc/iconv/ces/utf-8.c
index ae778d12d..5559272d7 100644
--- a/newlib/libc/iconv/ces/utf-8.c
+++ b/newlib/libc/iconv/ces/utf-8.c
@@ -44,7 +44,7 @@
#if defined (ICONV_FROM_UCS_CES_UTF_8)
static size_t
_DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data,
+ void *data,
register ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -126,7 +126,7 @@ _DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UTF_8)
static ucs4_t
_DEFUN(convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data,
+ void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -260,7 +260,7 @@ _DEFUN(convert_to_ucs, (data, inbuf, inbytesleft),
static int
_DEFUN(get_mb_cur_max, (data),
- _VOID_PTR data)
+ void *data)
{
return UTF8_MB_CUR_MAX;
}
diff --git a/newlib/libc/iconv/lib/aliasesi.c b/newlib/libc/iconv/lib/aliasesi.c
index 1f4f70ffc..7c932e65c 100644
--- a/newlib/libc/iconv/lib/aliasesi.c
+++ b/newlib/libc/iconv/lib/aliasesi.c
@@ -163,7 +163,7 @@ _DEFUN(_iconv_resolve_encoding_name, (rptr, cname, path),
p = find_alias (rptr, ca, _iconv_aliases, strlen (_iconv_aliases));
- _free_r (rptr, (_VOID_PTR)ca);
+ _free_r (rptr, (void *)ca);
return p;
}
diff --git a/newlib/libc/iconv/lib/conv.h b/newlib/libc/iconv/lib/conv.h
index f0088767e..59b6fe810 100644
--- a/newlib/libc/iconv/lib/conv.h
+++ b/newlib/libc/iconv/lib/conv.h
@@ -63,7 +63,7 @@ typedef struct
* Pointer to conversion-specific data if success. In case of error
* returns NULL and sets current thread's/process's errno.
*/
- _VOID_PTR _EXFNPTR(open, (struct _reent *rptr,
+ void *_EXFNPTR(open, (struct _reent *rptr,
const char *to,
const char *from));
@@ -72,7 +72,7 @@ typedef struct
*
* PARAMETRS:
* struct _reent *rptr - reent structure of current thread/process;
- * _VOID_PTR data - conversion-specific data.
+ * void *data - conversion-specific data.
*
* DESCRIPTION:
* This function is called from iconv_close() to close conversion.
@@ -82,13 +82,13 @@ typedef struct
* thread's/process's errno and returns (size_t)-1 (same as iconv_open()).
*/
size_t _EXFNPTR(close, (struct _reent *rptr,
- _VOID_PTR data));
+ void *data));
/* convert - perform encoding conversion.
*
* PARAMETERS:
* struct _reent *rptr - reent structure of current thread/process.
- * _VOID_PTR data - conversion-specific data;
+ * void *data - conversion-specific data;
* const unsigned char **inbuf - input data buffer;
* size_t *inbytesleft - input buffer's length;
* unsigned char **outbuf - output data buffer;
@@ -115,7 +115,7 @@ typedef struct
* thread's/process's errno and returns (size_t)-1 (same as iconv()).
*/
size_t _EXFNPTR(convert, (struct _reent *rptr,
- _VOID_PTR data,
+ void *data,
const unsigned char **inbuf,
size_t *inbytesleft,
unsigned char **outbuf,
@@ -126,7 +126,7 @@ typedef struct
* get_state - get current shift state.
*
* PARAMETERS:
- * _VOID_PTR data - conversion-specific data;
+ * void *data - conversion-specific data;
* mbstate_t *state - mbstate_t object where shift state will be written;
* int direction - 0-"from", 1-"to".
*
@@ -135,7 +135,7 @@ typedef struct
* If 'direction' is 0, "from" encoding is tested, else
* "to" encoding is tested.
*/
- _VOID _EXFNPTR(get_state, (_VOID_PTR data,
+ _VOID _EXFNPTR(get_state, (void *data,
mbstate_t *state,
int direction));
@@ -143,7 +143,7 @@ typedef struct
* set_state - set shift state.
*
* PARAMETERS:
- * _VOID_PTR data - conversion-specific data;
+ * void *data - conversion-specific data;
* mbstate_t *state - mbstate_t object to which shift state will be set.
* int direction - 0-"from", 1-"to".
*
@@ -154,7 +154,7 @@ typedef struct
* "to" encoding is set.
* Returns 0 if '*state' object has right format, -1 else.
*/
- int _EXFNPTR(set_state, (_VOID_PTR data,
+ int _EXFNPTR(set_state, (void *data,
mbstate_t *state,
int direction));
@@ -162,7 +162,7 @@ typedef struct
* get_mb_cur_max - get maximum character length in bytes.
*
* PARAMETERS:
- * _VOID_PTR data - conversion-specific data;
+ * void *data - conversion-specific data;
* int direction - 0-"from", 1-"to".
*
* DESCRIPTION:
@@ -170,14 +170,14 @@ typedef struct
* If 'direction' is 0, "from" encoding is tested, else
* "to" encoding is tested.
*/
- int _EXFNPTR(get_mb_cur_max, (_VOID_PTR data,
+ int _EXFNPTR(get_mb_cur_max, (void *data,
int direction));
/*
* is_stateful - is encoding stateful or stateless.
*
* PARAMETERS:
- * _VOID_PTR data - conversion-specific data;
+ * void *data - conversion-specific data;
* int direction - 0-"from", 1-"to".
*
* DESCRIPTION:
@@ -185,7 +185,7 @@ typedef struct
* If 'direction' is 0, "from" encoding is tested, else
* "to" encoding is tested.
*/
- int _EXFNPTR(is_stateful, (_VOID_PTR data,
+ int _EXFNPTR(is_stateful, (void *data,
int direction));
} iconv_conversion_handlers_t;
@@ -205,7 +205,7 @@ typedef struct
* Conversion-specific data (e.g., points to iconv_ucs_conversion_t
* object if UCS-based conversion is used).
*/
- _VOID_PTR data;
+ void *data;
} iconv_conversion_t;
diff --git a/newlib/libc/iconv/lib/iconv.c b/newlib/libc/iconv/lib/iconv.c
index 7c9b252f3..0cf3cf5ff 100644
--- a/newlib/libc/iconv/lib/iconv.c
+++ b/newlib/libc/iconv/lib/iconv.c
@@ -165,7 +165,7 @@ _DEFUN(_iconv_open_r, (rptr, to, from),
if ((from = (const char *)_iconv_resolve_encoding_name (rptr, from)) == NULL)
{
- _free_r (rptr, (_VOID_PTR)to);
+ _free_r (rptr, (void *)to);
return (iconv_t)-1;
}
@@ -187,16 +187,16 @@ _DEFUN(_iconv_open_r, (rptr, to, from),
ic->data = ic->handlers->open (rptr, to, from);
}
- _free_r (rptr, (_VOID_PTR)to);
- _free_r (rptr, (_VOID_PTR)from);
+ _free_r (rptr, (void *)to);
+ _free_r (rptr, (void *)from);
if (ic->data == NULL)
{
- _free_r (rptr, (_VOID_PTR)ic);
+ _free_r (rptr, (void *)ic);
return (iconv_t)-1;
}
- return (_VOID_PTR)ic;
+ return (void *)ic;
}
@@ -211,7 +211,7 @@ _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
{
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
- if ((_VOID_PTR)cd == NULL || cd == (iconv_t)-1 || ic->data == NULL
+ if ((void *)cd == NULL || cd == (iconv_t)-1 || ic->data == NULL
|| (ic->handlers != &_iconv_null_conversion_handlers
&& ic->handlers != &_iconv_ucs_conversion_handlers))
{
@@ -249,7 +249,7 @@ _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
if (*outbytesleft >= state_null.__count)
{
- memcpy ((_VOID_PTR)(*outbuf), (_VOID_PTR)&state_null, state_null.__count);
+ memcpy ((void *)(*outbuf), (void *)&state_null, state_null.__count);
*outbuf += state_null.__count;
*outbytesleft -= state_null.__count;
@@ -295,7 +295,7 @@ _DEFUN(_iconv_close_r, (rptr, cd),
int res;
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
- if ((_VOID_PTR)cd == NULL || cd == (iconv_t)-1 || ic->data == NULL
+ if ((void *)cd == NULL || cd == (iconv_t)-1 || ic->data == NULL
|| (ic->handlers != &_iconv_null_conversion_handlers
&& ic->handlers != &_iconv_ucs_conversion_handlers))
{
@@ -305,7 +305,7 @@ _DEFUN(_iconv_close_r, (rptr, cd),
res = (int)ic->handlers->close (rptr, ic->data);
- _free_r (rptr, (_VOID_PTR)cd);
+ _free_r (rptr, (void *)cd);
return res;
}
diff --git a/newlib/libc/iconv/lib/iconvnls.c b/newlib/libc/iconv/lib/iconvnls.c
index fa35cca1a..1996bdd8f 100644
--- a/newlib/libc/iconv/lib/iconvnls.c
+++ b/newlib/libc/iconv/lib/iconvnls.c
@@ -177,7 +177,7 @@ _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
int flags = ICONV_FAIL_BIT;
- if ((_VOID_PTR)cd == NULL || cd == (iconv_t)-1 || ic->data == NULL
+ if ((void *)cd == NULL || cd == (iconv_t)-1 || ic->data == NULL
|| (ic->handlers != &_iconv_null_conversion_handlers
&& ic->handlers != &_iconv_ucs_conversion_handlers))
{
@@ -289,11 +289,11 @@ _DEFUN(iconv_open1, (rptr, to, from),
if (ic->data == NULL)
{
- _free_r (rptr, (_VOID_PTR)ic);
+ _free_r (rptr, (void *)ic);
return (iconv_t)-1;
}
- return (_VOID_PTR)ic;
+ return (void *)ic;
}
/*
diff --git a/newlib/libc/iconv/lib/local.h b/newlib/libc/iconv/lib/local.h
index 46428ae17..bd9dcddca 100644
--- a/newlib/libc/iconv/lib/local.h
+++ b/newlib/libc/iconv/lib/local.h
@@ -30,9 +30,6 @@
#include <sys/types.h>
#include <limits.h>
-/* void* type for K&R compilers compatibility */
-#define _VOID_PTR _PTR
-
/* Encodings aliases file */
#define ICONV_ALIASES_FNAME "encoding.aliases"
/* iconv CCS data path */
diff --git a/newlib/libc/iconv/lib/nullconv.c b/newlib/libc/iconv/lib/nullconv.c
index 729007ab0..3c87cbb83 100644
--- a/newlib/libc/iconv/lib/nullconv.c
+++ b/newlib/libc/iconv/lib/nullconv.c
@@ -35,20 +35,20 @@
static int null_conversion_dummy_data;
-static _VOID_PTR
+static void *
_DEFUN(null_conversion_open, (rptr, to, from),
struct _reent *rptr,
const char *to,
const char *from)
{
- return (_VOID_PTR)&null_conversion_dummy_data;
+ return (void *)&null_conversion_dummy_data;
}
static size_t
_DEFUN(null_conversion_close, (rptr, data),
struct _reent *rptr,
- _VOID_PTR data)
+ void *data)
{
return 0;
}
@@ -58,7 +58,7 @@ static size_t
_DEFUN(null_conversion_convert,
(rptr, data, inbuf, inbytesleft, outbuf, outbytesleft),
struct _reent *rptr,
- _VOID_PTR data,
+ void *data,
const unsigned char **inbuf,
size_t *inbytesleft,
unsigned char **outbuf,
@@ -94,7 +94,7 @@ _DEFUN(null_conversion_convert,
static int
_DEFUN(null_conversion_get_mb_cur_max, (data, direction),
- _VOID_PTR data,
+ void *data,
int direction)
{
return ICONV_MB_LEN_MAX;
@@ -103,7 +103,7 @@ _DEFUN(null_conversion_get_mb_cur_max, (data, direction),
static _VOID
_DEFUN(null_conversion_get_state, (data, state, size),
- _VOID_PTR data,
+ void *data,
mbstate_t *state,
int direction)
{
@@ -113,7 +113,7 @@ _DEFUN(null_conversion_get_state, (data, state, size),
static int
_DEFUN(null_conversion_set_state, (data, state, direction),
- _VOID_PTR data,
+ void *data,
mbstate_t *state,
int direction)
{
@@ -122,7 +122,7 @@ _DEFUN(null_conversion_set_state, (data, state, direction),
static int
_DEFUN(null_conversion_is_stateful, (data, direction),
- _VOID_PTR data,
+ void *data,
int direction)
{
return 0;
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index 7cc65c86c..c91007209 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -44,7 +44,7 @@ _EXFUN(find_encoding_name, (const char *searchee,
* UCS-based conversion interface functions implementation.
*/
-static _VOID_PTR
+static void *
_DEFUN(ucs_based_conversion_open, (rptr, to, from),
struct _reent *rptr,
const char *to,
@@ -97,7 +97,7 @@ _DEFUN(ucs_based_conversion_open, (rptr, to, from),
goto error;
}
else
- uc->to_ucs.data = (_VOID_PTR)&fake_data;
+ uc->to_ucs.data = (void *)&fake_data;
/* Initialize "from UCS" CES converter */
@@ -108,7 +108,7 @@ _DEFUN(ucs_based_conversion_open, (rptr, to, from),
goto error;
}
else
- uc->from_ucs.data = (_VOID_PTR)&fake_data;
+ uc->from_ucs.data = (void *)&fake_data;
return uc;
@@ -116,7 +116,7 @@ error:
if (uc->to_ucs.data != NULL && uc->to_ucs.handlers->close != NULL)
uc->to_ucs.handlers->close (rptr, uc->to_ucs.data);
- _free_r (rptr, (_VOID_PTR)uc);
+ _free_r (rptr, (void *)uc);
return NULL;
}
@@ -125,7 +125,7 @@ error:
static size_t
_DEFUN(ucs_based_conversion_close, (rptr, data),
struct _reent *rptr,
- _VOID_PTR data)
+ void *data)
{
iconv_ucs_conversion_t *uc;
size_t res = 0;
@@ -137,7 +137,7 @@ _DEFUN(ucs_based_conversion_close, (rptr, data),
if (uc->to_ucs.handlers->close != NULL)
res |= uc->to_ucs.handlers->close (rptr, uc->to_ucs.data);
- _free_r (rptr, (_VOID_PTR)data);
+ _free_r (rptr, (void *)data);
return res;
}
@@ -147,7 +147,7 @@ static size_t
_DEFUN(ucs_based_conversion_convert,
(rptr, data, inbuf, inbytesleft, outbuf, outbytesleft, flags),
struct _reent *rptr,
- _VOID_PTR data,
+ void *data,
const unsigned char **inbuf,
size_t *inbytesleft,
unsigned char **outbuf,
@@ -239,7 +239,7 @@ _DEFUN(ucs_based_conversion_convert,
static int
_DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
- _VOID_PTR data,
+ void *data,
int direction)
{
iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -253,7 +253,7 @@ _DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
static _VOID
_DEFUN(ucs_based_conversion_get_state, (data, state, direction),
- _VOID_PTR data,
+ void *data,
mbstate_t *state,
int direction)
{
@@ -281,7 +281,7 @@ _DEFUN(ucs_based_conversion_get_state, (data, state, direction),
static int
_DEFUN(ucs_based_conversion_set_state, (data, state, direction),
- _VOID_PTR data,
+ void *data,
mbstate_t *state,
int direction)
{
@@ -303,7 +303,7 @@ _DEFUN(ucs_based_conversion_set_state, (data, state, direction),
static int
_DEFUN(ucs_based_conversion_is_stateful, (data, direction),
- _VOID_PTR data,
+ void *data,
int direction)
{
iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
diff --git a/newlib/libc/iconv/lib/ucsconv.h b/newlib/libc/iconv/lib/ucsconv.h
index cea6d5aa3..d3333161c 100644
--- a/newlib/libc/iconv/lib/ucsconv.h
+++ b/newlib/libc/iconv/lib/ucsconv.h
@@ -68,7 +68,7 @@ typedef struct
* Returns CES-specific data pointer if success. In case of error returns
* NULL and sets current thread's/process's errno.
*/
- _VOID_PTR _EXFNPTR(init, (struct _reent *rptr,
+ void *_EXFNPTR(init, (struct _reent *rptr,
const char *encoding));
/*
@@ -76,7 +76,7 @@ typedef struct
*
* PARAMETERS:
* struct _reent *rptr - reent structure of current thread/process;
- * _VOID_PTR data - CES converter-specific data.
+ * void *data - CES converter-specific data.
*
* DESCRIPTION:
* Preforms CES converter closing. *
@@ -85,37 +85,37 @@ typedef struct
* sets current thread's/process's errno.
*/
size_t _EXFNPTR(close, (struct _reent *rptr,
- _VOID_PTR data));
+ void *data));
/*
* get_mb_cur_max - get maximum character length in bytes.
*
* PARAMETERS:
- * _VOID_PTR data - conversion-specific data;
+ * void *data - conversion-specific data;
*
* DESCRIPTION:
* Returns encoding's maximum character length.
*/
- int _EXFNPTR(get_mb_cur_max, (_VOID_PTR data));
+ int _EXFNPTR(get_mb_cur_max, (void *data));
/*
* get_state - get current shift state.
*
* PARAMETERS:
- * _VOID_PTR data - conversion-specific data;
+ * void *data - conversion-specific data;
* mbstate_t *state - mbstate_t object where shift state will be stored;
*
* DESCRIPTION:
* Returns encoding's current shift sequence.
*/
- _VOID _EXFNPTR(get_state, (_VOID_PTR data,
+ _VOID _EXFNPTR(get_state, (void *data,
mbstate_t *state));
/*
* set_state - set shift state.
*
* PARAMETERS:
- * _VOID_PTR data - conversion-specific data;
+ * void *data - conversion-specific data;
* mbstate_t *state - mbstate_t value to which shift state will be set.
*
* DESCRIPTION:
@@ -123,25 +123,25 @@ typedef struct
* object is zero-object - reset current shift state.
* Returns 0 if '*state' object has right format, -1 else.
*/
- int _EXFNPTR(set_state, (_VOID_PTR data,
+ int _EXFNPTR(set_state, (void *data,
mbstate_t *state));
/*
* is_stateful - is encoding stateful state.
*
* PARAMETERS:
- * _VOID_PTR data - conversion-specific data;
+ * void *data - conversion-specific data;
*
* DESCRIPTION:
* Returns 0 if encoding is stateless, else returns 1.
*/
- int _EXFNPTR(is_stateful, (_VOID_PTR data));
+ int _EXFNPTR(is_stateful, (void *data));
/*
* convert_to_ucs - convert character to UCS.
*
* PARAMETERS:
- * _VOID_PTR data - CES converter-specific data;
+ * void *data - CES converter-specific data;
* const unsigned char **inbuf - buffer with input character byte sequence;
* size_t *inbytesleft - output buffer bytes count.
*
@@ -155,7 +155,7 @@ typedef struct
* returns ICONV_CES_INVALID_CHARACTER. If invalid or incomplete bytes
* sequence was met, returns ICONV_CES_BAD_SEQUENCE.
*/
- ucs4_t _EXFNPTR(convert_to_ucs, (_VOID_PTR data,
+ ucs4_t _EXFNPTR(convert_to_ucs, (void *data,
const unsigned char **inbuf,
size_t *inbytesleft));
} iconv_to_ucs_ces_handlers_t;
@@ -172,32 +172,32 @@ typedef struct
typedef struct
{
/* Same as in iconv_to_ucs_ces_handlers_t */
- _VOID_PTR _EXFNPTR(init, (struct _reent *rptr,
+ void *_EXFNPTR(init, (struct _reent *rptr,
const char *encoding));
/* Same as in iconv_to_ucs_ces_handlers_t */
size_t _EXFNPTR(close, (struct _reent *rptr,
- _VOID_PTR data));
+ void *data));
/* Same as in iconv_to_ucs_ces_handlers_t */
- int _EXFNPTR(get_mb_cur_max, (_VOID_PTR data));
+ int _EXFNPTR(get_mb_cur_max, (void *data));
/* Same as in iconv_to_ucs_ces_handlers_t */
- _VOID _EXFNPTR(get_state, (_VOID_PTR data,
+ _VOID _EXFNPTR(get_state, (void *data,
mbstate_t *state));
/* Same as in iconv_to_ucs_ces_handlers_t */
- int _EXFNPTR(set_state, (_VOID_PTR data,
+ int _EXFNPTR(set_state, (void *data,
mbstate_t *state));
/* Same as in iconv_to_ucs_ces_handlers_t */
- int _EXFNPTR(is_stateful, (_VOID_PTR data));
+ int _EXFNPTR(is_stateful, (void *data));
/*
* convert_from_ucs - convert UCS character to destination encoding.
*
* PARAMETERS:
- * _VOID_PTR data - CES converter-specific data;
+ * void *data - CES converter-specific data;
* ucs4_t in - input UCS-4 character;
* unsigned char **outbuf - output buffer for the result;
* size_t *outbytesleft - output buffer bytes count.
@@ -215,7 +215,7 @@ typedef struct
* If there is no corresponding character in destination encoding, returns
* ICONV_CES_INVALID_CHARACTER.
*/
- size_t _EXFNPTR(convert_from_ucs, (_VOID_PTR data,
+ size_t _EXFNPTR(convert_from_ucs, (void *data,
ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft));
@@ -234,7 +234,7 @@ typedef struct
const iconv_to_ucs_ces_handlers_t *handlers;
/* "to_ucs" CES converter-specific data. */
- _VOID_PTR data;
+ void *data;
} iconv_to_ucs_ces_desc_t;
@@ -250,7 +250,7 @@ typedef struct
const iconv_from_ucs_ces_handlers_t *handlers;
/* "from_ucs" CES converter-specific data. */
- _VOID_PTR data;
+ void *data;
} iconv_from_ucs_ces_desc_t;
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 01/17] ansification: remove _AND
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
` (2 preceding siblings ...)
2017-12-07 18:19 ` [PATCH v2 03/17] ansification: remove _DOTS Yaakov Selkowitz
@ 2017-12-07 18:20 ` Yaakov Selkowitz
2017-12-07 18:20 ` [PATCH v2 14/17] ansification: remove _EXFUN, _EXFUN_NOTHROW Yaakov Selkowitz
` (13 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:20 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
libgloss/cr16/fstat.c | 2 +-
libgloss/cr16/isatty.c | 2 +-
libgloss/cr16/kill.c | 2 +-
libgloss/cr16/stat.c | 2 +-
libgloss/crx/fstat.c | 2 +-
libgloss/crx/isatty.c | 2 +-
libgloss/crx/kill.c | 2 +-
libgloss/crx/stat.c | 2 +-
libgloss/frv/fstat.c | 2 +-
libgloss/frv/isatty.c | 2 +-
libgloss/frv/kill.c | 2 +-
libgloss/frv/sim-time.c | 2 +-
libgloss/frv/stat.c | 2 +-
libgloss/fstat.c | 2 +-
libgloss/ft32/fstat.c | 2 +-
libgloss/ft32/isatty.c | 2 +-
libgloss/ft32/kill.c | 2 +-
libgloss/ft32/sim-lseek.S | 4 +-
libgloss/ft32/sim-lseek.c | 4 +-
libgloss/ft32/sim-time.c | 2 +-
libgloss/ft32/stat.c | 2 +-
libgloss/isatty.c | 2 +-
libgloss/kill.c | 2 +-
libgloss/libnosys/chown.c | 4 +-
libgloss/libnosys/execve.c | 4 +-
libgloss/libnosys/fstat.c | 2 +-
libgloss/libnosys/gettod.c | 2 +-
libgloss/libnosys/kill.c | 2 +-
libgloss/libnosys/link.c | 2 +-
libgloss/libnosys/lseek.c | 4 +-
libgloss/libnosys/open.c | 4 +-
libgloss/libnosys/read.c | 4 +-
libgloss/libnosys/readlink.c | 4 +-
libgloss/libnosys/stat.c | 2 +-
libgloss/libnosys/symlink.c | 2 +-
libgloss/libnosys/write.c | 4 +-
libgloss/lseek.c | 4 +-
libgloss/mcore/fstat.c | 2 +-
libgloss/mcore/kill.c | 2 +-
libgloss/mcore/lseek.c | 4 +-
libgloss/mcore/open.c | 4 +-
libgloss/mcore/read.c | 4 +-
libgloss/mcore/stat.c | 2 +-
libgloss/mcore/write.c | 4 +-
libgloss/moxie/fstat.c | 2 +-
libgloss/moxie/isatty.c | 2 +-
libgloss/moxie/kill.c | 2 +-
libgloss/moxie/qemu-time.c | 2 +-
libgloss/moxie/sim-lseek.S | 4 +-
libgloss/moxie/sim-lseek.c | 4 +-
libgloss/moxie/sim-time.c | 2 +-
libgloss/moxie/stat.c | 2 +-
libgloss/open.c | 4 +-
libgloss/read.c | 4 +-
libgloss/stat.c | 2 +-
libgloss/tic6x/kill.c | 2 +-
libgloss/write.c | 4 +-
libgloss/xc16x/misc.c | 2 +-
libgloss/xstormy16/fstat.c | 2 +-
libgloss/xstormy16/isatty.c | 2 +-
libgloss/xstormy16/kill.c | 2 +-
libgloss/xstormy16/lseek.c | 4 +-
libgloss/xstormy16/open.c | 4 +-
libgloss/xstormy16/stat.c | 2 +-
newlib/libc/argz/argz_add.c | 4 +-
newlib/libc/argz/argz_add_sep.c | 6 +--
newlib/libc/argz/argz_append.c | 6 +--
newlib/libc/argz/argz_count.c | 2 +-
newlib/libc/argz/argz_create.c | 4 +-
newlib/libc/argz/argz_create_sep.c | 6 +--
newlib/libc/argz/argz_delete.c | 4 +-
| 4 +-
newlib/libc/argz/argz_insert.c | 6 +--
newlib/libc/argz/argz_next.c | 4 +-
newlib/libc/argz/argz_replace.c | 8 ++--
newlib/libc/argz/argz_stringify.c | 4 +-
newlib/libc/argz/envz_add.c | 6 +--
newlib/libc/argz/envz_entry.c | 4 +-
newlib/libc/argz/envz_get.c | 4 +-
newlib/libc/argz/envz_merge.c | 8 ++--
newlib/libc/argz/envz_remove.c | 4 +-
newlib/libc/argz/envz_strip.c | 2 +-
newlib/libc/ctype/iswctype.c | 2 +-
newlib/libc/ctype/jp2uc.c | 2 +-
newlib/libc/ctype/towctrans.c | 6 +--
newlib/libc/ctype/wctrans.c | 2 +-
newlib/libc/ctype/wctype.c | 2 +-
newlib/libc/iconv/ces/euc.c | 18 +++----
newlib/libc/iconv/ces/table-pcs.c | 18 +++----
newlib/libc/iconv/ces/table.c | 26 +++++-----
newlib/libc/iconv/ces/ucs-2-internal.c | 10 ++--
newlib/libc/iconv/ces/ucs-2.c | 14 +++---
newlib/libc/iconv/ces/ucs-4-internal.c | 10 ++--
newlib/libc/iconv/ces/ucs-4.c | 14 +++---
newlib/libc/iconv/ces/us-ascii.c | 10 ++--
newlib/libc/iconv/ces/utf-16.c | 16 +++----
newlib/libc/iconv/ces/utf-8.c | 10 ++--
newlib/libc/iconv/lib/aliasesi.c | 10 ++--
newlib/libc/iconv/lib/iconv.c | 26 +++++-----
newlib/libc/iconv/lib/iconvnls.c | 40 ++++++++--------
newlib/libc/iconv/lib/nullconv.c | 30 ++++++------
newlib/libc/iconv/lib/ucsconv.c | 32 ++++++-------
newlib/libc/include/_ansi.h | 2 -
newlib/libc/locale/locale.c | 6 +--
newlib/libc/machine/microblaze/strcmp.c | 2 +-
newlib/libc/machine/microblaze/strcpy.c | 2 +-
newlib/libc/machine/powerpc/atosfix16.c | 2 +-
newlib/libc/machine/powerpc/atosfix32.c | 2 +-
newlib/libc/machine/powerpc/atosfix64.c | 2 +-
newlib/libc/machine/powerpc/atoufix16.c | 2 +-
newlib/libc/machine/powerpc/atoufix32.c | 2 +-
newlib/libc/machine/powerpc/atoufix64.c | 2 +-
newlib/libc/machine/powerpc/strtosfix16.c | 6 +--
newlib/libc/machine/powerpc/strtosfix32.c | 6 +--
newlib/libc/machine/powerpc/strtosfix64.c | 6 +--
newlib/libc/machine/powerpc/strtoufix16.c | 6 +--
newlib/libc/machine/powerpc/strtoufix32.c | 6 +--
newlib/libc/machine/powerpc/strtoufix64.c | 6 +--
newlib/libc/machine/powerpc/ufix64toa.c | 12 ++---
newlib/libc/machine/powerpc/vec_calloc.c | 2 +-
newlib/libc/machine/powerpc/vec_realloc.c | 2 +-
newlib/libc/machine/powerpc/vfprintf.c | 10 ++--
newlib/libc/machine/powerpc/vfscanf.c | 10 ++--
newlib/libc/machine/spu/assert.c | 10 ++--
newlib/libc/machine/spu/creat.c | 2 +-
newlib/libc/machine/spu/fdopen.c | 2 +-
newlib/libc/machine/spu/fgetpos.c | 2 +-
newlib/libc/machine/spu/fgets.c | 4 +-
newlib/libc/machine/spu/fopen.c | 2 +-
newlib/libc/machine/spu/fputs.c | 2 +-
newlib/libc/machine/spu/fread.c | 6 +--
newlib/libc/machine/spu/freopen.c | 4 +-
newlib/libc/machine/spu/fseek.c | 4 +-
newlib/libc/machine/spu/fsetpos.c | 2 +-
newlib/libc/machine/spu/fwrite.c | 6 +--
newlib/libc/machine/spu/setbuf.c | 2 +-
newlib/libc/machine/spu/setvbuf.c | 6 +--
newlib/libc/machine/spu/vfprintf.c | 4 +-
newlib/libc/machine/spu/vfscanf.c | 4 +-
newlib/libc/machine/spu/vprintf.c | 2 +-
newlib/libc/machine/spu/vscanf.c | 2 +-
newlib/libc/machine/spu/vsnprintf.c | 6 +--
newlib/libc/machine/spu/vsprintf.c | 4 +-
newlib/libc/machine/spu/vsscanf.c | 4 +-
newlib/libc/misc/__dprintf.c | 8 ++--
newlib/libc/posix/creat.c | 2 +-
newlib/libc/posix/execl.c | 6 +--
newlib/libc/posix/execle.c | 6 +--
newlib/libc/posix/execlp.c | 6 +--
newlib/libc/posix/execv.c | 2 +-
newlib/libc/posix/execve.c | 4 +-
newlib/libc/posix/execvp.c | 6 +--
newlib/libc/posix/popen.c | 2 +-
newlib/libc/posix/posix_spawn.c | 58 +++++++++++-----------
newlib/libc/posix/readdir_r.c | 4 +-
newlib/libc/posix/scandir.c | 8 ++--
newlib/libc/posix/seekdir.c | 2 +-
newlib/libc/posix/telldir.c | 2 +-
newlib/libc/reent/execr.c | 8 ++--
newlib/libc/reent/fcntlr.c | 6 +--
newlib/libc/reent/fstat64r.c | 4 +-
newlib/libc/reent/gettimeofdayr.c | 4 +-
newlib/libc/reent/linkr.c | 4 +-
newlib/libc/reent/lseek64r.c | 6 +--
newlib/libc/reent/lseekr.c | 6 +--
newlib/libc/reent/mkdirr.c | 4 +-
newlib/libc/reent/openr.c | 6 +--
newlib/libc/reent/readr.c | 6 +--
newlib/libc/reent/reent.c | 2 +-
newlib/libc/reent/renamer.c | 4 +-
newlib/libc/reent/sbrkr.c | 2 +-
newlib/libc/reent/signalr.c | 4 +-
newlib/libc/reent/stat64r.c | 4 +-
newlib/libc/reent/statr.c | 4 +-
newlib/libc/reent/timesr.c | 2 +-
newlib/libc/reent/unlinkr.c | 2 +-
newlib/libc/reent/writer.c | 6 +--
newlib/libc/search/bsearch.c | 8 ++--
newlib/libc/search/hash.c | 8 ++--
newlib/libc/search/hcreate.c | 2 +-
newlib/libc/search/qsort.c | 36 +++++++-------
newlib/libc/search/tdelete.c | 4 +-
newlib/libc/search/tdestroy.c | 2 +-
newlib/libc/search/tfind.c | 4 +-
newlib/libc/search/tsearch.c | 4 +-
newlib/libc/search/twalk.c | 2 +-
newlib/libc/signal/psignal.c | 2 +-
newlib/libc/signal/raise.c | 2 +-
newlib/libc/signal/signal.c | 10 ++--
newlib/libc/stdio/asiprintf.c | 6 +--
newlib/libc/stdio/asniprintf.c | 10 ++--
newlib/libc/stdio/asnprintf.c | 10 ++--
newlib/libc/stdio/asprintf.c | 6 +--
newlib/libc/stdio/diprintf.c | 6 +--
newlib/libc/stdio/dprintf.c | 6 +--
newlib/libc/stdio/fclose.c | 2 +-
newlib/libc/stdio/fdopen.c | 6 +--
newlib/libc/stdio/fflush.c | 6 +--
newlib/libc/stdio/fgetc.c | 2 +-
newlib/libc/stdio/fgetc_u.c | 2 +-
newlib/libc/stdio/fgetpos.c | 6 +--
newlib/libc/stdio/fgets.c | 10 ++--
newlib/libc/stdio/fgetwc.c | 4 +-
newlib/libc/stdio/fgetwc_u.c | 2 +-
newlib/libc/stdio/fgetws.c | 10 ++--
newlib/libc/stdio/findfp.c | 6 +--
newlib/libc/stdio/fiprintf.c | 6 +--
newlib/libc/stdio/flags.c | 4 +-
newlib/libc/stdio/fmemopen.c | 36 +++++++-------
newlib/libc/stdio/fopen.c | 6 +--
newlib/libc/stdio/fopencookie.c | 36 +++++++-------
newlib/libc/stdio/fprintf.c | 6 +--
newlib/libc/stdio/fpurge.c | 2 +-
newlib/libc/stdio/fputc.c | 6 +--
newlib/libc/stdio/fputc_u.c | 6 +--
newlib/libc/stdio/fputs.c | 6 +--
newlib/libc/stdio/fputwc.c | 10 ++--
newlib/libc/stdio/fputwc_u.c | 6 +--
newlib/libc/stdio/fputws.c | 6 +--
newlib/libc/stdio/fread.c | 22 ++++-----
newlib/libc/stdio/freopen.c | 10 ++--
newlib/libc/stdio/fseek.c | 10 ++--
newlib/libc/stdio/fseeko.c | 10 ++--
newlib/libc/stdio/fsetlocking.c | 2 +-
newlib/libc/stdio/fsetpos.c | 6 +--
newlib/libc/stdio/ftell.c | 2 +-
newlib/libc/stdio/ftello.c | 2 +-
newlib/libc/stdio/funopen.c | 44 ++++++++---------
newlib/libc/stdio/fvwrite.c | 4 +-
newlib/libc/stdio/fwalk.c | 4 +-
newlib/libc/stdio/fwide.c | 6 +--
newlib/libc/stdio/fwprintf.c | 6 +--
newlib/libc/stdio/fwrite.c | 14 +++---
newlib/libc/stdio/getc.c | 2 +-
newlib/libc/stdio/getc_u.c | 2 +-
newlib/libc/stdio/getdelim.c | 6 +--
newlib/libc/stdio/getline.c | 4 +-
newlib/libc/stdio/gets.c | 2 +-
newlib/libc/stdio/getwc.c | 2 +-
newlib/libc/stdio/getwc_u.c | 2 +-
newlib/libc/stdio/iprintf.c | 2 +-
newlib/libc/stdio/makebuf.c | 8 ++--
newlib/libc/stdio/mktemp.c | 38 +++++++--------
newlib/libc/stdio/nano-vfprintf.c | 34 ++++++-------
newlib/libc/stdio/nano-vfscanf.c | 26 +++++-----
newlib/libc/stdio/open_memstream.c | 38 +++++++--------
newlib/libc/stdio/perror.c | 2 +-
newlib/libc/stdio/printf.c | 2 +-
newlib/libc/stdio/putc.c | 6 +--
newlib/libc/stdio/putc_u.c | 6 +--
newlib/libc/stdio/putchar.c | 2 +-
newlib/libc/stdio/putchar_u.c | 2 +-
newlib/libc/stdio/puts.c | 2 +-
newlib/libc/stdio/putw.c | 2 +-
newlib/libc/stdio/putwc.c | 6 +--
newlib/libc/stdio/putwc_u.c | 6 +--
newlib/libc/stdio/putwchar.c | 2 +-
newlib/libc/stdio/putwchar_u.c | 2 +-
newlib/libc/stdio/refill.c | 2 +-
newlib/libc/stdio/remove.c | 2 +-
newlib/libc/stdio/rename.c | 2 +-
newlib/libc/stdio/rewind.c | 2 +-
newlib/libc/stdio/rget.c | 2 +-
newlib/libc/stdio/sccl.c | 2 +-
newlib/libc/stdio/setbuf.c | 2 +-
newlib/libc/stdio/setbuffer.c | 4 +-
newlib/libc/stdio/setvbuf.c | 6 +--
newlib/libc/stdio/siprintf.c | 6 +--
newlib/libc/stdio/siscanf.c | 6 +--
newlib/libc/stdio/sniprintf.c | 10 ++--
newlib/libc/stdio/snprintf.c | 10 ++--
newlib/libc/stdio/sprintf.c | 6 +--
newlib/libc/stdio/sscanf.c | 6 +--
newlib/libc/stdio/stdio.c | 26 +++++-----
newlib/libc/stdio/swprintf.c | 10 ++--
newlib/libc/stdio/tmpnam.c | 18 +++----
newlib/libc/stdio/ungetc.c | 8 ++--
newlib/libc/stdio/ungetwc.c | 6 +--
newlib/libc/stdio/vasiprintf.c | 10 ++--
newlib/libc/stdio/vasniprintf.c | 14 +++---
newlib/libc/stdio/vasnprintf.c | 14 +++---
newlib/libc/stdio/vasprintf.c | 10 ++--
newlib/libc/stdio/vdiprintf.c | 10 ++--
newlib/libc/stdio/vdprintf.c | 10 ++--
newlib/libc/stdio/vfprintf.c | 50 +++++++++----------
newlib/libc/stdio/vfscanf.c | 34 ++++++-------
newlib/libc/stdio/vfwprintf.c | 30 ++++++------
newlib/libc/stdio/vfwscanf.c | 26 +++++-----
newlib/libc/stdio/viprintf.c | 6 +--
newlib/libc/stdio/viscanf.c | 6 +--
newlib/libc/stdio/vprintf.c | 6 +--
newlib/libc/stdio/vscanf.c | 6 +--
newlib/libc/stdio/vsiprintf.c | 10 ++--
newlib/libc/stdio/vsiscanf.c | 10 ++--
newlib/libc/stdio/vsniprintf.c | 14 +++---
newlib/libc/stdio/vsnprintf.c | 14 +++---
newlib/libc/stdio/vsprintf.c | 10 ++--
newlib/libc/stdio/vsscanf.c | 10 ++--
newlib/libc/stdio/vswprintf.c | 14 +++---
newlib/libc/stdio/vwprintf.c | 6 +--
newlib/libc/stdio/wbuf.c | 6 +--
newlib/libc/stdio/wprintf.c | 2 +-
newlib/libc/stdio/wsetup.c | 2 +-
newlib/libc/stdio64/fdopen64.c | 6 +--
newlib/libc/stdio64/fgetpos64.c | 6 +--
newlib/libc/stdio64/fopen64.c | 6 +--
newlib/libc/stdio64/freopen64.c | 10 ++--
newlib/libc/stdio64/fseeko64.c | 10 ++--
newlib/libc/stdio64/fsetpos64.c | 6 +--
newlib/libc/stdio64/ftello64.c | 2 +-
newlib/libc/stdio64/stdio64.c | 12 ++---
newlib/libc/stdlib/__adjust.c | 6 +--
newlib/libc/stdlib/__atexit.c | 6 +--
newlib/libc/stdlib/__call_atexit.c | 2 +-
newlib/libc/stdlib/__ten_mu.c | 2 +-
newlib/libc/stdlib/assert.c | 10 ++--
newlib/libc/stdlib/atoi.c | 2 +-
newlib/libc/stdlib/atol.c | 2 +-
newlib/libc/stdlib/atoll.c | 2 +-
newlib/libc/stdlib/calloc.c | 2 +-
newlib/libc/stdlib/cxa_atexit.c | 4 +-
newlib/libc/stdlib/div.c | 2 +-
newlib/libc/stdlib/dtoa.c | 14 +++---
newlib/libc/stdlib/dtoastub.c | 10 ++--
newlib/libc/stdlib/ecvtbuf.c | 60 +++++++++++------------
newlib/libc/stdlib/efgcvt.c | 32 ++++++-------
newlib/libc/stdlib/erand48.c | 2 +-
newlib/libc/stdlib/gdtoa-gethex.c | 4 +-
newlib/libc/stdlib/gdtoa-hexnan.c | 10 ++--
newlib/libc/stdlib/getenv.c | 2 +-
newlib/libc/stdlib/getenv_r.c | 6 +--
newlib/libc/stdlib/itoa.c | 8 ++--
newlib/libc/stdlib/jrand48.c | 2 +-
newlib/libc/stdlib/l64a.c | 2 +-
newlib/libc/stdlib/lcong48.c | 2 +-
newlib/libc/stdlib/ldiv.c | 2 +-
newlib/libc/stdlib/lldiv.c | 2 +-
newlib/libc/stdlib/malign.c | 2 +-
newlib/libc/stdlib/mblen.c | 2 +-
newlib/libc/stdlib/mblen_r.c | 6 +--
newlib/libc/stdlib/mbrtowc.c | 14 +++---
newlib/libc/stdlib/mbsnrtowcs.c | 18 +++----
newlib/libc/stdlib/mbsrtowcs.c | 14 +++---
newlib/libc/stdlib/mbstowcs.c | 4 +-
newlib/libc/stdlib/mbstowcs_r.c | 8 ++--
newlib/libc/stdlib/mbtowc.c | 4 +-
newlib/libc/stdlib/mbtowc_r.c | 48 +++++++++----------
newlib/libc/stdlib/mprec.c | 48 +++++++++----------
newlib/libc/stdlib/mstats.c | 4 +-
newlib/libc/stdlib/nrand48.c | 2 +-
newlib/libc/stdlib/on_exit.c | 2 +-
newlib/libc/stdlib/putenv_r.c | 2 +-
newlib/libc/stdlib/rand48.c | 2 +-
newlib/libc/stdlib/realloc.c | 2 +-
newlib/libc/stdlib/reallocf.c | 6 +--
newlib/libc/stdlib/seed48.c | 2 +-
newlib/libc/stdlib/setenv.c | 4 +-
newlib/libc/stdlib/setenv_r.c | 8 ++--
newlib/libc/stdlib/srand48.c | 2 +-
newlib/libc/stdlib/strtod.c | 16 +++----
newlib/libc/stdlib/strtol.c | 10 ++--
newlib/libc/stdlib/strtoll.c | 10 ++--
newlib/libc/stdlib/strtoul.c | 10 ++--
newlib/libc/stdlib/strtoull.c | 10 ++--
newlib/libc/stdlib/system.c | 8 ++--
newlib/libc/stdlib/utoa.c | 8 ++--
newlib/libc/stdlib/wcrtomb.c | 10 ++--
newlib/libc/stdlib/wcsnrtombs.c | 18 +++----
newlib/libc/stdlib/wcsrtombs.c | 14 +++---
newlib/libc/stdlib/wcstod.c | 12 ++---
newlib/libc/stdlib/wcstol.c | 10 ++--
newlib/libc/stdlib/wcstoll.c | 10 ++--
newlib/libc/stdlib/wcstombs.c | 4 +-
newlib/libc/stdlib/wcstombs_r.c | 8 ++--
newlib/libc/stdlib/wcstoul.c | 10 ++--
newlib/libc/stdlib/wcstoull.c | 10 ++--
newlib/libc/stdlib/wctomb.c | 2 +-
newlib/libc/stdlib/wctomb_r.c | 36 +++++++-------
newlib/libc/string/bcmp.c | 4 +-
newlib/libc/string/bcopy.c | 4 +-
newlib/libc/string/index.c | 2 +-
newlib/libc/string/memccpy.c | 6 +--
newlib/libc/string/memchr.c | 4 +-
newlib/libc/string/memcmp.c | 4 +-
newlib/libc/string/memcpy.c | 4 +-
newlib/libc/string/memmem.c | 6 +--
newlib/libc/string/memmove.c | 4 +-
newlib/libc/string/mempcpy.c | 4 +-
newlib/libc/string/memrchr.c | 4 +-
newlib/libc/string/memset.c | 4 +-
newlib/libc/string/rawmemchr.c | 2 +-
newlib/libc/string/rindex.c | 2 +-
newlib/libc/string/stpcpy.c | 2 +-
newlib/libc/string/stpncpy.c | 4 +-
newlib/libc/string/strcasecmp.c | 2 +-
newlib/libc/string/strcasestr.c | 2 +-
newlib/libc/string/strcat.c | 2 +-
newlib/libc/string/strchr.c | 2 +-
newlib/libc/string/strchrnul.c | 2 +-
newlib/libc/string/strcmp.c | 2 +-
newlib/libc/string/strcoll.c | 2 +-
newlib/libc/string/strcpy.c | 2 +-
newlib/libc/string/strcspn.c | 2 +-
newlib/libc/string/strdup_r.c | 2 +-
newlib/libc/string/strerror.c | 6 +--
newlib/libc/string/strerror_r.c | 4 +-
newlib/libc/string/strlcat.c | 4 +-
newlib/libc/string/strlcpy.c | 4 +-
newlib/libc/string/strncasecmp.c | 4 +-
newlib/libc/string/strncat.c | 4 +-
newlib/libc/string/strncmp.c | 4 +-
newlib/libc/string/strncpy.c | 4 +-
newlib/libc/string/strndup.c | 2 +-
newlib/libc/string/strndup_r.c | 4 +-
newlib/libc/string/strnlen.c | 2 +-
newlib/libc/string/strpbrk.c | 2 +-
newlib/libc/string/strrchr.c | 2 +-
newlib/libc/string/strsep.c | 2 +-
newlib/libc/string/strspn.c | 2 +-
newlib/libc/string/strstr.c | 2 +-
newlib/libc/string/strtok.c | 2 +-
newlib/libc/string/strtok_r.c | 10 ++--
newlib/libc/string/strxfrm.c | 4 +-
newlib/libc/string/swab.c | 4 +-
newlib/libc/string/u_strerr.c | 4 +-
newlib/libc/string/wcpcpy.c | 2 +-
newlib/libc/string/wcpncpy.c | 4 +-
newlib/libc/string/wcscasecmp.c | 2 +-
newlib/libc/string/wcscat.c | 2 +-
newlib/libc/string/wcschr.c | 2 +-
newlib/libc/string/wcscmp.c | 2 +-
newlib/libc/string/wcscoll.c | 2 +-
newlib/libc/string/wcscpy.c | 2 +-
newlib/libc/string/wcscspn.c | 2 +-
newlib/libc/string/wcslcat.c | 4 +-
newlib/libc/string/wcslcpy.c | 4 +-
newlib/libc/string/wcsncasecmp.c | 4 +-
newlib/libc/string/wcsncat.c | 4 +-
newlib/libc/string/wcsncmp.c | 4 +-
newlib/libc/string/wcsncpy.c | 4 +-
newlib/libc/string/wcsnlen.c | 2 +-
newlib/libc/string/wcspbrk.c | 2 +-
newlib/libc/string/wcsrchr.c | 2 +-
newlib/libc/string/wcsspn.c | 2 +-
newlib/libc/string/wcsstr.c | 2 +-
newlib/libc/string/wcstok.c | 4 +-
newlib/libc/string/wcswidth.c | 2 +-
newlib/libc/string/wcsxfrm.c | 4 +-
newlib/libc/string/wmemchr.c | 4 +-
newlib/libc/string/wmemcmp.c | 4 +-
newlib/libc/string/wmemcpy.c | 4 +-
newlib/libc/string/wmemmove.c | 4 +-
newlib/libc/string/wmempcpy.c | 4 +-
newlib/libc/string/wmemset.c | 4 +-
newlib/libc/string/xpg_strerror_r.c | 4 +-
newlib/libc/sys/a29khif/kill.c | 2 +-
newlib/libc/sys/h8300hms/misc.c | 2 +-
newlib/libc/sys/h8500hms/misc.c | 2 +-
newlib/libc/sys/linux/pread.c | 14 +++---
newlib/libc/sys/linux/pread64.c | 6 +--
newlib/libc/sys/linux/pwrite.c | 14 +++---
newlib/libc/sys/linux/pwrite64.c | 6 +--
newlib/libc/sys/sysnec810/misc.c | 2 +-
newlib/libc/syscalls/sysexecve.c | 4 +-
newlib/libc/syscalls/sysfcntl.c | 4 +-
newlib/libc/syscalls/sysfstat.c | 2 +-
newlib/libc/syscalls/sysgettod.c | 2 +-
newlib/libc/syscalls/syskill.c | 2 +-
newlib/libc/syscalls/syslink.c | 2 +-
newlib/libc/syscalls/syslseek.c | 4 +-
newlib/libc/syscalls/sysopen.c | 2 +-
newlib/libc/syscalls/sysread.c | 4 +-
newlib/libc/syscalls/sysstat.c | 2 +-
newlib/libc/syscalls/syswrite.c | 4 +-
newlib/libc/time/asctime_r.c | 2 +-
newlib/libc/time/ctime_r.c | 2 +-
newlib/libc/time/difftime.c | 2 +-
newlib/libc/time/gmtime_r.c | 2 +-
newlib/libc/time/lcltime_r.c | 2 +-
newlib/libc/time/strftime.c | 6 +--
newlib/libc/unix/pread.c | 14 +++---
newlib/libc/unix/pwrite.c | 14 +++---
newlib/libc/unix/ttyname_r.c | 4 +-
newlib/libc/xdr/xdr.c | 80 +++++++++++++++----------------
newlib/libc/xdr/xdr_array.c | 18 +++----
newlib/libc/xdr/xdr_float.c | 4 +-
newlib/libc/xdr/xdr_float_vax.c | 4 +-
newlib/libc/xdr/xdr_mem.c | 36 +++++++-------
newlib/libc/xdr/xdr_private.c | 2 +-
newlib/libc/xdr/xdr_rec.c | 48 +++++++++----------
newlib/libc/xdr/xdr_reference.c | 12 ++---
newlib/libc/xdr/xdr_sizeof.c | 14 +++---
newlib/libc/xdr/xdr_stdio.c | 24 +++++-----
newlib/libm/mathfp/s_asine.c | 2 +-
newlib/libm/mathfp/s_atan2.c | 2 +-
newlib/libm/mathfp/s_atangent.c | 6 +--
newlib/libm/mathfp/s_ldexp.c | 2 +-
newlib/libm/mathfp/s_logarithm.c | 2 +-
newlib/libm/mathfp/s_sincos.c | 4 +-
newlib/libm/mathfp/s_sine.c | 2 +-
newlib/libm/mathfp/s_sineh.c | 2 +-
newlib/libm/mathfp/sf_asine.c | 2 +-
newlib/libm/mathfp/sf_atan2.c | 2 +-
newlib/libm/mathfp/sf_atangent.c | 6 +--
newlib/libm/mathfp/sf_fmod.c | 2 +-
newlib/libm/mathfp/sf_ldexp.c | 2 +-
newlib/libm/mathfp/sf_logarithm.c | 2 +-
newlib/libm/mathfp/sf_sincos.c | 4 +-
newlib/libm/mathfp/sf_sine.c | 2 +-
newlib/libm/mathfp/sf_sineh.c | 2 +-
newlib/libm/test/convert.c | 10 ++--
newlib/libm/test/dcvt.c | 42 ++++++++--------
newlib/libm/test/math.c | 44 ++++++++---------
newlib/libm/test/string.c | 10 ++--
newlib/libm/test/test.c | 20 ++++----
newlib/libm/test/test_ieee.c | 2 +-
newlib/libm/test/test_is.c | 12 ++---
517 files changed, 1771 insertions(+), 1773 deletions(-)
diff --git a/libgloss/cr16/fstat.c b/libgloss/cr16/fstat.c
index 637f87db5..73e1fa248 100644
--- a/libgloss/cr16/fstat.c
+++ b/libgloss/cr16/fstat.c
@@ -20,7 +20,7 @@
*/
int
_DEFUN (_fstat, (fd, buf),
- int fd _AND
+ int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/cr16/isatty.c b/libgloss/cr16/isatty.c
index 1cb32e5c7..604e8f097 100644
--- a/libgloss/cr16/isatty.c
+++ b/libgloss/cr16/isatty.c
@@ -17,7 +17,7 @@
/*
* isatty -- returns 1 if connected to a terminal device,
* returns 0 if not. Since we're hooked up to a
- * serial port, we'll say yes _AND return a 1.
+ * serial port, we'll say yes and return a 1.
*/
int
_DEFUN (_isatty, (fd),
diff --git a/libgloss/cr16/kill.c b/libgloss/cr16/kill.c
index b37584400..43c3ec554 100644
--- a/libgloss/cr16/kill.c
+++ b/libgloss/cr16/kill.c
@@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
*/
int
_DEFUN (_kill, (pid, sig),
- int pid _AND
+ int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/cr16/stat.c b/libgloss/cr16/stat.c
index f1769cdac..743fc94a9 100644
--- a/libgloss/cr16/stat.c
+++ b/libgloss/cr16/stat.c
@@ -21,7 +21,7 @@
*/
int
_DEFUN (_stat, (path, buf),
- const char *path _AND
+ const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/libgloss/crx/fstat.c b/libgloss/crx/fstat.c
index 380fc2aaa..75f863583 100644
--- a/libgloss/crx/fstat.c
+++ b/libgloss/crx/fstat.c
@@ -20,7 +20,7 @@
*/
int
_DEFUN (fstat, (fd, buf),
- int fd _AND
+ int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/crx/isatty.c b/libgloss/crx/isatty.c
index 927d75497..ac3d041e7 100644
--- a/libgloss/crx/isatty.c
+++ b/libgloss/crx/isatty.c
@@ -17,7 +17,7 @@
/*
* isatty -- returns 1 if connected to a terminal device,
* returns 0 if not. Since we're hooked up to a
- * serial port, we'll say yes _AND return a 1.
+ * serial port, we'll say yes and return a 1.
*/
int
_DEFUN (isatty, (fd),
diff --git a/libgloss/crx/kill.c b/libgloss/crx/kill.c
index 3ed228fd2..db5018cfc 100644
--- a/libgloss/crx/kill.c
+++ b/libgloss/crx/kill.c
@@ -20,7 +20,7 @@
*/
int
_DEFUN (kill, (pid, sig),
- int pid _AND
+ int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/crx/stat.c b/libgloss/crx/stat.c
index 6ffef821b..9562b9097 100644
--- a/libgloss/crx/stat.c
+++ b/libgloss/crx/stat.c
@@ -21,7 +21,7 @@
*/
int
_DEFUN (stat, (path, buf),
- const char *path _AND
+ const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/libgloss/frv/fstat.c b/libgloss/frv/fstat.c
index 756f7b261..680c4a1c0 100644
--- a/libgloss/frv/fstat.c
+++ b/libgloss/frv/fstat.c
@@ -20,7 +20,7 @@
*/
int
_DEFUN (_fstat, (fd, buf),
- int fd _AND
+ int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/frv/isatty.c b/libgloss/frv/isatty.c
index b021b4ff8..e4c99065b 100644
--- a/libgloss/frv/isatty.c
+++ b/libgloss/frv/isatty.c
@@ -17,7 +17,7 @@
/*
* isatty -- returns 1 if connected to a terminal device,
* returns 0 if not. Since we're hooked up to a
- * serial port, we'll say yes _AND return a 1.
+ * serial port, we'll say yes and return a 1.
*/
int
_DEFUN (_isatty, (fd),
diff --git a/libgloss/frv/kill.c b/libgloss/frv/kill.c
index 7c365fd06..8dda1e9a6 100644
--- a/libgloss/frv/kill.c
+++ b/libgloss/frv/kill.c
@@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
*/
int
_DEFUN (_kill, (pid, sig),
- int pid _AND
+ int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/frv/sim-time.c b/libgloss/frv/sim-time.c
index c4746b482..196f855ad 100644
--- a/libgloss/frv/sim-time.c
+++ b/libgloss/frv/sim-time.c
@@ -66,7 +66,7 @@ _DEFUN (_times, _times (buf),
*/
int
_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
- struct timeval *tv _AND
+ struct timeval *tv,
void *tzvp)
{
struct timezone *tz = tzvp;
diff --git a/libgloss/frv/stat.c b/libgloss/frv/stat.c
index 094ab4875..ceaedc216 100644
--- a/libgloss/frv/stat.c
+++ b/libgloss/frv/stat.c
@@ -21,7 +21,7 @@
*/
int
_DEFUN (_stat, (path, buf),
- const char *path _AND
+ const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/libgloss/fstat.c b/libgloss/fstat.c
index 8082d6395..e7f913358 100644
--- a/libgloss/fstat.c
+++ b/libgloss/fstat.c
@@ -20,7 +20,7 @@
*/
int
_DEFUN (fstat, (fd, buf),
- int fd _AND
+ int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/ft32/fstat.c b/libgloss/ft32/fstat.c
index 77058b2d1..0bd432e58 100644
--- a/libgloss/ft32/fstat.c
+++ b/libgloss/ft32/fstat.c
@@ -20,7 +20,7 @@
*/
int
_DEFUN (_fstat, (fd, buf),
- int fd _AND
+ int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/ft32/isatty.c b/libgloss/ft32/isatty.c
index 449410ebe..fd2d73760 100644
--- a/libgloss/ft32/isatty.c
+++ b/libgloss/ft32/isatty.c
@@ -17,7 +17,7 @@
/*
* isatty -- returns 1 if connected to a terminal device,
* returns 0 if not. Since we're hooked up to a
- * serial port, we'll say yes _AND return a 1.
+ * serial port, we'll say yes and return a 1.
*/
int
_DEFUN (_isatty, (fd),
diff --git a/libgloss/ft32/kill.c b/libgloss/ft32/kill.c
index 765b03e78..4b2241f56 100644
--- a/libgloss/ft32/kill.c
+++ b/libgloss/ft32/kill.c
@@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
*/
int
_DEFUN (_kill, (pid, sig),
- int pid _AND
+ int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/ft32/sim-lseek.S b/libgloss/ft32/sim-lseek.S
index 2dfde1625..c2a134ca1 100644
--- a/libgloss/ft32/sim-lseek.S
+++ b/libgloss/ft32/sim-lseek.S
@@ -23,8 +23,8 @@
*/
off_t
_DEFUN (_lseek, (fd, offset, whence),
- int fd _AND
- off_t offset _AND
+ int fd,
+ off_t offset,
int whence)
{
errno = ESPIPE;
diff --git a/libgloss/ft32/sim-lseek.c b/libgloss/ft32/sim-lseek.c
index 297de2b8a..e5c08c8e7 100644
--- a/libgloss/ft32/sim-lseek.c
+++ b/libgloss/ft32/sim-lseek.c
@@ -23,8 +23,8 @@
*/
off_t
_DEFUN (_lseek, (fd, offset, whence),
- int fd _AND
- off_t offset _AND
+ int fd,
+ off_t offset,
int whence)
{
/* errno = ESPIPE; */
diff --git a/libgloss/ft32/sim-time.c b/libgloss/ft32/sim-time.c
index 25e72a1f4..8f417ebb7 100644
--- a/libgloss/ft32/sim-time.c
+++ b/libgloss/ft32/sim-time.c
@@ -34,7 +34,7 @@ _DEFUN (_times, _times (buf),
*/
int
_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
- struct timeval *tv _AND
+ struct timeval *tv,
void *tzvp)
{
struct timezone *tz = tzvp;
diff --git a/libgloss/ft32/stat.c b/libgloss/ft32/stat.c
index 580e2ca6e..4d738efe2 100644
--- a/libgloss/ft32/stat.c
+++ b/libgloss/ft32/stat.c
@@ -21,7 +21,7 @@
*/
int
_DEFUN (_stat, (path, buf),
- const char *path _AND
+ const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/libgloss/isatty.c b/libgloss/isatty.c
index 2d66cd652..675d99bc2 100644
--- a/libgloss/isatty.c
+++ b/libgloss/isatty.c
@@ -17,7 +17,7 @@
/*
* isatty -- returns 1 if connected to a terminal device,
* returns 0 if not. Since we're hooked up to a
- * serial port, we'll say yes _AND return a 1.
+ * serial port, we'll say yes, return a 1.
*/
int
_DEFUN (isatty, (fd),
diff --git a/libgloss/kill.c b/libgloss/kill.c
index afc1257cf..ada45f6c8 100644
--- a/libgloss/kill.c
+++ b/libgloss/kill.c
@@ -19,7 +19,7 @@
*/
int
_DEFUN (kill, (pid, sig),
- int pid _AND
+ int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/libnosys/chown.c b/libgloss/libnosys/chown.c
index 67f98d59d..0ddb85d03 100644
--- a/libgloss/libnosys/chown.c
+++ b/libgloss/libnosys/chown.c
@@ -13,8 +13,8 @@ extern int errno;
int
_DEFUN (_chown, (path, owner, group),
- const char *path _AND
- uid_t owner _AND
+ const char *path,
+ uid_t owner,
gid_t group)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/execve.c b/libgloss/libnosys/execve.c
index 01743fff9..a93641a34 100644
--- a/libgloss/libnosys/execve.c
+++ b/libgloss/libnosys/execve.c
@@ -12,8 +12,8 @@ extern int errno;
int
_DEFUN (_execve, (name, argv, env),
- char *name _AND
- char **argv _AND
+ char *name,
+ char **argv,
char **env)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/fstat.c b/libgloss/libnosys/fstat.c
index 4e18d4216..d04b40721 100644
--- a/libgloss/libnosys/fstat.c
+++ b/libgloss/libnosys/fstat.c
@@ -14,7 +14,7 @@ extern int errno;
int
_DEFUN (_fstat, (fildes, st),
- int fildes _AND
+ int fildes,
struct stat *st)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/gettod.c b/libgloss/libnosys/gettod.c
index 4d42b4b42..5e0b2db55 100644
--- a/libgloss/libnosys/gettod.c
+++ b/libgloss/libnosys/gettod.c
@@ -16,7 +16,7 @@ struct timeval;
int
_DEFUN (_gettimeofday, (ptimeval, ptimezone),
- struct timeval *ptimeval _AND
+ struct timeval *ptimeval,
void *ptimezone)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/kill.c b/libgloss/libnosys/kill.c
index f1d12c646..c58328794 100644
--- a/libgloss/libnosys/kill.c
+++ b/libgloss/libnosys/kill.c
@@ -12,7 +12,7 @@ extern int errno;
int
_DEFUN (_kill, (pid, sig),
- int pid _AND
+ int pid,
int sig)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/link.c b/libgloss/libnosys/link.c
index 35881cf7f..b27b5bca6 100644
--- a/libgloss/libnosys/link.c
+++ b/libgloss/libnosys/link.c
@@ -12,7 +12,7 @@ extern int errno;
int
_DEFUN (_link, (existing, new),
- char *existing _AND
+ char *existing,
char *new)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/lseek.c b/libgloss/libnosys/lseek.c
index 0aa89e272..f583a1461 100644
--- a/libgloss/libnosys/lseek.c
+++ b/libgloss/libnosys/lseek.c
@@ -12,8 +12,8 @@ extern int errno;
int
_DEFUN (_lseek, (file, ptr, dir),
- int file _AND
- int ptr _AND
+ int file,
+ int ptr,
int dir)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/open.c b/libgloss/libnosys/open.c
index 2c8a6ceb9..ee8becedc 100644
--- a/libgloss/libnosys/open.c
+++ b/libgloss/libnosys/open.c
@@ -12,8 +12,8 @@ extern int errno;
int
_DEFUN (_open, (file, flags, mode),
- char *file _AND
- int flags _AND
+ char *file,
+ int flags,
int mode)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/read.c b/libgloss/libnosys/read.c
index 1a2819c08..0ff3a9a8c 100644
--- a/libgloss/libnosys/read.c
+++ b/libgloss/libnosys/read.c
@@ -12,8 +12,8 @@ extern int errno;
int
_DEFUN (_read, (file, ptr, len),
- int file _AND
- char *ptr _AND
+ int file,
+ char *ptr,
int len)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/readlink.c b/libgloss/libnosys/readlink.c
index 7df253c40..00f3f8982 100644
--- a/libgloss/libnosys/readlink.c
+++ b/libgloss/libnosys/readlink.c
@@ -13,8 +13,8 @@ extern int errno;
int
_DEFUN (_readlink, (path, buf, bufsize),
- const char *path _AND
- char *buf _AND
+ const char *path,
+ char *buf,
size_t bufsize)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/stat.c b/libgloss/libnosys/stat.c
index 7c3463798..9fa7003d1 100644
--- a/libgloss/libnosys/stat.c
+++ b/libgloss/libnosys/stat.c
@@ -14,7 +14,7 @@ extern int errno;
int
_DEFUN (_stat, (file, st),
- const char *file _AND
+ const char *file,
struct stat *st)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/symlink.c b/libgloss/libnosys/symlink.c
index d9e29f2e4..cf7a15896 100644
--- a/libgloss/libnosys/symlink.c
+++ b/libgloss/libnosys/symlink.c
@@ -12,7 +12,7 @@ extern int errno;
int
_DEFUN (_symlink, (path1, path2),
- const char *path1 _AND
+ const char *path1,
const char *path2)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/write.c b/libgloss/libnosys/write.c
index 0136d74ce..0ada7702b 100644
--- a/libgloss/libnosys/write.c
+++ b/libgloss/libnosys/write.c
@@ -12,8 +12,8 @@ extern int errno;
int
_DEFUN (_write, (file, ptr, len),
- int file _AND
- char *ptr _AND
+ int file,
+ char *ptr,
int len)
{
errno = ENOSYS;
diff --git a/libgloss/lseek.c b/libgloss/lseek.c
index 1df36f55e..42a28d966 100644
--- a/libgloss/lseek.c
+++ b/libgloss/lseek.c
@@ -21,8 +21,8 @@
*/
off_t
_DEFUN (lseek, (fd, offset, whence),
- int fd _AND
- off_t offset _AND
+ int fd,
+ off_t offset,
int whence)
{
errno = ESPIPE;
diff --git a/libgloss/mcore/fstat.c b/libgloss/mcore/fstat.c
index 02054641b..6a2323a6e 100644
--- a/libgloss/mcore/fstat.c
+++ b/libgloss/mcore/fstat.c
@@ -20,7 +20,7 @@
*/
int
_DEFUN (_fstat, (fd, buf),
- int fd _AND
+ int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/mcore/kill.c b/libgloss/mcore/kill.c
index 43a359760..8883c8ecd 100644
--- a/libgloss/mcore/kill.c
+++ b/libgloss/mcore/kill.c
@@ -19,7 +19,7 @@
*/
int
_DEFUN (_kill, (pid, sig),
- int pid _AND
+ int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/mcore/lseek.c b/libgloss/mcore/lseek.c
index 0f236fe64..423e11e55 100644
--- a/libgloss/mcore/lseek.c
+++ b/libgloss/mcore/lseek.c
@@ -21,8 +21,8 @@
*/
off_t
_DEFUN (_lseek, (fd, offset, whence),
- int fd _AND
- off_t offset _AND
+ int fd,
+ off_t offset,
int whence)
{
errno = ESPIPE;
diff --git a/libgloss/mcore/open.c b/libgloss/mcore/open.c
index a9e99597f..6b816e891 100644
--- a/libgloss/mcore/open.c
+++ b/libgloss/mcore/open.c
@@ -21,8 +21,8 @@
*/
int
_DEFUN (_open, (buf, flags, mode),
- const char *buf _AND
- int flags _AND
+ const char *buf,
+ int flags,
int mode)
{
errno = EIO;
diff --git a/libgloss/mcore/read.c b/libgloss/mcore/read.c
index 499426d1b..8f394780c 100644
--- a/libgloss/mcore/read.c
+++ b/libgloss/mcore/read.c
@@ -22,8 +22,8 @@ extern char _DEFUN_VOID (inbyte);
*/
int
_DEFUN (_read, (fd, buf, nbytes),
- int fd _AND
- char *buf _AND
+ int fd,
+ char *buf,
int nbytes)
{
int i = 0;
diff --git a/libgloss/mcore/stat.c b/libgloss/mcore/stat.c
index 401a6b50d..d07042a51 100644
--- a/libgloss/mcore/stat.c
+++ b/libgloss/mcore/stat.c
@@ -21,7 +21,7 @@
*/
int
_DEFUN (_stat, (path, buf),
- const char *path _AND
+ const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/libgloss/mcore/write.c b/libgloss/mcore/write.c
index 7f39fd1bb..189ea6222 100644
--- a/libgloss/mcore/write.c
+++ b/libgloss/mcore/write.c
@@ -23,8 +23,8 @@ extern int _EXFUN (outbyte, (char x));
*/
int
_DEFUN (_write, (fd, buf, nbytes),
- int fd _AND
- char *buf _AND
+ int fd,
+ char *buf,
int nbytes)
{
int i;
diff --git a/libgloss/moxie/fstat.c b/libgloss/moxie/fstat.c
index 6464a861b..38dd07b34 100644
--- a/libgloss/moxie/fstat.c
+++ b/libgloss/moxie/fstat.c
@@ -20,7 +20,7 @@
*/
int
_DEFUN (_fstat, (fd, buf),
- int fd _AND
+ int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/moxie/isatty.c b/libgloss/moxie/isatty.c
index 14cb9c42c..73ade0741 100644
--- a/libgloss/moxie/isatty.c
+++ b/libgloss/moxie/isatty.c
@@ -17,7 +17,7 @@
/*
* isatty -- returns 1 if connected to a terminal device,
* returns 0 if not. Since we're hooked up to a
- * serial port, we'll say yes _AND return a 1.
+ * serial port, we'll say yes and return a 1.
*/
int
_DEFUN (_isatty, (fd),
diff --git a/libgloss/moxie/kill.c b/libgloss/moxie/kill.c
index 257c491e0..d602829ce 100644
--- a/libgloss/moxie/kill.c
+++ b/libgloss/moxie/kill.c
@@ -21,7 +21,7 @@ extern void _exit (int) __attribute__((__noreturn__));
*/
int
_DEFUN (_kill, (pid, sig),
- int pid _AND
+ int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/moxie/qemu-time.c b/libgloss/moxie/qemu-time.c
index 4b0920994..1abd5a9f7 100644
--- a/libgloss/moxie/qemu-time.c
+++ b/libgloss/moxie/qemu-time.c
@@ -101,7 +101,7 @@ _DEFUN (time, time (t),
*/
int
_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
- struct timeval *tv _AND
+ struct timeval *tv,
void *tzvp)
{
struct timezone *tz = tzvp;
diff --git a/libgloss/moxie/sim-lseek.S b/libgloss/moxie/sim-lseek.S
index 1c799f872..5e5493cd7 100644
--- a/libgloss/moxie/sim-lseek.S
+++ b/libgloss/moxie/sim-lseek.S
@@ -23,8 +23,8 @@
*/
off_t
_DEFUN (_lseek, (fd, offset, whence),
- int fd _AND
- off_t offset _AND
+ int fd,
+ off_t offset,
int whence)
{
errno = ESPIPE;
diff --git a/libgloss/moxie/sim-lseek.c b/libgloss/moxie/sim-lseek.c
index 8e7ee50e9..d22d7226c 100644
--- a/libgloss/moxie/sim-lseek.c
+++ b/libgloss/moxie/sim-lseek.c
@@ -23,8 +23,8 @@
*/
off_t
_DEFUN (_lseek, (fd, offset, whence),
- int fd _AND
- off_t offset _AND
+ int fd,
+ off_t offset,
int whence)
{
/* errno = ESPIPE; */
diff --git a/libgloss/moxie/sim-time.c b/libgloss/moxie/sim-time.c
index 3e9fafb4b..d3f43d385 100644
--- a/libgloss/moxie/sim-time.c
+++ b/libgloss/moxie/sim-time.c
@@ -65,7 +65,7 @@ _DEFUN (_times, _times (buf),
*/
int
_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
- struct timeval *tv _AND
+ struct timeval *tv,
void *tzvp)
{
struct timezone *tz = tzvp;
diff --git a/libgloss/moxie/stat.c b/libgloss/moxie/stat.c
index 0d7511ae6..01a958210 100644
--- a/libgloss/moxie/stat.c
+++ b/libgloss/moxie/stat.c
@@ -21,7 +21,7 @@
*/
int
_DEFUN (_stat, (path, buf),
- const char *path _AND
+ const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/libgloss/open.c b/libgloss/open.c
index 468b11cd1..90787b1b9 100644
--- a/libgloss/open.c
+++ b/libgloss/open.c
@@ -21,8 +21,8 @@
*/
int
_DEFUN (open, (buf, flags, mode),
- const char *buf _AND
- int flags _AND
+ const char *buf,
+ int flags,
int mode)
{
errno = EIO;
diff --git a/libgloss/read.c b/libgloss/read.c
index 419a8ed64..2e5e0c72c 100644
--- a/libgloss/read.c
+++ b/libgloss/read.c
@@ -22,8 +22,8 @@ extern char _DEFUN_VOID (inbyte);
*/
int
_DEFUN (read, (fd, buf, nbytes),
- int fd _AND
- char *buf _AND
+ int fd,
+ char *buf,
int nbytes)
{
int i = 0;
diff --git a/libgloss/stat.c b/libgloss/stat.c
index ebb7de3f5..5957645c6 100644
--- a/libgloss/stat.c
+++ b/libgloss/stat.c
@@ -21,7 +21,7 @@
*/
int
_DEFUN (stat, (path, buf),
- const char *path _AND
+ const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/libgloss/tic6x/kill.c b/libgloss/tic6x/kill.c
index 3ed228fd2..db5018cfc 100644
--- a/libgloss/tic6x/kill.c
+++ b/libgloss/tic6x/kill.c
@@ -20,7 +20,7 @@
*/
int
_DEFUN (kill, (pid, sig),
- int pid _AND
+ int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/write.c b/libgloss/write.c
index 292a68e53..69f452c34 100644
--- a/libgloss/write.c
+++ b/libgloss/write.c
@@ -23,8 +23,8 @@ extern int _EXFUN (outbyte, (char x));
*/
int
_DEFUN (write, (fd, buf, nbytes),
- int fd _AND
- char *buf _AND
+ int fd,
+ char *buf,
int nbytes)
{
int i;
diff --git a/libgloss/xc16x/misc.c b/libgloss/xc16x/misc.c
index 786db36dd..2eb951a5a 100644
--- a/libgloss/xc16x/misc.c
+++ b/libgloss/xc16x/misc.c
@@ -31,7 +31,7 @@ int _DEFUN(_getpid,(),)
}
int _DEFUN(_kill,(pid, sig),
- int pid _AND
+ int pid,
int sig)
{
errno = ENOSYS;
diff --git a/libgloss/xstormy16/fstat.c b/libgloss/xstormy16/fstat.c
index 982d578cb..2926ccaab 100644
--- a/libgloss/xstormy16/fstat.c
+++ b/libgloss/xstormy16/fstat.c
@@ -20,7 +20,7 @@
*/
int
_DEFUN (_fstat, (fd, buf),
- int fd _AND
+ int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/xstormy16/isatty.c b/libgloss/xstormy16/isatty.c
index e3c32051a..0e92a9f4f 100644
--- a/libgloss/xstormy16/isatty.c
+++ b/libgloss/xstormy16/isatty.c
@@ -17,7 +17,7 @@
/*
* isatty -- returns 1 if connected to a terminal device,
* returns 0 if not. Since we're hooked up to a
- * serial port, we'll say yes _AND return a 1.
+ * serial port, we'll say yes and return a 1.
*/
int
_DEFUN (_isatty, (fd),
diff --git a/libgloss/xstormy16/kill.c b/libgloss/xstormy16/kill.c
index 0bbc0141a..2374dc29d 100644
--- a/libgloss/xstormy16/kill.c
+++ b/libgloss/xstormy16/kill.c
@@ -19,7 +19,7 @@
*/
int
_DEFUN (_kill, (pid, sig),
- int pid _AND
+ int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/xstormy16/lseek.c b/libgloss/xstormy16/lseek.c
index 640a96ea0..11dbab08e 100644
--- a/libgloss/xstormy16/lseek.c
+++ b/libgloss/xstormy16/lseek.c
@@ -21,8 +21,8 @@
*/
off_t
_DEFUN (_lseek, (fd, offset, whence),
- int fd _AND
- off_t offset _AND
+ int fd,
+ off_t offset,
int whence)
{
errno = ESPIPE;
diff --git a/libgloss/xstormy16/open.c b/libgloss/xstormy16/open.c
index a2c318e1a..600f92982 100644
--- a/libgloss/xstormy16/open.c
+++ b/libgloss/xstormy16/open.c
@@ -21,8 +21,8 @@
*/
int
_DEFUN (_open, (buf, flags, mode),
- const char *buf _AND
- int flags _AND
+ const char *buf,
+ int flags,
int mode)
{
errno = EIO;
diff --git a/libgloss/xstormy16/stat.c b/libgloss/xstormy16/stat.c
index c766a341c..b80b83c6c 100644
--- a/libgloss/xstormy16/stat.c
+++ b/libgloss/xstormy16/stat.c
@@ -21,7 +21,7 @@
*/
int
_DEFUN (_stat, (path, buf),
- const char *path _AND
+ const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/newlib/libc/argz/argz_add.c b/newlib/libc/argz/argz_add.c
index 1c3b17025..3194f0851 100644
--- a/newlib/libc/argz/argz_add.c
+++ b/newlib/libc/argz/argz_add.c
@@ -12,8 +12,8 @@
error_t
_DEFUN (argz_add, (argz, argz_len, str),
- char **argz _AND
- size_t *argz_len _AND
+ char **argz,
+ size_t *argz_len,
const char *str)
{
int len_to_add = 0;
diff --git a/newlib/libc/argz/argz_add_sep.c b/newlib/libc/argz/argz_add_sep.c
index 7dfbb4d6e..92c73716d 100644
--- a/newlib/libc/argz/argz_add_sep.c
+++ b/newlib/libc/argz/argz_add_sep.c
@@ -12,9 +12,9 @@
error_t
_DEFUN (argz_add_sep, (argz, argz_len, str, sep),
- char **argz _AND
- size_t *argz_len _AND
- const char *str _AND
+ char **argz,
+ size_t *argz_len,
+ const char *str,
int sep)
{
char *str_argz = 0;
diff --git a/newlib/libc/argz/argz_append.c b/newlib/libc/argz/argz_append.c
index c6c3dbee9..a84f8e0b9 100644
--- a/newlib/libc/argz/argz_append.c
+++ b/newlib/libc/argz/argz_append.c
@@ -12,9 +12,9 @@
error_t
_DEFUN (argz_append, (argz, argz_len, buf, buf_len),
- char **argz _AND
- size_t *argz_len _AND
- const char *buf _AND
+ char **argz,
+ size_t *argz_len,
+ const char *buf,
size_t buf_len)
{
if (buf_len)
diff --git a/newlib/libc/argz/argz_count.c b/newlib/libc/argz/argz_count.c
index 4761275df..33d0eecc2 100644
--- a/newlib/libc/argz/argz_count.c
+++ b/newlib/libc/argz/argz_count.c
@@ -11,7 +11,7 @@
size_t
_DEFUN (argz_count, (argz, argz_len),
- const char *argz _AND
+ const char *argz,
size_t argz_len)
{
int i;
diff --git a/newlib/libc/argz/argz_create.c b/newlib/libc/argz/argz_create.c
index 9d7b2f13d..d4b8b0592 100644
--- a/newlib/libc/argz/argz_create.c
+++ b/newlib/libc/argz/argz_create.c
@@ -12,8 +12,8 @@
error_t
_DEFUN (argz_create, (argv, argz, argz_len),
- char *const argv[] _AND
- char **argz _AND
+ char *const argv[],
+ char **argz,
size_t *argz_len)
{
int argc = 0;
diff --git a/newlib/libc/argz/argz_create_sep.c b/newlib/libc/argz/argz_create_sep.c
index 38866e1d5..afff44c1e 100644
--- a/newlib/libc/argz/argz_create_sep.c
+++ b/newlib/libc/argz/argz_create_sep.c
@@ -12,9 +12,9 @@
error_t
_DEFUN (argz_create_sep, (string, sep, argz, argz_len),
- const char *string _AND
- int sep _AND
- char **argz _AND
+ const char *string,
+ int sep,
+ char **argz,
size_t *argz_len)
{
int len = 0;
diff --git a/newlib/libc/argz/argz_delete.c b/newlib/libc/argz/argz_delete.c
index aa94f6d7a..a4e12273d 100644
--- a/newlib/libc/argz/argz_delete.c
+++ b/newlib/libc/argz/argz_delete.c
@@ -12,8 +12,8 @@
error_t
_DEFUN (argz_delete, (argz, argz_len, entry),
- char **argz _AND
- size_t *argz_len _AND
+ char **argz,
+ size_t *argz_len,
char *entry)
{
int len = 0;
--git a/newlib/libc/argz/argz_extract.c b/newlib/libc/argz/argz_extract.c
index a819f3953..4932de6a9 100644
--- a/newlib/libc/argz/argz_extract.c
+++ b/newlib/libc/argz/argz_extract.c
@@ -10,8 +10,8 @@
void
_DEFUN (argz_extract, (argz, argz_len, argv),
- char *argz _AND
- size_t argz_len _AND
+ char *argz,
+ size_t argz_len,
char **argv)
{
size_t i = 0;
diff --git a/newlib/libc/argz/argz_insert.c b/newlib/libc/argz/argz_insert.c
index d0a32eca9..5965e04a6 100644
--- a/newlib/libc/argz/argz_insert.c
+++ b/newlib/libc/argz/argz_insert.c
@@ -14,9 +14,9 @@
error_t
_DEFUN (argz_insert, (argz, argz_len, before, entry),
- char **argz _AND
- size_t *argz_len _AND
- char *before _AND
+ char **argz,
+ size_t *argz_len,
+ char *before,
const char *entry)
{
int len = 0;
diff --git a/newlib/libc/argz/argz_next.c b/newlib/libc/argz/argz_next.c
index 94852f538..3f672217e 100644
--- a/newlib/libc/argz/argz_next.c
+++ b/newlib/libc/argz/argz_next.c
@@ -12,8 +12,8 @@
char *
_DEFUN (argz_next, (argz, argz_len, entry),
- char *argz _AND
- size_t argz_len _AND
+ char *argz,
+ size_t argz_len,
const char *entry)
{
if (entry)
diff --git a/newlib/libc/argz/argz_replace.c b/newlib/libc/argz/argz_replace.c
index b274f91b6..e6c6ead3e 100644
--- a/newlib/libc/argz/argz_replace.c
+++ b/newlib/libc/argz/argz_replace.c
@@ -14,10 +14,10 @@
error_t
_DEFUN (argz_replace, (argz, argz_len, str, with, replace_count),
- char **argz _AND
- size_t *argz_len _AND
- const char *str _AND
- const char *with _AND
+ char **argz,
+ size_t *argz_len,
+ const char *str,
+ const char *with,
unsigned *replace_count)
{
const int str_len = strlen(str);
diff --git a/newlib/libc/argz/argz_stringify.c b/newlib/libc/argz/argz_stringify.c
index be5f2cf45..72895f5e7 100644
--- a/newlib/libc/argz/argz_stringify.c
+++ b/newlib/libc/argz/argz_stringify.c
@@ -11,8 +11,8 @@
void
_DEFUN (argz_stringify, (argz, argz_len, sep),
- char *argz _AND
- size_t argz_len _AND
+ char *argz,
+ size_t argz_len,
int sep)
{
size_t i;
diff --git a/newlib/libc/argz/envz_add.c b/newlib/libc/argz/envz_add.c
index 3e91a5867..f01d09926 100644
--- a/newlib/libc/argz/envz_add.c
+++ b/newlib/libc/argz/envz_add.c
@@ -13,9 +13,9 @@
error_t
_DEFUN (envz_add, (envz, envz_len, name, value),
- char **envz _AND
- size_t *envz_len _AND
- const char *name _AND
+ char **envz,
+ size_t *envz_len,
+ const char *name,
const char *value)
{
char *concat = NULL;
diff --git a/newlib/libc/argz/envz_entry.c b/newlib/libc/argz/envz_entry.c
index 3d1986ba7..bbe38529e 100644
--- a/newlib/libc/argz/envz_entry.c
+++ b/newlib/libc/argz/envz_entry.c
@@ -14,8 +14,8 @@
char *
_DEFUN (envz_entry, (envz, envz_len, name),
- const char *envz _AND
- size_t envz_len _AND
+ const char *envz,
+ size_t envz_len,
const char *name)
{
char *buf_ptr = (char *)envz;
diff --git a/newlib/libc/argz/envz_get.c b/newlib/libc/argz/envz_get.c
index b4f7c2806..62d3d0cff 100644
--- a/newlib/libc/argz/envz_get.c
+++ b/newlib/libc/argz/envz_get.c
@@ -14,8 +14,8 @@
char *
_DEFUN (envz_get, (envz, envz_len, name),
- const char *envz _AND
- size_t envz_len _AND
+ const char *envz,
+ size_t envz_len,
const char *name)
{
char *buf_ptr = (char *)envz;
diff --git a/newlib/libc/argz/envz_merge.c b/newlib/libc/argz/envz_merge.c
index 8a26bc3c3..9299069e4 100644
--- a/newlib/libc/argz/envz_merge.c
+++ b/newlib/libc/argz/envz_merge.c
@@ -13,10 +13,10 @@
error_t
_DEFUN (envz_merge, (envz, envz_len, envz2, envz2_len, override),
- char **envz _AND
- size_t *envz_len _AND
- const char *envz2 _AND
- size_t envz2_len _AND
+ char **envz,
+ size_t *envz_len,
+ const char *envz2,
+ size_t envz2_len,
int override)
{
char *entry = NULL;
diff --git a/newlib/libc/argz/envz_remove.c b/newlib/libc/argz/envz_remove.c
index 1882297f0..2558656aa 100644
--- a/newlib/libc/argz/envz_remove.c
+++ b/newlib/libc/argz/envz_remove.c
@@ -13,8 +13,8 @@
void
_DEFUN (envz_remove, (envz, envz_len, name),
- char **envz _AND
- size_t *envz_len _AND
+ char **envz,
+ size_t *envz_len,
const char *name)
{
char *entry = NULL;
diff --git a/newlib/libc/argz/envz_strip.c b/newlib/libc/argz/envz_strip.c
index e1c461091..857f8492e 100644
--- a/newlib/libc/argz/envz_strip.c
+++ b/newlib/libc/argz/envz_strip.c
@@ -13,7 +13,7 @@
void
_DEFUN (envz_strip, (envz, envz_len),
- char **envz _AND
+ char **envz,
size_t *envz_len)
{
char *entry = 0;
diff --git a/newlib/libc/ctype/iswctype.c b/newlib/libc/ctype/iswctype.c
index bfa7b003c..89c0f9a31 100644
--- a/newlib/libc/ctype/iswctype.c
+++ b/newlib/libc/ctype/iswctype.c
@@ -38,7 +38,7 @@ No supporting OS subroutines are required.
#include "local.h"
int
-_DEFUN(iswctype,(c, desc), wint_t c _AND wctype_t desc)
+_DEFUN(iswctype,(c, desc), wint_t c, wctype_t desc)
{
switch (desc)
{
diff --git a/newlib/libc/ctype/jp2uc.c b/newlib/libc/ctype/jp2uc.c
index f5bd7dbf2..8fbd1b083 100644
--- a/newlib/libc/ctype/jp2uc.c
+++ b/newlib/libc/ctype/jp2uc.c
@@ -48,7 +48,7 @@
#define JP_EUCJP 3
static wint_t
-_DEFUN (__jp2uc, (c, type), wint_t c _AND int type)
+_DEFUN (__jp2uc, (c, type), wint_t c, int type)
{
int index, adj;
unsigned char byte1, byte2;
diff --git a/newlib/libc/ctype/towctrans.c b/newlib/libc/ctype/towctrans.c
index 5528542ff..3500cbaac 100644
--- a/newlib/libc/ctype/towctrans.c
+++ b/newlib/libc/ctype/towctrans.c
@@ -77,8 +77,8 @@ No supporting OS subroutines are required.
wint_t
_DEFUN (_towctrans_r, (r, c, w),
- struct _reent *r _AND
- wint_t c _AND
+ struct _reent *r,
+ wint_t c,
wctrans_t w)
{
if (w == WCT_TOLOWER)
@@ -95,7 +95,7 @@ _DEFUN (_towctrans_r, (r, c, w),
#ifndef _REENT_ONLY
wint_t
_DEFUN (towctrans, (c, w),
- wint_t c _AND
+ wint_t c,
wctrans_t w)
{
return _towctrans_r (_REENT, c, w);
diff --git a/newlib/libc/ctype/wctrans.c b/newlib/libc/ctype/wctrans.c
index dd5b28c4b..7183c45ca 100644
--- a/newlib/libc/ctype/wctrans.c
+++ b/newlib/libc/ctype/wctrans.c
@@ -76,7 +76,7 @@ No supporting OS subroutines are required.
wctrans_t
_DEFUN (_wctrans_r, (r, c),
- struct _reent *r _AND
+ struct _reent *r,
const char *c)
{
if (!strcmp (c, "tolower"))
diff --git a/newlib/libc/ctype/wctype.c b/newlib/libc/ctype/wctype.c
index c1a70eebb..6cd9425bc 100644
--- a/newlib/libc/ctype/wctype.c
+++ b/newlib/libc/ctype/wctype.c
@@ -77,7 +77,7 @@ No supporting OS subroutines are required.
wctype_t
_DEFUN (_wctype_r, (r, c),
- struct _reent *r _AND
+ struct _reent *r,
const char *c)
{
switch (*c)
diff --git a/newlib/libc/iconv/ces/euc.c b/newlib/libc/iconv/ces/euc.c
index 749269766..62bab771e 100644
--- a/newlib/libc/iconv/ces/euc.c
+++ b/newlib/libc/iconv/ces/euc.c
@@ -102,7 +102,7 @@ static euc_cs_desc_t euc_kr_cs_desc [] =
#if defined (ICONV_FROM_UCS_CES_EUC)
static _VOID_PTR
_DEFUN(euc_from_ucs_init, (rptr, encoding),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_CONST char *encoding)
{
int i;
@@ -166,7 +166,7 @@ error1:
static size_t
_DEFUN(euc_from_ucs_close, (rptr, data),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_VOID_PTR data)
{
int i;
@@ -186,9 +186,9 @@ _DEFUN(euc_from_ucs_close, (rptr, data),
static size_t
_DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data _AND
- register ucs4_t in _AND
- unsigned char **outbuf _AND
+ _VOID_PTR data,
+ register ucs4_t in,
+ unsigned char **outbuf,
size_t *outbytesleft)
{
int i;
@@ -262,7 +262,7 @@ _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_EUC)
static _VOID_PTR
_DEFUN(euc_to_ucs_init, (rptr, encoding),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_CONST char *encoding)
{
int i;
@@ -326,7 +326,7 @@ error1:
static size_t
_DEFUN(euc_to_ucs_close, (rptr, data),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_VOID_PTR data)
{
int i;
@@ -346,8 +346,8 @@ _DEFUN(euc_to_ucs_close, (rptr, data),
static ucs4_t
_DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data _AND
- _CONST unsigned char **inbuf _AND
+ _VOID_PTR data,
+ _CONST unsigned char **inbuf,
size_t *inbytesleft)
{
int i;
diff --git a/newlib/libc/iconv/ces/table-pcs.c b/newlib/libc/iconv/ces/table-pcs.c
index fc46e27f2..650bf9af2 100644
--- a/newlib/libc/iconv/ces/table-pcs.c
+++ b/newlib/libc/iconv/ces/table-pcs.c
@@ -41,9 +41,9 @@
#if defined (ICONV_FROM_UCS_CES_TABLE_PCS)
static size_t
_DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data _AND
- ucs4_t in _AND
- unsigned char **outbuf _AND
+ _VOID_PTR data,
+ ucs4_t in,
+ unsigned char **outbuf,
size_t *outbytesleft)
{
if (*outbytesleft < 1)
@@ -66,7 +66,7 @@ _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
static _VOID_PTR
_DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_CONST char *encoding)
{
return _iconv_from_ucs_ces_handlers_table.init (rptr, encoding);
@@ -74,7 +74,7 @@ _DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
static size_t
_DEFUN(table_pcs_from_ucs_close, (rptr, data),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_VOID_PTR data)
{
return _iconv_from_ucs_ces_handlers_table.close (rptr, data);
@@ -92,8 +92,8 @@ _DEFUN(table_pcs_from_ucs_get_mb_cur_max, (data),
#if defined (ICONV_TO_UCS_CES_TABLE_PCS)
static ucs4_t
_DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data _AND
- _CONST unsigned char **inbuf _AND
+ _VOID_PTR data,
+ _CONST unsigned char **inbuf,
size_t *inbytesleft)
{
if (*inbytesleft < 1)
@@ -114,7 +114,7 @@ _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
static _VOID_PTR
_DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_CONST char *encoding)
{
return _iconv_to_ucs_ces_handlers_table.init (rptr, encoding);
@@ -122,7 +122,7 @@ _DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
static size_t
_DEFUN(table_pcs_to_ucs_close, (rptr, data),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_VOID_PTR data)
{
return _iconv_to_ucs_ces_handlers_table.close (rptr, data);
diff --git a/newlib/libc/iconv/ces/table.c b/newlib/libc/iconv/ces/table.c
index e43e23faa..39c358cda 100644
--- a/newlib/libc/iconv/ces/table.c
+++ b/newlib/libc/iconv/ces/table.c
@@ -75,7 +75,7 @@ _EXFUN(load_file, (struct _reent *rptr, _CONST char *name, int direction));
*/
static size_t
_DEFUN(table_close, (rptr, data),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_VOID_PTR data)
{
_CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
@@ -90,7 +90,7 @@ _DEFUN(table_close, (rptr, data),
#if defined (ICONV_FROM_UCS_CES_TABLE)
static _VOID_PTR
_DEFUN(table_init_from_ucs, (rptr, encoding),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_CONST char *encoding)
{
int i;
@@ -128,9 +128,9 @@ _DEFUN(table_init_from_ucs, (rptr, encoding),
static size_t
_DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data _AND
- ucs4_t in _AND
- unsigned char **outbuf _AND
+ _VOID_PTR data,
+ ucs4_t in,
+ unsigned char **outbuf,
size_t *outbytesleft)
{
_CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
@@ -173,7 +173,7 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_TABLE)
static _VOID_PTR
_DEFUN(table_init_to_ucs, (rptr, encoding),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_CONST char *encoding)
{
int i;
@@ -211,8 +211,8 @@ _DEFUN(table_init_to_ucs, (rptr, encoding),
static ucs4_t
_DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data _AND
- _CONST unsigned char **inbuf _AND
+ _VOID_PTR data,
+ _CONST unsigned char **inbuf,
size_t *inbytesleft)
{
_CONST iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
@@ -304,7 +304,7 @@ _iconv_from_ucs_ces_handlers_table =
*/
static __inline ucs2_t
_DEFUN(find_code_speed, (code, tblp),
- ucs2_t code _AND
+ ucs2_t code,
_CONST __uint16_t *tblp)
{
int idx = tblp[code >> 8];
@@ -327,7 +327,7 @@ _DEFUN(find_code_speed, (code, tblp),
*/
static __inline ucs2_t
_DEFUN(find_code_speed_8bit, (code, tblp),
- ucs2_t code _AND
+ ucs2_t code,
_CONST unsigned char *tblp)
{
int idx;
@@ -367,7 +367,7 @@ _DEFUN(find_code_speed_8bit, (code, tblp),
*/
static ucs2_t
_DEFUN(find_code_size, (code, tblp),
- ucs2_t code _AND
+ ucs2_t code,
_CONST __uint16_t *tblp)
{
int first, last, cur, center;
@@ -461,8 +461,8 @@ _DEFUN(find_code_size, (code, tblp),
*/
static _CONST iconv_ccs_desc_t *
_DEFUN(load_file, (rptr, name, direction),
- struct _reent *rptr _AND
- _CONST char *name _AND
+ struct _reent *rptr,
+ _CONST char *name,
int direction)
{
int fd;
diff --git a/newlib/libc/iconv/ces/ucs-2-internal.c b/newlib/libc/iconv/ces/ucs-2-internal.c
index 893bdd429..2aacce912 100644
--- a/newlib/libc/iconv/ces/ucs-2-internal.c
+++ b/newlib/libc/iconv/ces/ucs-2-internal.c
@@ -45,9 +45,9 @@
#if defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
static size_t
_DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data _AND
- register ucs4_t in _AND
- unsigned char **outbuf _AND
+ _VOID_PTR data,
+ register ucs4_t in,
+ unsigned char **outbuf,
size_t *outbytesleft)
{
if (in > 0x0000FFFF)
@@ -67,8 +67,8 @@ _DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL)
static ucs4_t
_DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data _AND
- _CONST unsigned char **inbuf _AND
+ _VOID_PTR data,
+ _CONST unsigned char **inbuf,
size_t *inbytesleft)
{
register ucs4_t res;
diff --git a/newlib/libc/iconv/ces/ucs-2.c b/newlib/libc/iconv/ces/ucs-2.c
index 6f796ca54..000a7912f 100644
--- a/newlib/libc/iconv/ces/ucs-2.c
+++ b/newlib/libc/iconv/ces/ucs-2.c
@@ -51,7 +51,7 @@
static _VOID_PTR
_DEFUN(ucs_2_init, (rptr, encoding),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_CONST char *encoding)
{
int *data;
@@ -69,7 +69,7 @@ _DEFUN(ucs_2_init, (rptr, encoding),
static size_t
_DEFUN(ucs_2_close, (rptr, data),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_VOID_PTR data)
{
_free_r (rptr, data);
@@ -79,9 +79,9 @@ _DEFUN(ucs_2_close, (rptr, data),
#if defined (ICONV_FROM_UCS_CES_UCS_2)
static size_t
_DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data _AND
- ucs4_t in _AND
- unsigned char **outbuf _AND
+ _VOID_PTR data,
+ ucs4_t in,
+ unsigned char **outbuf,
size_t *outbytesleft)
{
if ((in >= 0x0000D800 && in <= 0x0000DFFF) /* Surrogate character */
@@ -106,8 +106,8 @@ _DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UCS_2)
static ucs4_t
_DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data _AND
- _CONST unsigned char **inbuf _AND
+ _VOID_PTR data,
+ _CONST unsigned char **inbuf,
size_t *inbytesleft)
{
ucs4_t res;
diff --git a/newlib/libc/iconv/ces/ucs-4-internal.c b/newlib/libc/iconv/ces/ucs-4-internal.c
index d8df9b157..4266b2afc 100644
--- a/newlib/libc/iconv/ces/ucs-4-internal.c
+++ b/newlib/libc/iconv/ces/ucs-4-internal.c
@@ -45,9 +45,9 @@
#if defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
static size_t
_DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data _AND
- register ucs4_t in _AND
- unsigned char **outbuf _AND
+ _VOID_PTR data,
+ register ucs4_t in,
+ unsigned char **outbuf,
size_t *outbytesleft)
{
if (in > 0x7FFFFFFF)
@@ -67,8 +67,8 @@ _DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL)
static ucs4_t
_DEFUN(ucs_4_internal_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data _AND
- _CONST unsigned char **inbuf _AND
+ _VOID_PTR data,
+ _CONST unsigned char **inbuf,
size_t *inbytesleft)
{
register ucs4_t res;
diff --git a/newlib/libc/iconv/ces/ucs-4.c b/newlib/libc/iconv/ces/ucs-4.c
index cfa7b367d..1d028c5dd 100644
--- a/newlib/libc/iconv/ces/ucs-4.c
+++ b/newlib/libc/iconv/ces/ucs-4.c
@@ -52,7 +52,7 @@
static _VOID_PTR
_DEFUN(ucs_4_init, (rptr, encoding),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_CONST char *encoding)
{
int *data;
@@ -70,7 +70,7 @@ _DEFUN(ucs_4_init, (rptr, encoding),
static size_t
_DEFUN(ucs_4_close, (rptr, data),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_VOID_PTR data)
{
_free_r(rptr, data);
@@ -81,9 +81,9 @@ _DEFUN(ucs_4_close, (rptr, data),
#if defined (ICONV_FROM_UCS_CES_UCS_4)
static size_t
_DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data _AND
- ucs4_t in _AND
- unsigned char **outbuf _AND
+ _VOID_PTR data,
+ ucs4_t in,
+ unsigned char **outbuf,
size_t *outbytesleft)
{
if ((in >= 0x0000D800 && in <= 0x0000DFFF) /* Surrogate character */
@@ -108,8 +108,8 @@ _DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UCS_4)
static ucs4_t
_DEFUN(ucs_4_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data _AND
- _CONST unsigned char **inbuf _AND
+ _VOID_PTR data,
+ _CONST unsigned char **inbuf,
size_t *inbytesleft)
{
ucs4_t res;
diff --git a/newlib/libc/iconv/ces/us-ascii.c b/newlib/libc/iconv/ces/us-ascii.c
index 2f213a7ed..eb4dee6e3 100644
--- a/newlib/libc/iconv/ces/us-ascii.c
+++ b/newlib/libc/iconv/ces/us-ascii.c
@@ -41,9 +41,9 @@
#if defined (ICONV_FROM_UCS_CES_US_ASCII)
static size_t
_DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data _AND
- ucs4_t in _AND
- unsigned char **outbuf _AND
+ _VOID_PTR data,
+ ucs4_t in,
+ unsigned char **outbuf,
size_t *outbytesleft)
{
if (in > 0x7F)
@@ -61,8 +61,8 @@ _DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_US_ASCII)
static ucs4_t
_DEFUN(us_ascii_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data _AND
- _CONST unsigned char **inbuf _AND
+ _VOID_PTR data,
+ _CONST unsigned char **inbuf,
size_t *inbytesleft)
{
ucs4_t res;
diff --git a/newlib/libc/iconv/ces/utf-16.c b/newlib/libc/iconv/ces/utf-16.c
index 4b2ff77a1..93cc4c341 100644
--- a/newlib/libc/iconv/ces/utf-16.c
+++ b/newlib/libc/iconv/ces/utf-16.c
@@ -59,7 +59,7 @@
static size_t
_DEFUN(utf_16_close, (rptr, data),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_VOID_PTR data)
{
_free_r(rptr, data);
@@ -69,7 +69,7 @@ _DEFUN(utf_16_close, (rptr, data),
#if defined (ICONV_FROM_UCS_CES_UTF_16)
static _VOID_PTR
_DEFUN(utf_16_init_from_ucs, (rptr, encoding),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_CONST char *encoding)
{
int *data;
@@ -89,9 +89,9 @@ _DEFUN(utf_16_init_from_ucs, (rptr, encoding),
static size_t
_DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data _AND
- register ucs4_t in _AND
- unsigned char **outbuf _AND
+ _VOID_PTR data,
+ register ucs4_t in,
+ unsigned char **outbuf,
size_t *outbytesleft)
{
register ucs2_t *cp;
@@ -171,7 +171,7 @@ _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UTF_16)
static _VOID_PTR
_DEFUN(utf_16_init_to_ucs, (rptr, encoding),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_CONST char *encoding)
{
int *data;
@@ -191,8 +191,8 @@ _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
static ucs4_t
_DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data _AND
- _CONST unsigned char **inbuf _AND
+ _VOID_PTR data,
+ _CONST unsigned char **inbuf,
size_t *inbytesleft)
{
register ucs2_t w1;
diff --git a/newlib/libc/iconv/ces/utf-8.c b/newlib/libc/iconv/ces/utf-8.c
index fda1e6e3b..f02dd6fcc 100644
--- a/newlib/libc/iconv/ces/utf-8.c
+++ b/newlib/libc/iconv/ces/utf-8.c
@@ -44,9 +44,9 @@
#if defined (ICONV_FROM_UCS_CES_UTF_8)
static size_t
_DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
- _VOID_PTR data _AND
- register ucs4_t in _AND
- unsigned char **outbuf _AND
+ _VOID_PTR data,
+ register ucs4_t in,
+ unsigned char **outbuf,
size_t *outbytesleft)
{
register unsigned char *cp;
@@ -126,8 +126,8 @@ _DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UTF_8)
static ucs4_t
_DEFUN(convert_to_ucs, (data, inbuf, inbytesleft),
- _VOID_PTR data _AND
- _CONST unsigned char **inbuf _AND
+ _VOID_PTR data,
+ _CONST unsigned char **inbuf,
size_t *inbytesleft)
{
register _CONST unsigned char *in = *inbuf;
diff --git a/newlib/libc/iconv/lib/aliasesi.c b/newlib/libc/iconv/lib/aliasesi.c
index 41497c608..278b84915 100644
--- a/newlib/libc/iconv/lib/aliasesi.c
+++ b/newlib/libc/iconv/lib/aliasesi.c
@@ -49,7 +49,7 @@
*/
static _CONST char *
_DEFUN(canonical_form, (rptr, str),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_CONST char *str)
{
char *p, *p1;
@@ -94,9 +94,9 @@ _DEFUN(canonical_form, (rptr, str),
*/
static char *
_DEFUN(find_alias, (rptr, alias, table, len),
- struct _reent *rptr _AND
- _CONST char *alias _AND
- _CONST char *table _AND
+ struct _reent *rptr,
+ _CONST char *alias,
+ _CONST char *table,
int len)
{
_CONST char *end;
@@ -148,7 +148,7 @@ search_again:
*/
char *
_DEFUN(_iconv_resolve_encoding_name, (rptr, cname, path),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_CONST char *ca)
{
char *p = (char *)ca;
diff --git a/newlib/libc/iconv/lib/iconv.c b/newlib/libc/iconv/lib/iconv.c
index 9d9d6a717..b8000e4be 100644
--- a/newlib/libc/iconv/lib/iconv.c
+++ b/newlib/libc/iconv/lib/iconv.c
@@ -121,7 +121,7 @@ No supporting OS subroutine calls are required.
iconv_t
_DEFUN(iconv_open, (to, from),
- _CONST char *to _AND
+ _CONST char *to,
_CONST char *from)
{
return _iconv_open_r (_REENT, to, from);
@@ -130,10 +130,10 @@ _DEFUN(iconv_open, (to, from),
size_t
_DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft),
- iconv_t cd _AND
- char **__restrict inbuf _AND
- size_t *__restrict inbytesleft _AND
- char **__restrict outbuf _AND
+ iconv_t cd,
+ char **__restrict inbuf,
+ size_t *__restrict inbytesleft,
+ char **__restrict outbuf,
size_t *__restrict outbytesleft)
{
return _iconv_r (_REENT, cd, (_CONST char **) inbuf, inbytesleft,
@@ -151,8 +151,8 @@ _DEFUN(iconv_close, (cd), iconv_t cd)
#ifndef _REENT_ONLY
iconv_t
_DEFUN(_iconv_open_r, (rptr, to, from),
- struct _reent *rptr _AND
- _CONST char *to _AND
+ struct _reent *rptr,
+ _CONST char *to,
_CONST char *from)
{
iconv_conversion_t *ic;
@@ -202,11 +202,11 @@ _DEFUN(_iconv_open_r, (rptr, to, from),
size_t
_DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
- struct _reent *rptr _AND
- iconv_t cd _AND
- _CONST char **inbuf _AND
- size_t *inbytesleft _AND
- char **outbuf _AND
+ struct _reent *rptr,
+ iconv_t cd,
+ _CONST char **inbuf,
+ size_t *inbytesleft,
+ char **outbuf,
size_t *outbytesleft)
{
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -289,7 +289,7 @@ _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
int
_DEFUN(_iconv_close_r, (rptr, cd),
- struct _reent *rptr _AND
+ struct _reent *rptr,
iconv_t cd)
{
int res;
diff --git a/newlib/libc/iconv/lib/iconvnls.c b/newlib/libc/iconv/lib/iconvnls.c
index 1b42f2c7b..3223e1303 100644
--- a/newlib/libc/iconv/lib/iconvnls.c
+++ b/newlib/libc/iconv/lib/iconvnls.c
@@ -60,9 +60,9 @@
*/
_CONST char *
_DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
- struct _reent *rptr _AND
- _CONST char *file _AND
- _CONST char *dir _AND
+ struct _reent *rptr,
+ _CONST char *file,
+ _CONST char *dir,
_CONST char *ext)
{
int len1, len2, len3;
@@ -115,7 +115,7 @@ _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
*/
int
_DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction),
- iconv_t cd _AND
+ iconv_t cd,
int direction)
{
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -138,7 +138,7 @@ _DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction),
*/
int
_DEFUN(_iconv_nls_is_stateful, (cd, direction),
- iconv_t cd _AND
+ iconv_t cd,
int direction)
{
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -167,11 +167,11 @@ _DEFUN(_iconv_nls_is_stateful, (cd, direction),
*/
size_t
_DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
- struct _reent *rptr _AND
- iconv_t cd _AND
- _CONST char **inbuf _AND
- size_t *inbytesleft _AND
- char **outbuf _AND
+ struct _reent *rptr,
+ iconv_t cd,
+ _CONST char **inbuf,
+ size_t *inbytesleft,
+ char **outbuf,
size_t *outbytesleft)
{
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -221,8 +221,8 @@ _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
*/
_VOID
_DEFUN(_iconv_nls_get_state, (cd, ps, direction),
- iconv_t cd _AND
- mbstate_t *ps _AND
+ iconv_t cd,
+ mbstate_t *ps,
int direction)
{
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -248,8 +248,8 @@ _DEFUN(_iconv_nls_get_state, (cd, ps, direction),
*/
int
_DEFUN(_iconv_nls_set_state, (cd, ps, direction),
- iconv_t cd _AND
- mbstate_t *ps _AND
+ iconv_t cd,
+ mbstate_t *ps,
int direction)
{
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -260,8 +260,8 @@ _DEFUN(_iconv_nls_set_state, (cd, ps, direction),
/* Same as iconv_open() but don't perform name resolving */
static iconv_t
_DEFUN(iconv_open1, (rptr, to, from),
- struct _reent *rptr _AND
- _CONST char *to _AND
+ struct _reent *rptr,
+ _CONST char *to,
_CONST char *from)
{
iconv_conversion_t *ic;
@@ -317,10 +317,10 @@ _DEFUN(iconv_open1, (rptr, to, from),
*/
int
_DEFUN(_iconv_nls_open, (rptr, encoding, towc, tomb),
- struct _reent *rptr _AND
- _CONST char *encoding _AND
- iconv_t *tomb _AND
- iconv_t *towc _AND
+ struct _reent *rptr,
+ _CONST char *encoding,
+ iconv_t *tomb,
+ iconv_t *towc,
int flag)
{
_CONST char *wchar_encoding;
diff --git a/newlib/libc/iconv/lib/nullconv.c b/newlib/libc/iconv/lib/nullconv.c
index d35027f9c..7ddbc77bd 100644
--- a/newlib/libc/iconv/lib/nullconv.c
+++ b/newlib/libc/iconv/lib/nullconv.c
@@ -37,8 +37,8 @@ static int null_conversion_dummy_data;
static _VOID_PTR
_DEFUN(null_conversion_open, (rptr, to, from),
- struct _reent *rptr _AND
- _CONST char *to _AND
+ struct _reent *rptr,
+ _CONST char *to,
_CONST char *from)
{
return (_VOID_PTR)&null_conversion_dummy_data;
@@ -47,7 +47,7 @@ _DEFUN(null_conversion_open, (rptr, to, from),
static size_t
_DEFUN(null_conversion_close, (rptr, data),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_VOID_PTR data)
{
return 0;
@@ -57,12 +57,12 @@ _DEFUN(null_conversion_close, (rptr, data),
static size_t
_DEFUN(null_conversion_convert,
(rptr, data, inbuf, inbytesleft, outbuf, outbytesleft),
- struct _reent *rptr _AND
- _VOID_PTR data _AND
- _CONST unsigned char **inbuf _AND
- size_t *inbytesleft _AND
- unsigned char **outbuf _AND
- size_t *outbytesleft _AND
+ struct _reent *rptr,
+ _VOID_PTR data,
+ _CONST unsigned char **inbuf,
+ size_t *inbytesleft,
+ unsigned char **outbuf,
+ size_t *outbytesleft,
int flags)
{
size_t result;
@@ -94,7 +94,7 @@ _DEFUN(null_conversion_convert,
static int
_DEFUN(null_conversion_get_mb_cur_max, (data, direction),
- _VOID_PTR data _AND
+ _VOID_PTR data,
int direction)
{
return ICONV_MB_LEN_MAX;
@@ -103,8 +103,8 @@ _DEFUN(null_conversion_get_mb_cur_max, (data, direction),
static _VOID
_DEFUN(null_conversion_get_state, (data, state, size),
- _VOID_PTR data _AND
- mbstate_t *state _AND
+ _VOID_PTR data,
+ mbstate_t *state,
int direction)
{
return;
@@ -113,8 +113,8 @@ _DEFUN(null_conversion_get_state, (data, state, size),
static int
_DEFUN(null_conversion_set_state, (data, state, direction),
- _VOID_PTR data _AND
- mbstate_t *state _AND
+ _VOID_PTR data,
+ mbstate_t *state,
int direction)
{
return 0;
@@ -122,7 +122,7 @@ _DEFUN(null_conversion_set_state, (data, state, direction),
static int
_DEFUN(null_conversion_is_stateful, (data, direction),
- _VOID_PTR data _AND
+ _VOID_PTR data,
int direction)
{
return 0;
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index cc5ceb953..46ad33efe 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -46,8 +46,8 @@ _EXFUN(find_encoding_name, (_CONST char *searchee,
static _VOID_PTR
_DEFUN(ucs_based_conversion_open, (rptr, to, from),
- struct _reent *rptr _AND
- _CONST char *to _AND
+ struct _reent *rptr,
+ _CONST char *to,
_CONST char *from)
{
iconv_ucs_conversion_t *uc;
@@ -124,7 +124,7 @@ error:
static size_t
_DEFUN(ucs_based_conversion_close, (rptr, data),
- struct _reent *rptr _AND
+ struct _reent *rptr,
_VOID_PTR data)
{
iconv_ucs_conversion_t *uc;
@@ -146,12 +146,12 @@ _DEFUN(ucs_based_conversion_close, (rptr, data),
static size_t
_DEFUN(ucs_based_conversion_convert,
(rptr, data, inbuf, inbytesleft, outbuf, outbytesleft, flags),
- struct _reent *rptr _AND
- _VOID_PTR data _AND
- _CONST unsigned char **inbuf _AND
- size_t *inbytesleft _AND
- unsigned char **outbuf _AND
- size_t *outbytesleft _AND
+ struct _reent *rptr,
+ _VOID_PTR data,
+ _CONST unsigned char **inbuf,
+ size_t *inbytesleft,
+ unsigned char **outbuf,
+ size_t *outbytesleft,
int flags)
{
unsigned char outbuf1[ICONV_MB_LEN_MAX];
@@ -239,7 +239,7 @@ _DEFUN(ucs_based_conversion_convert,
static int
_DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
- _VOID_PTR data _AND
+ _VOID_PTR data,
int direction)
{
iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -253,8 +253,8 @@ _DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
static _VOID
_DEFUN(ucs_based_conversion_get_state, (data, state, direction),
- _VOID_PTR data _AND
- mbstate_t *state _AND
+ _VOID_PTR data,
+ mbstate_t *state,
int direction)
{
iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -281,8 +281,8 @@ _DEFUN(ucs_based_conversion_get_state, (data, state, direction),
static int
_DEFUN(ucs_based_conversion_set_state, (data, state, direction),
- _VOID_PTR data _AND
- mbstate_t *state _AND
+ _VOID_PTR data,
+ mbstate_t *state,
int direction)
{
iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -303,7 +303,7 @@ _DEFUN(ucs_based_conversion_set_state, (data, state, direction),
static int
_DEFUN(ucs_based_conversion_is_stateful, (data, direction),
- _VOID_PTR data _AND
+ _VOID_PTR data,
int direction)
{
iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -343,7 +343,7 @@ _iconv_ucs_conversion_handlers =
static int
_DEFUN(find_encoding_name, (searchee, names),
- _CONST char *searchee _AND
+ _CONST char *searchee,
_CONST char **names)
{
_CONST char *p;
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index 5fb990700..fc832fc40 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -48,7 +48,6 @@
#ifdef _HAVE_STDC
#define _PTR void *
-#define _AND ,
#define _NOARGS void
#define _CONST const
#define _VOLATILE volatile
@@ -77,7 +76,6 @@
#endif
#else
#define _PTR char *
-#define _AND ;
#define _NOARGS
#define _CONST
#define _VOLATILE
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index 073189a29..87cb04b35 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -290,8 +290,8 @@ static char *currentlocale (void);
char *
_DEFUN(_setlocale_r, (p, category, locale),
- struct _reent *p _AND
- int category _AND
+ struct _reent *p,
+ int category,
_CONST char *locale)
{
#ifndef _MB_CAPABLE
@@ -991,7 +991,7 @@ __locale_ctype_ptr (void)
char *
_DEFUN (setlocale, (category, locale),
- int category _AND
+ int category,
_CONST char *locale)
{
return _setlocale_r (_REENT, category, locale);
diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c
index fc7dc2143..a2751af85 100644
--- a/newlib/libc/machine/microblaze/strcmp.c
+++ b/newlib/libc/machine/microblaze/strcmp.c
@@ -82,7 +82,7 @@ QUICKREF
int
_DEFUN (strcmp, (s1, s2),
- _CONST char *s1 _AND
+ _CONST char *s1,
_CONST char *s2)
{
diff --git a/newlib/libc/machine/microblaze/strcpy.c b/newlib/libc/machine/microblaze/strcpy.c
index 44ba382c7..e0e1d7760 100644
--- a/newlib/libc/machine/microblaze/strcpy.c
+++ b/newlib/libc/machine/microblaze/strcpy.c
@@ -82,7 +82,7 @@ QUICKREF
char*
_DEFUN (strcpy, (dst0, src0),
- char *__restrict dst0 _AND
+ char *__restrict dst0,
_CONST char *__restrict src0)
{
diff --git a/newlib/libc/machine/powerpc/atosfix16.c b/newlib/libc/machine/powerpc/atosfix16.c
index 30379c579..5115c85e2 100644
--- a/newlib/libc/machine/powerpc/atosfix16.c
+++ b/newlib/libc/machine/powerpc/atosfix16.c
@@ -63,7 +63,7 @@ PORTABILITY
__int16_t
_DEFUN (_atosfix16_r, (reent, s),
- struct _reent *reent _AND
+ struct _reent *reent,
_CONST char *s)
{
return _strtosfix16_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/atosfix32.c b/newlib/libc/machine/powerpc/atosfix32.c
index dbcac7e2f..49f4cce20 100644
--- a/newlib/libc/machine/powerpc/atosfix32.c
+++ b/newlib/libc/machine/powerpc/atosfix32.c
@@ -9,7 +9,7 @@
__int32_t
_DEFUN (_atosfix32_r, (reent, s),
- struct _reent *reent _AND
+ struct _reent *reent,
_CONST char *s)
{
return _strtosfix32_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/atosfix64.c b/newlib/libc/machine/powerpc/atosfix64.c
index 109baf7b6..b433778e7 100644
--- a/newlib/libc/machine/powerpc/atosfix64.c
+++ b/newlib/libc/machine/powerpc/atosfix64.c
@@ -9,7 +9,7 @@
__int64_t
_DEFUN (_atosfix64_r, (reent, s),
- struct _reent *reent _AND
+ struct _reent *reent,
_CONST char *s)
{
return _strtosfix64_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/atoufix16.c b/newlib/libc/machine/powerpc/atoufix16.c
index 45d130fac..5148acb7d 100644
--- a/newlib/libc/machine/powerpc/atoufix16.c
+++ b/newlib/libc/machine/powerpc/atoufix16.c
@@ -63,7 +63,7 @@ PORTABILITY
__uint16_t
_DEFUN (_atoufix16_r, (reent, s),
- struct _reent *reent _AND
+ struct _reent *reent,
_CONST char *s)
{
return _strtoufix16_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/atoufix32.c b/newlib/libc/machine/powerpc/atoufix32.c
index ee29ac586..01919d406 100644
--- a/newlib/libc/machine/powerpc/atoufix32.c
+++ b/newlib/libc/machine/powerpc/atoufix32.c
@@ -9,7 +9,7 @@
__uint32_t
_DEFUN (_atoufix32_r, (reent, s),
- struct _reent *reent _AND
+ struct _reent *reent,
_CONST char *s)
{
return _strtoufix32_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/atoufix64.c b/newlib/libc/machine/powerpc/atoufix64.c
index e5eefc423..af71089a6 100644
--- a/newlib/libc/machine/powerpc/atoufix64.c
+++ b/newlib/libc/machine/powerpc/atoufix64.c
@@ -9,7 +9,7 @@
__uint64_t
_DEFUN (_atoufix64_r, (reent, s),
- struct _reent *reent _AND
+ struct _reent *reent,
_CONST char *s)
{
return _strtoufix64_r (reent, s, NULL);
diff --git a/newlib/libc/machine/powerpc/strtosfix16.c b/newlib/libc/machine/powerpc/strtosfix16.c
index e39887dc1..84e1171b9 100644
--- a/newlib/libc/machine/powerpc/strtosfix16.c
+++ b/newlib/libc/machine/powerpc/strtosfix16.c
@@ -93,8 +93,8 @@ PORTABILITY
*/
__int16_t
_DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
- struct _reent *rptr _AND
- _CONST char *nptr _AND
+ struct _reent *rptr,
+ _CONST char *nptr,
char **endptr)
{
union double_union dbl;
@@ -170,7 +170,7 @@ _DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
__int16_t
_DEFUN (strtosfix16, (s, ptr, base),
- _CONST char *s _AND
+ _CONST char *s,
char **ptr)
{
return _strtosfix16_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtosfix32.c b/newlib/libc/machine/powerpc/strtosfix32.c
index 2e22c1458..1b1487b1a 100644
--- a/newlib/libc/machine/powerpc/strtosfix32.c
+++ b/newlib/libc/machine/powerpc/strtosfix32.c
@@ -14,8 +14,8 @@
*/
__int32_t
_DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
- struct _reent *rptr _AND
- _CONST char *nptr _AND
+ struct _reent *rptr,
+ _CONST char *nptr,
char **endptr)
{
union double_union dbl;
@@ -93,7 +93,7 @@ _DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
__int32_t
_DEFUN (strtosfix32, (s, ptr, base),
- _CONST char *s _AND
+ _CONST char *s,
char **ptr)
{
return _strtosfix32_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtosfix64.c b/newlib/libc/machine/powerpc/strtosfix64.c
index 3006632a4..4ba718c03 100644
--- a/newlib/libc/machine/powerpc/strtosfix64.c
+++ b/newlib/libc/machine/powerpc/strtosfix64.c
@@ -14,8 +14,8 @@
*/
__int64_t
_DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
- struct _reent *rptr _AND
- _CONST char *nptr _AND
+ struct _reent *rptr,
+ _CONST char *nptr,
char **endptr)
{
union long_double_union ldbl;
@@ -106,7 +106,7 @@ _DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
__int64_t
_DEFUN (strtosfix64, (s, ptr, base),
- _CONST char *s _AND
+ _CONST char *s,
char **ptr)
{
return _strtosfix64_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix16.c b/newlib/libc/machine/powerpc/strtoufix16.c
index 3bf2d6b29..22de506e3 100644
--- a/newlib/libc/machine/powerpc/strtoufix16.c
+++ b/newlib/libc/machine/powerpc/strtoufix16.c
@@ -92,8 +92,8 @@ PORTABILITY
*/
__uint16_t
_DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
- struct _reent *rptr _AND
- _CONST char *nptr _AND
+ struct _reent *rptr,
+ _CONST char *nptr,
char **endptr)
{
union double_union dbl;
@@ -161,7 +161,7 @@ _DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
__uint16_t
_DEFUN (strtoufix16, (s, ptr, base),
- _CONST char *s _AND
+ _CONST char *s,
char **ptr)
{
return _strtoufix16_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix32.c b/newlib/libc/machine/powerpc/strtoufix32.c
index 6a8e0812f..05e96675f 100644
--- a/newlib/libc/machine/powerpc/strtoufix32.c
+++ b/newlib/libc/machine/powerpc/strtoufix32.c
@@ -14,8 +14,8 @@
*/
__uint32_t
_DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
- struct _reent *rptr _AND
- _CONST char *nptr _AND
+ struct _reent *rptr,
+ _CONST char *nptr,
char **endptr)
{
union double_union dbl;
@@ -90,7 +90,7 @@ _DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
__uint32_t
_DEFUN (strtoufix32, (s, ptr, base),
- _CONST char *s _AND
+ _CONST char *s,
char **ptr)
{
return _strtoufix32_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix64.c b/newlib/libc/machine/powerpc/strtoufix64.c
index 539f953a4..5ef53846f 100644
--- a/newlib/libc/machine/powerpc/strtoufix64.c
+++ b/newlib/libc/machine/powerpc/strtoufix64.c
@@ -14,8 +14,8 @@
*/
__uint64_t
_DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
- struct _reent *rptr _AND
- _CONST char *nptr _AND
+ struct _reent *rptr,
+ _CONST char *nptr,
char **endptr)
{
union long_double_union ldbl;
@@ -105,7 +105,7 @@ _DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
__uint64_t
_DEFUN (strtoufix64, (s, ptr, base),
- _CONST char *s _AND
+ _CONST char *s,
char **ptr)
{
return _strtoufix64_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/ufix64toa.c b/newlib/libc/machine/powerpc/ufix64toa.c
index 450e0a352..125ab67fa 100644
--- a/newlib/libc/machine/powerpc/ufix64toa.c
+++ b/newlib/libc/machine/powerpc/ufix64toa.c
@@ -26,12 +26,12 @@ extern char *_simdldtoa_r _PARAMS((struct _reent *, LONG_DOUBLE_UNION *, int,
char *
_DEFUN (_ufix64toa_r, (rptr, value, mode, ndigits, decpt, sign, rve),
- struct _reent *rptr _AND
- __uint64_t value _AND
- int mode _AND
- int ndigits _AND
- int *decpt _AND
- int *sign _AND
+ struct _reent *rptr,
+ __uint64_t value,
+ int mode,
+ int ndigits,
+ int *decpt,
+ int *sign,
char **rve)
{
union long_double_union ldbl;
diff --git a/newlib/libc/machine/powerpc/vec_calloc.c b/newlib/libc/machine/powerpc/vec_calloc.c
index 8b2e835f0..8a10507d3 100644
--- a/newlib/libc/machine/powerpc/vec_calloc.c
+++ b/newlib/libc/machine/powerpc/vec_calloc.c
@@ -45,7 +45,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
_PTR
_DEFUN (vec_calloc, (n, size),
- size_t n _AND
+ size_t n,
size_t size)
{
return _vec_calloc_r (_REENT, n, size);
diff --git a/newlib/libc/machine/powerpc/vec_realloc.c b/newlib/libc/machine/powerpc/vec_realloc.c
index e192e399d..7e857b55a 100644
--- a/newlib/libc/machine/powerpc/vec_realloc.c
+++ b/newlib/libc/machine/powerpc/vec_realloc.c
@@ -8,7 +8,7 @@
_PTR
_DEFUN (vec_realloc, (ap, nbytes),
- _PTR ap _AND
+ _PTR ap,
size_t nbytes)
{
return _vec_realloc_r (_REENT, ap, nbytes);
diff --git a/newlib/libc/machine/powerpc/vfprintf.c b/newlib/libc/machine/powerpc/vfprintf.c
index e0b90fcde..0c1c80e1a 100644
--- a/newlib/libc/machine/powerpc/vfprintf.c
+++ b/newlib/libc/machine/powerpc/vfprintf.c
@@ -272,8 +272,8 @@ static char *cvt_ufix64 _PARAMS((struct _reent *, unsigned long long, int, int
int
_DEFUN (VFPRINTF, (fp, fmt0, ap),
- FILE * fp _AND
- _CONST char *fmt0 _AND
+ FILE * fp,
+ _CONST char *fmt0,
va_list ap)
{
CHECK_INIT (_REENT, fp);
@@ -282,9 +282,9 @@ _DEFUN (VFPRINTF, (fp, fmt0, ap),
int
_DEFUN (_VFPRINTF_R, (data, fp, fmt0, ap),
- struct _reent *data _AND
- FILE * fp _AND
- _CONST char *fmt0 _AND
+ struct _reent *data,
+ FILE * fp,
+ _CONST char *fmt0,
va_list ap)
{
register char *fmt; /* format string */
diff --git a/newlib/libc/machine/powerpc/vfscanf.c b/newlib/libc/machine/powerpc/vfscanf.c
index 6cbc624de..b82a14088 100644
--- a/newlib/libc/machine/powerpc/vfscanf.c
+++ b/newlib/libc/machine/powerpc/vfscanf.c
@@ -183,8 +183,8 @@ typedef union
int
_DEFUN (vfscanf, (fp, fmt, ap),
- register FILE *__restrict fp _AND
- _CONST char *__restrict fmt _AND
+ register FILE *__restrict fp,
+ _CONST char *__restrict fmt,
va_list ap)
{
CHECK_INIT(_REENT, fp);
@@ -204,9 +204,9 @@ __svfscanf (fp, fmt0, ap)
int
_DEFUN (_vfscanf_r, (data, fp, fmt, ap),
- struct _reent *data _AND
- register FILE *__restrict fp _AND
- _CONST char *__restrict fmt _AND
+ struct _reent *data,
+ register FILE *__restrict fp,
+ _CONST char *__restrict fmt,
va_list ap)
{
return __svfscanf_r (data, fp, fmt, ap);
diff --git a/newlib/libc/machine/spu/assert.c b/newlib/libc/machine/spu/assert.c
index f1dd33047..e8028459c 100644
--- a/newlib/libc/machine/spu/assert.c
+++ b/newlib/libc/machine/spu/assert.c
@@ -11,9 +11,9 @@
/* 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)
{
fprintf(stderr,
@@ -32,8 +32,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/machine/spu/creat.c b/newlib/libc/machine/spu/creat.c
index 3cd714306..0e271c1a7 100644
--- a/newlib/libc/machine/spu/creat.c
+++ b/newlib/libc/machine/spu/creat.c
@@ -8,7 +8,7 @@
int
_DEFUN(creat, (path, mode),
- const char *path _AND
+ const char *path,
mode_t mode)
{
return open (path, O_WRONLY | O_CREAT | O_TRUNC, mode);
diff --git a/newlib/libc/machine/spu/fdopen.c b/newlib/libc/machine/spu/fdopen.c
index a795db8b5..b09ffad16 100644
--- a/newlib/libc/machine/spu/fdopen.c
+++ b/newlib/libc/machine/spu/fdopen.c
@@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
/* Just a stub for now. */
FILE *
_DEFUN (fdopen, (fd, mode),
- int fd _AND
+ int fd,
_CONST char *mode)
{
errno = ENOSYS;
diff --git a/newlib/libc/machine/spu/fgetpos.c b/newlib/libc/machine/spu/fgetpos.c
index 694400e48..bb7d780ea 100644
--- a/newlib/libc/machine/spu/fgetpos.c
+++ b/newlib/libc/machine/spu/fgetpos.c
@@ -45,7 +45,7 @@ typedef struct
int
_DEFUN (fgetpos, (fp, pos),
- FILE *__restrict fp _AND
+ FILE *__restrict fp,
_fpos_t *__restrict pos)
{
c99_fgetpos_t arg;
diff --git a/newlib/libc/machine/spu/fgets.c b/newlib/libc/machine/spu/fgets.c
index 2b0ca417e..8f2a9785f 100644
--- a/newlib/libc/machine/spu/fgets.c
+++ b/newlib/libc/machine/spu/fgets.c
@@ -47,8 +47,8 @@ typedef struct
char *
_DEFUN (fgets, (buf, n, fp),
- char *__restrict buf _AND
- int n _AND
+ char *__restrict buf,
+ int n,
FILE *__restrict fp)
{
c99_fgets_t args;
diff --git a/newlib/libc/machine/spu/fopen.c b/newlib/libc/machine/spu/fopen.c
index 821d7c201..c41d33510 100644
--- a/newlib/libc/machine/spu/fopen.c
+++ b/newlib/libc/machine/spu/fopen.c
@@ -46,7 +46,7 @@ typedef struct
#ifndef _REENT_ONLY
FILE *
_DEFUN (fopen, (file, mode),
- _CONST char *__restrict file _AND
+ _CONST char *__restrict file,
_CONST char *__restrict mode)
{
int ret;
diff --git a/newlib/libc/machine/spu/fputs.c b/newlib/libc/machine/spu/fputs.c
index 9ed796894..8cf84bb6e 100644
--- a/newlib/libc/machine/spu/fputs.c
+++ b/newlib/libc/machine/spu/fputs.c
@@ -47,7 +47,7 @@ typedef struct
int
_DEFUN (fputs, (s, fp),
- char _CONST *__restrict s _AND
+ char _CONST *__restrict s,
FILE *__restrict fp)
{
c99_fputs_t args;
diff --git a/newlib/libc/machine/spu/fread.c b/newlib/libc/machine/spu/fread.c
index eb3966c19..3ea24cc4a 100644
--- a/newlib/libc/machine/spu/fread.c
+++ b/newlib/libc/machine/spu/fread.c
@@ -50,9 +50,9 @@ typedef struct
size_t
_DEFUN (fread, (buf, size, count, fp),
- _PTR __restrict buf _AND
- size_t size _AND
- size_t count _AND
+ _PTR __restrict buf,
+ size_t size,
+ size_t count,
FILE *__restrict fp)
{
c99_fread_t args;
diff --git a/newlib/libc/machine/spu/freopen.c b/newlib/libc/machine/spu/freopen.c
index 53dd2bc1d..7c52abef3 100644
--- a/newlib/libc/machine/spu/freopen.c
+++ b/newlib/libc/machine/spu/freopen.c
@@ -48,8 +48,8 @@ typedef struct
FILE *
_DEFUN (freopen, (file, mode, fp),
- const char *__restrict file _AND
- const char *__restrict mode _AND
+ const char *__restrict file,
+ const char *__restrict mode,
FILE *__restrict fp)
{
int ret;
diff --git a/newlib/libc/machine/spu/fseek.c b/newlib/libc/machine/spu/fseek.c
index dc7453325..136d5c639 100644
--- a/newlib/libc/machine/spu/fseek.c
+++ b/newlib/libc/machine/spu/fseek.c
@@ -48,8 +48,8 @@ typedef struct
int
_DEFUN (fseek, (fp, offset, whence),
- register FILE *fp _AND
- long offset _AND
+ register FILE *fp,
+ long offset,
int whence)
{
c99_fseek_t args;
diff --git a/newlib/libc/machine/spu/fsetpos.c b/newlib/libc/machine/spu/fsetpos.c
index 3bd0dde3d..1ebbb8f63 100644
--- a/newlib/libc/machine/spu/fsetpos.c
+++ b/newlib/libc/machine/spu/fsetpos.c
@@ -46,7 +46,7 @@ typedef struct
int
_DEFUN (fsetpos, (iop, pos),
- FILE * iop _AND
+ FILE * iop,
_CONST _fpos_t * pos)
{
c99_fsetpos_t args;
diff --git a/newlib/libc/machine/spu/fwrite.c b/newlib/libc/machine/spu/fwrite.c
index 58aab9f0a..6de571069 100644
--- a/newlib/libc/machine/spu/fwrite.c
+++ b/newlib/libc/machine/spu/fwrite.c
@@ -50,9 +50,9 @@ typedef struct
size_t
_DEFUN (fwrite, (buf, size, count, fp),
- _CONST _PTR __restrict buf _AND
- size_t size _AND
- size_t count _AND
+ _CONST _PTR __restrict buf,
+ size_t size,
+ size_t count,
FILE * fp)
{
c99_fwrite_t args;
diff --git a/newlib/libc/machine/spu/setbuf.c b/newlib/libc/machine/spu/setbuf.c
index 84430fc73..c942bb9a9 100644
--- a/newlib/libc/machine/spu/setbuf.c
+++ b/newlib/libc/machine/spu/setbuf.c
@@ -47,7 +47,7 @@ typedef struct
void
_DEFUN (setbuf, (fp, buf),
- FILE *__restrict fp _AND
+ FILE *__restrict fp,
char *__restrict buf)
{
c99_setbuf_t args;
diff --git a/newlib/libc/machine/spu/setvbuf.c b/newlib/libc/machine/spu/setvbuf.c
index 32da292f9..a045cc37b 100644
--- a/newlib/libc/machine/spu/setvbuf.c
+++ b/newlib/libc/machine/spu/setvbuf.c
@@ -51,9 +51,9 @@ typedef struct
int
_DEFUN (setvbuf, (fp, buf, mode, size),
- FILE * fp _AND
- char *buf _AND
- int mode _AND
+ FILE * fp,
+ char *buf,
+ int mode,
size_t size)
{
c99_setvbuf_t args;
diff --git a/newlib/libc/machine/spu/vfprintf.c b/newlib/libc/machine/spu/vfprintf.c
index 128d0b3eb..e5ef2fa9f 100644
--- a/newlib/libc/machine/spu/vfprintf.c
+++ b/newlib/libc/machine/spu/vfprintf.c
@@ -58,8 +58,8 @@ typedef struct
int
_DEFUN (vfprintf, (fp, fmt0, ap),
- FILE *__restrict fp _AND
- _CONST char *__restrict fmt0 _AND
+ FILE *__restrict fp,
+ _CONST char *__restrict fmt0,
va_list ap)
{
c99_vfprintf_t args;
diff --git a/newlib/libc/machine/spu/vfscanf.c b/newlib/libc/machine/spu/vfscanf.c
index 0f728969f..a497b7ba3 100644
--- a/newlib/libc/machine/spu/vfscanf.c
+++ b/newlib/libc/machine/spu/vfscanf.c
@@ -58,8 +58,8 @@ typedef struct
int
_DEFUN (vfscanf, (fp, fmt, ap),
- FILE *__restrict fp _AND
- _CONST char *__restrict fmt _AND
+ FILE *__restrict fp,
+ _CONST char *__restrict fmt,
va_list ap)
{
c99_vfscanf_t args;
diff --git a/newlib/libc/machine/spu/vprintf.c b/newlib/libc/machine/spu/vprintf.c
index 32b86d8f2..35b12dfb5 100644
--- a/newlib/libc/machine/spu/vprintf.c
+++ b/newlib/libc/machine/spu/vprintf.c
@@ -24,7 +24,7 @@ typedef struct
int
_DEFUN (vprintf, (fmt, ap),
- _CONST char *fmt _AND
+ _CONST char *fmt,
va_list ap)
{
c99_vprintf_t args;
diff --git a/newlib/libc/machine/spu/vscanf.c b/newlib/libc/machine/spu/vscanf.c
index 4f68bfefd..29b4948dd 100644
--- a/newlib/libc/machine/spu/vscanf.c
+++ b/newlib/libc/machine/spu/vscanf.c
@@ -56,7 +56,7 @@ typedef struct
int
_DEFUN (vscanf, (fmt, ap),
- _CONST char *fmt _AND
+ _CONST char *fmt,
va_list ap)
{
c99_vscanf_t args;
diff --git a/newlib/libc/machine/spu/vsnprintf.c b/newlib/libc/machine/spu/vsnprintf.c
index cf4f5e709..f952b84c1 100644
--- a/newlib/libc/machine/spu/vsnprintf.c
+++ b/newlib/libc/machine/spu/vsnprintf.c
@@ -28,9 +28,9 @@ typedef struct
int
_DEFUN (vsnprintf, (str, size, fmt, ap),
- char *__restrict str _AND
- size_t size _AND
- _CONST char *__restrict fmt _AND
+ char *__restrict str,
+ size_t size,
+ _CONST char *__restrict fmt,
va_list ap)
{
c99_vsnprintf_t args;
diff --git a/newlib/libc/machine/spu/vsprintf.c b/newlib/libc/machine/spu/vsprintf.c
index 0719d38f5..1a44de479 100644
--- a/newlib/libc/machine/spu/vsprintf.c
+++ b/newlib/libc/machine/spu/vsprintf.c
@@ -27,8 +27,8 @@ typedef struct
int
_DEFUN (vsprintf, (str, fmt, ap),
- char *__restrict str _AND
- _CONST char *__restrict fmt _AND
+ char *__restrict str,
+ _CONST char *__restrict fmt,
va_list ap)
{
c99_vsprintf_t args;
diff --git a/newlib/libc/machine/spu/vsscanf.c b/newlib/libc/machine/spu/vsscanf.c
index 2f7380ff4..38ee1f4b9 100644
--- a/newlib/libc/machine/spu/vsscanf.c
+++ b/newlib/libc/machine/spu/vsscanf.c
@@ -58,8 +58,8 @@ typedef struct
int
_DEFUN (vsscanf, (str, fmt, ap),
- _CONST char *__restrict str _AND
- _CONST char *__restrict fmt _AND
+ _CONST char *__restrict str,
+ _CONST char *__restrict fmt,
va_list ap)
{
c99_vsscanf_t args;
diff --git a/newlib/libc/misc/__dprintf.c b/newlib/libc/misc/__dprintf.c
index eba45eaaa..6026d195c 100644
--- a/newlib/libc/misc/__dprintf.c
+++ b/newlib/libc/misc/__dprintf.c
@@ -178,8 +178,8 @@ parse_number (s, p)
static long
_DEFUN(get_number, (s, size, unsigned_p),
- char *s _AND
- long size _AND
+ char *s,
+ long size,
int unsigned_p)
{
long x;
@@ -221,8 +221,8 @@ _DEFUN(get_number, (s, size, unsigned_p),
static void
_DEFUN(print_number, (base, unsigned_p, n),
- int base _AND
- int unsigned_p _AND
+ int base,
+ int unsigned_p,
long n)
{
static char chars[16] = "0123456789abcdef";
diff --git a/newlib/libc/posix/creat.c b/newlib/libc/posix/creat.c
index b8a4f9a14..116f26ce3 100644
--- a/newlib/libc/posix/creat.c
+++ b/newlib/libc/posix/creat.c
@@ -6,7 +6,7 @@
int
_DEFUN(creat, (path, mode),
- const char *path _AND
+ const char *path,
mode_t mode)
{
return open (path, O_WRONLY | O_CREAT | O_TRUNC, mode);
diff --git a/newlib/libc/posix/execl.c b/newlib/libc/posix/execl.c
index ebb97fb9b..beb48c6ae 100644
--- a/newlib/libc/posix/execl.c
+++ b/newlib/libc/posix/execl.c
@@ -19,7 +19,7 @@ static char ***p_environ = &environ;
int
_DEFUN(execl, (path, arg0, ...),
- _CONST char *path _AND
+ _CONST char *path,
_CONST char *arg0 _DOTS)
#else
@@ -28,8 +28,8 @@ _DEFUN(execl, (path, arg0, ...),
int
_DEFUN(execl, (path, arg0, va_alist),
- _CONST char *path _AND
- _CONST char *arg0 _AND
+ _CONST char *path,
+ _CONST char *arg0,
va_dcl)
#endif
diff --git a/newlib/libc/posix/execle.c b/newlib/libc/posix/execle.c
index 2b22036a1..f4c759250 100644
--- a/newlib/libc/posix/execle.c
+++ b/newlib/libc/posix/execle.c
@@ -14,7 +14,7 @@
int
_DEFUN(execle, (path, arg0, ...),
- _CONST char *path _AND
+ _CONST char *path,
_CONST char *arg0 _DOTS)
#else
@@ -23,8 +23,8 @@ _DEFUN(execle, (path, arg0, ...),
int
_DEFUN(execle, (path, arg0, va_alist),
- _CONST char *path _AND
- _CONST char *arg0 _AND
+ _CONST char *path,
+ _CONST char *arg0,
va_dcl)
#endif
diff --git a/newlib/libc/posix/execlp.c b/newlib/libc/posix/execlp.c
index 6212da629..6731bb905 100644
--- a/newlib/libc/posix/execlp.c
+++ b/newlib/libc/posix/execlp.c
@@ -14,7 +14,7 @@
int
_DEFUN(execlp, (path, arg0, ...),
- _CONST char *path _AND
+ _CONST char *path,
_CONST char *arg0 _DOTS)
#else
@@ -23,8 +23,8 @@ _DEFUN(execlp, (path, arg0, ...),
int
_DEFUN(execlp, (path, arg0, va_alist),
- _CONST char *path _AND
- _CONST char *arg0 _AND
+ _CONST char *path,
+ _CONST char *arg0,
va_dcl)
#endif
diff --git a/newlib/libc/posix/execv.c b/newlib/libc/posix/execv.c
index 8793e2ec4..049a5381d 100644
--- a/newlib/libc/posix/execv.c
+++ b/newlib/libc/posix/execv.c
@@ -15,7 +15,7 @@ static char ***p_environ = &environ;
int
_DEFUN (execv, (path, argv),
- const char *path _AND
+ const char *path,
char * const argv[])
{
return _execve (path, (char * _CONST *) argv, *p_environ);
diff --git a/newlib/libc/posix/execve.c b/newlib/libc/posix/execve.c
index d1355133a..c2a2144f5 100644
--- a/newlib/libc/posix/execve.c
+++ b/newlib/libc/posix/execve.c
@@ -11,8 +11,8 @@
int
_DEFUN(execve, (path, argv, envp),
- const char *path _AND
- char * const argv[] _AND
+ const char *path,
+ char * const argv[],
char * const envp[])
{
return _execve (path, argv, envp);
diff --git a/newlib/libc/posix/execvp.c b/newlib/libc/posix/execvp.c
index 64310f661..db7e03456 100644
--- a/newlib/libc/posix/execvp.c
+++ b/newlib/libc/posix/execvp.c
@@ -22,8 +22,8 @@
static char *
_DEFUN (strccpy, (s1, s2, c),
- char *s1 _AND
- char *s2 _AND
+ char *s1,
+ char *s2,
char c)
{
char *dest = s1;
@@ -37,7 +37,7 @@ _DEFUN (strccpy, (s1, s2, c),
int
_DEFUN (execvp, (file, argv),
- _CONST char *file _AND
+ _CONST char *file,
char * _CONST argv[])
{
char *path = getenv ("PATH");
diff --git a/newlib/libc/posix/popen.c b/newlib/libc/posix/popen.c
index f9abfac3f..bbd0fc424 100644
--- a/newlib/libc/posix/popen.c
+++ b/newlib/libc/posix/popen.c
@@ -110,7 +110,7 @@ static struct pid {
FILE *
_DEFUN(popen, (program, type),
- const char *program _AND
+ const char *program,
const char *type)
{
struct pid *cur;
diff --git a/newlib/libc/posix/posix_spawn.c b/newlib/libc/posix/posix_spawn.c
index 61d36304d..8e54de7fa 100644
--- a/newlib/libc/posix/posix_spawn.c
+++ b/newlib/libc/posix/posix_spawn.c
@@ -295,11 +295,11 @@ do_posix_spawn(pid_t *pid, _CONST char *path,
int
_DEFUN(posix_spawn, (pid, path, fa, sa, argv, envp),
- pid_t *pid _AND
- _CONST char *path _AND
- _CONST posix_spawn_file_actions_t *fa _AND
- _CONST posix_spawnattr_t *sa _AND
- char * _CONST argv[] _AND
+ pid_t *pid,
+ _CONST char *path,
+ _CONST posix_spawn_file_actions_t *fa,
+ _CONST posix_spawnattr_t *sa,
+ char * _CONST argv[],
char * _CONST envp[])
{
return do_posix_spawn(pid, path, fa, sa, argv, envp, 0);
@@ -307,11 +307,11 @@ _DEFUN(posix_spawn, (pid, path, fa, sa, argv, envp),
int
_DEFUN(posix_spawnp, (pid, path, fa, sa, argv, envp),
- pid_t *pid _AND
- _CONST char *path _AND
- _CONST posix_spawn_file_actions_t *fa _AND
- _CONST posix_spawnattr_t *sa _AND
- char * _CONST argv[] _AND
+ pid_t *pid,
+ _CONST char *path,
+ _CONST posix_spawn_file_actions_t *fa,
+ _CONST posix_spawnattr_t *sa,
+ char * _CONST argv[],
char * _CONST envp[])
{
return do_posix_spawn(pid, path, fa, sa, argv, envp, 1);
@@ -358,10 +358,10 @@ _DEFUN(posix_spawn_file_actions_destroy, (fa),
int
_DEFUN(posix_spawn_file_actions_addopen, (fa, fildes, path, oflag, mode),
- posix_spawn_file_actions_t * __restrict fa _AND
- int fildes _AND
- _CONST char * __restrict path _AND
- int oflag _AND
+ posix_spawn_file_actions_t * __restrict fa,
+ int fildes,
+ _CONST char * __restrict path,
+ int oflag,
mode_t mode)
{
posix_spawn_file_actions_entry_t *fae;
@@ -393,8 +393,8 @@ _DEFUN(posix_spawn_file_actions_addopen, (fa, fildes, path, oflag, mode),
int
_DEFUN(posix_spawn_file_actions_adddup2, (fa, fildes, newfildes),
- posix_spawn_file_actions_t *fa _AND
- int fildes _AND
+ posix_spawn_file_actions_t *fa,
+ int fildes,
int newfildes)
{
posix_spawn_file_actions_entry_t *fae;
@@ -418,7 +418,7 @@ _DEFUN(posix_spawn_file_actions_adddup2, (fa, fildes, newfildes),
int
_DEFUN(posix_spawn_file_actions_addclose, (fa, fildes),
- posix_spawn_file_actions_t *fa _AND
+ posix_spawn_file_actions_t *fa,
int fildes)
{
posix_spawn_file_actions_entry_t *fae;
@@ -468,7 +468,7 @@ _DEFUN(posix_spawnattr_destroy, (sa),
int
_DEFUN(posix_spawnattr_getflags, (sa, flags),
- _CONST posix_spawnattr_t * __restrict sa _AND
+ _CONST posix_spawnattr_t * __restrict sa,
short * __restrict flags)
{
*flags = (*sa)->sa_flags;
@@ -477,7 +477,7 @@ _DEFUN(posix_spawnattr_getflags, (sa, flags),
int
_DEFUN(posix_spawnattr_getpgroup, (sa, pgroup),
- _CONST posix_spawnattr_t * __restrict sa _AND
+ _CONST posix_spawnattr_t * __restrict sa,
pid_t * __restrict pgroup)
{
*pgroup = (*sa)->sa_pgroup;
@@ -486,7 +486,7 @@ _DEFUN(posix_spawnattr_getpgroup, (sa, pgroup),
int
_DEFUN(posix_spawnattr_getschedparam, (sa, schedparam),
- _CONST posix_spawnattr_t * __restrict sa _AND
+ _CONST posix_spawnattr_t * __restrict sa,
struct sched_param * __restrict schedparam)
{
*schedparam = (*sa)->sa_schedparam;
@@ -495,7 +495,7 @@ _DEFUN(posix_spawnattr_getschedparam, (sa, schedparam),
int
_DEFUN(posix_spawnattr_getschedpolicy, (sa, schedpolicy),
- _CONST posix_spawnattr_t * __restrict sa _AND
+ _CONST posix_spawnattr_t * __restrict sa,
int * __restrict schedpolicy)
{
*schedpolicy = (*sa)->sa_schedpolicy;
@@ -504,7 +504,7 @@ _DEFUN(posix_spawnattr_getschedpolicy, (sa, schedpolicy),
int
_DEFUN(posix_spawnattr_getsigdefault, (sa, sigdefault),
- _CONST posix_spawnattr_t * __restrict sa _AND
+ _CONST posix_spawnattr_t * __restrict sa,
sigset_t * __restrict sigdefault)
{
*sigdefault = (*sa)->sa_sigdefault;
@@ -513,7 +513,7 @@ _DEFUN(posix_spawnattr_getsigdefault, (sa, sigdefault),
int
_DEFUN(posix_spawnattr_getsigmask, (sa, sigmask),
- _CONST posix_spawnattr_t * __restrict sa _AND
+ _CONST posix_spawnattr_t * __restrict sa,
sigset_t * __restrict sigmask)
{
*sigmask = (*sa)->sa_sigmask;
@@ -522,7 +522,7 @@ _DEFUN(posix_spawnattr_getsigmask, (sa, sigmask),
int
_DEFUN(posix_spawnattr_setflags, (sa, flags),
- posix_spawnattr_t *sa _AND
+ posix_spawnattr_t *sa,
short flags)
{
(*sa)->sa_flags = flags;
@@ -531,7 +531,7 @@ _DEFUN(posix_spawnattr_setflags, (sa, flags),
int
_DEFUN(posix_spawnattr_setpgroup, (sa, pgroup),
- posix_spawnattr_t *sa _AND
+ posix_spawnattr_t *sa,
pid_t pgroup)
{
(*sa)->sa_pgroup = pgroup;
@@ -540,7 +540,7 @@ _DEFUN(posix_spawnattr_setpgroup, (sa, pgroup),
int
_DEFUN(posix_spawnattr_setschedparam, (sa, schedparam),
- posix_spawnattr_t * __restrict sa _AND
+ posix_spawnattr_t * __restrict sa,
_CONST struct sched_param * __restrict schedparam)
{
(*sa)->sa_schedparam = *schedparam;
@@ -549,7 +549,7 @@ _DEFUN(posix_spawnattr_setschedparam, (sa, schedparam),
int
_DEFUN(posix_spawnattr_setschedpolicy, (sa, schedpolicy),
- posix_spawnattr_t *sa _AND
+ posix_spawnattr_t *sa,
int schedpolicy)
{
(*sa)->sa_schedpolicy = schedpolicy;
@@ -558,7 +558,7 @@ _DEFUN(posix_spawnattr_setschedpolicy, (sa, schedpolicy),
int
_DEFUN(posix_spawnattr_setsigdefault, (sa, sigdefault),
- posix_spawnattr_t * __restrict sa _AND
+ posix_spawnattr_t * __restrict sa,
_CONST sigset_t * __restrict sigdefault)
{
(*sa)->sa_sigdefault = *sigdefault;
@@ -567,7 +567,7 @@ _DEFUN(posix_spawnattr_setsigdefault, (sa, sigdefault),
int
_DEFUN(posix_spawnattr_setsigmask, (sa, sigmask),
- posix_spawnattr_t * __restrict sa _AND
+ posix_spawnattr_t * __restrict sa,
_CONST sigset_t * __restrict sigmask)
{
(*sa)->sa_sigmask = *sigmask;
diff --git a/newlib/libc/posix/readdir_r.c b/newlib/libc/posix/readdir_r.c
index d13775b87..a75eee9a3 100644
--- a/newlib/libc/posix/readdir_r.c
+++ b/newlib/libc/posix/readdir_r.c
@@ -51,8 +51,8 @@ extern int getdents (int fd, void *dp, int count);
*/
int
_DEFUN(readdir_r, (dirp, dp, dpp),
- register DIR *__restrict dirp _AND
- struct dirent *__restrict dp _AND
+ register DIR *__restrict dirp,
+ struct dirent *__restrict dp,
struct dirent **__restrict dpp) {
struct dirent *tmpdp;
diff --git a/newlib/libc/posix/scandir.c b/newlib/libc/posix/scandir.c
index 8cb8ff82d..0ffe68971 100644
--- a/newlib/libc/posix/scandir.c
+++ b/newlib/libc/posix/scandir.c
@@ -69,9 +69,9 @@ static char sccsid[] = "@(#)scandir.c 5.10 (Berkeley) 2/23/91";
int
_DEFUN(scandir, (dirname, namelist, select, dcomp),
- const char *dirname _AND
- struct dirent ***namelist _AND
- int (*select) __P((const struct dirent *)) _AND
+ const char *dirname,
+ struct dirent ***namelist,
+ int (*select) __P((const struct dirent *)),
int (*dcomp) __P((const struct dirent **, const struct dirent **)))
{
register struct dirent *d, *p, **names;
@@ -170,7 +170,7 @@ cleanup:
*/
int
_DEFUN(alphasort, (d1, d2),
- const struct dirent **d1 _AND
+ const struct dirent **d1,
const struct dirent **d2)
{
return(strcmp((*d1)->d_name, (*d2)->d_name));
diff --git a/newlib/libc/posix/seekdir.c b/newlib/libc/posix/seekdir.c
index 3965edabf..f876d7075 100644
--- a/newlib/libc/posix/seekdir.c
+++ b/newlib/libc/posix/seekdir.c
@@ -47,7 +47,7 @@ static char sccsid[] = "@(#)seekdir.c 5.7 (Berkeley) 6/1/90";
*/
void
_DEFUN(seekdir, (dirp, loc),
- DIR *dirp _AND
+ DIR *dirp,
long loc)
{
#ifdef HAVE_DD_LOCK
diff --git a/newlib/libc/posix/telldir.c b/newlib/libc/posix/telldir.c
index 959e3b7bb..9c945fcf7 100644
--- a/newlib/libc/posix/telldir.c
+++ b/newlib/libc/posix/telldir.c
@@ -120,7 +120,7 @@ _DEFUN(telldir, (dirp),
*/
void
_DEFUN(_seekdir, (dirp, loc),
- register DIR *dirp _AND
+ register DIR *dirp,
long loc)
{
register struct ddloc *lp;
diff --git a/newlib/libc/reent/execr.c b/newlib/libc/reent/execr.c
index 559ca030a..cb78fba76 100644
--- a/newlib/libc/reent/execr.c
+++ b/newlib/libc/reent/execr.c
@@ -46,9 +46,9 @@ DESCRIPTION
int
_DEFUN (_execve_r, (ptr, name, argv, env),
- struct _reent *ptr _AND
- _CONST char *name _AND
- char *_CONST argv[] _AND
+ struct _reent *ptr,
+ _CONST char *name,
+ char *_CONST argv[],
char *_CONST env[])
{
int ret;
@@ -114,7 +114,7 @@ DESCRIPTION
int
_DEFUN (_wait_r, (ptr, status),
- struct _reent *ptr _AND
+ struct _reent *ptr,
int *status)
{
int ret;
diff --git a/newlib/libc/reent/fcntlr.c b/newlib/libc/reent/fcntlr.c
index 328b9de13..fdfe41090 100644
--- a/newlib/libc/reent/fcntlr.c
+++ b/newlib/libc/reent/fcntlr.c
@@ -41,9 +41,9 @@ DESCRIPTION
int
_DEFUN (_fcntl_r, (ptr, fd, cmd, arg),
- struct _reent *ptr _AND
- int fd _AND
- int cmd _AND
+ struct _reent *ptr,
+ int fd,
+ int cmd,
int arg)
{
int ret;
diff --git a/newlib/libc/reent/fstat64r.c b/newlib/libc/reent/fstat64r.c
index d9fa8b71f..06a89a5c8 100644
--- a/newlib/libc/reent/fstat64r.c
+++ b/newlib/libc/reent/fstat64r.c
@@ -48,8 +48,8 @@ DESCRIPTION
int
_DEFUN (_fstat64_r, (ptr, fd, pstat),
- struct _reent *ptr _AND
- int fd _AND
+ struct _reent *ptr,
+ int fd,
struct stat64 *pstat)
{
int ret;
diff --git a/newlib/libc/reent/gettimeofdayr.c b/newlib/libc/reent/gettimeofdayr.c
index 007dff8da..80942afb0 100644
--- a/newlib/libc/reent/gettimeofdayr.c
+++ b/newlib/libc/reent/gettimeofdayr.c
@@ -53,8 +53,8 @@ DESCRIPTION
int
_DEFUN (_gettimeofday_r, (ptr, ptimeval, ptimezone),
- struct _reent *ptr _AND
- struct timeval *ptimeval _AND
+ struct _reent *ptr,
+ struct timeval *ptimeval,
void *ptimezone)
{
int ret;
diff --git a/newlib/libc/reent/linkr.c b/newlib/libc/reent/linkr.c
index 8cfdf2f06..59113d26e 100644
--- a/newlib/libc/reent/linkr.c
+++ b/newlib/libc/reent/linkr.c
@@ -44,8 +44,8 @@ DESCRIPTION
int
_DEFUN (_link_r, (ptr, old, new),
- struct _reent *ptr _AND
- _CONST char *old _AND
+ struct _reent *ptr,
+ _CONST char *old,
_CONST char *new)
{
int ret;
diff --git a/newlib/libc/reent/lseek64r.c b/newlib/libc/reent/lseek64r.c
index 1241a27e4..2f16f0bca 100644
--- a/newlib/libc/reent/lseek64r.c
+++ b/newlib/libc/reent/lseek64r.c
@@ -42,9 +42,9 @@ DESCRIPTION
_off64_t
_DEFUN (_lseek64_r, (ptr, fd, pos, whence),
- struct _reent *ptr _AND
- int fd _AND
- _off64_t pos _AND
+ struct _reent *ptr,
+ int fd,
+ _off64_t pos,
int whence)
{
_off64_t ret;
diff --git a/newlib/libc/reent/lseekr.c b/newlib/libc/reent/lseekr.c
index cc73ab467..639158912 100644
--- a/newlib/libc/reent/lseekr.c
+++ b/newlib/libc/reent/lseekr.c
@@ -39,9 +39,9 @@ DESCRIPTION
_off_t
_DEFUN (_lseek_r, (ptr, fd, pos, whence),
- struct _reent *ptr _AND
- int fd _AND
- _off_t pos _AND
+ struct _reent *ptr,
+ int fd,
+ _off_t pos,
int whence)
{
_off_t ret;
diff --git a/newlib/libc/reent/mkdirr.c b/newlib/libc/reent/mkdirr.c
index eee999e19..4c2c94f9c 100644
--- a/newlib/libc/reent/mkdirr.c
+++ b/newlib/libc/reent/mkdirr.c
@@ -41,8 +41,8 @@ DESCRIPTION
int
_DEFUN (_mkdir_r, (ptr, path, mode),
- struct _reent *ptr _AND
- _CONST char *path _AND
+ struct _reent *ptr,
+ _CONST char *path,
int mode)
{
int ret;
diff --git a/newlib/libc/reent/openr.c b/newlib/libc/reent/openr.c
index 06b203b81..f38ff8458 100644
--- a/newlib/libc/reent/openr.c
+++ b/newlib/libc/reent/openr.c
@@ -40,9 +40,9 @@ DESCRIPTION
int
_DEFUN (_open_r, (ptr, file, flags, mode),
- struct _reent *ptr _AND
- _CONST char *file _AND
- int flags _AND
+ struct _reent *ptr,
+ _CONST char *file,
+ int flags,
int mode)
{
int ret;
diff --git a/newlib/libc/reent/readr.c b/newlib/libc/reent/readr.c
index 65e0514cf..edc6fd08b 100644
--- a/newlib/libc/reent/readr.c
+++ b/newlib/libc/reent/readr.c
@@ -39,9 +39,9 @@ DESCRIPTION
_ssize_t
_DEFUN (_read_r, (ptr, fd, buf, cnt),
- struct _reent *ptr _AND
- int fd _AND
- _PTR buf _AND
+ struct _reent *ptr,
+ int fd,
+ _PTR buf,
size_t cnt)
{
_ssize_t ret;
diff --git a/newlib/libc/reent/reent.c b/newlib/libc/reent/reent.c
index b6c2abf02..a98c3110c 100644
--- a/newlib/libc/reent/reent.c
+++ b/newlib/libc/reent/reent.c
@@ -31,7 +31,7 @@ int errno;
void
_DEFUN (cleanup_glue, (ptr, glue),
- struct _reent *ptr _AND
+ struct _reent *ptr,
struct _glue *glue)
{
/* Have to reclaim these in reverse order: */
diff --git a/newlib/libc/reent/renamer.c b/newlib/libc/reent/renamer.c
index 9b42dc380..e55c2f291 100644
--- a/newlib/libc/reent/renamer.c
+++ b/newlib/libc/reent/renamer.c
@@ -41,8 +41,8 @@ DESCRIPTION
int
_DEFUN (_rename_r, (ptr, old, new),
- struct _reent *ptr _AND
- _CONST char *old _AND
+ struct _reent *ptr,
+ _CONST char *old,
_CONST char *new)
{
int ret = 0;
diff --git a/newlib/libc/reent/sbrkr.c b/newlib/libc/reent/sbrkr.c
index 4217174b3..0bc4163c1 100644
--- a/newlib/libc/reent/sbrkr.c
+++ b/newlib/libc/reent/sbrkr.c
@@ -42,7 +42,7 @@ DESCRIPTION
void *
_DEFUN (_sbrk_r, (ptr, incr),
- struct _reent *ptr _AND
+ struct _reent *ptr,
ptrdiff_t incr)
{
char *ret;
diff --git a/newlib/libc/reent/signalr.c b/newlib/libc/reent/signalr.c
index 95dd49ed3..9229061d5 100644
--- a/newlib/libc/reent/signalr.c
+++ b/newlib/libc/reent/signalr.c
@@ -44,8 +44,8 @@ DESCRIPTION
int
_DEFUN (_kill_r, (ptr, pid, sig),
- struct _reent *ptr _AND
- int pid _AND
+ struct _reent *ptr,
+ int pid,
int sig)
{
int ret;
diff --git a/newlib/libc/reent/stat64r.c b/newlib/libc/reent/stat64r.c
index 1f175e0a9..134ca82ef 100644
--- a/newlib/libc/reent/stat64r.c
+++ b/newlib/libc/reent/stat64r.c
@@ -46,8 +46,8 @@ DESCRIPTION
int
_DEFUN (_stat64_r, (ptr, file, pstat),
- struct _reent *ptr _AND
- _CONST char *file _AND
+ struct _reent *ptr,
+ _CONST char *file,
struct stat64 *pstat)
{
int ret;
diff --git a/newlib/libc/reent/statr.c b/newlib/libc/reent/statr.c
index 3500c88b1..2b271e10f 100644
--- a/newlib/libc/reent/statr.c
+++ b/newlib/libc/reent/statr.c
@@ -46,8 +46,8 @@ DESCRIPTION
int
_DEFUN (_stat_r, (ptr, file, pstat),
- struct _reent *ptr _AND
- _CONST char *file _AND
+ struct _reent *ptr,
+ _CONST char *file,
struct stat *pstat)
{
int ret;
diff --git a/newlib/libc/reent/timesr.c b/newlib/libc/reent/timesr.c
index efb98b61d..dbe6a4ef0 100644
--- a/newlib/libc/reent/timesr.c
+++ b/newlib/libc/reent/timesr.c
@@ -45,7 +45,7 @@ DESCRIPTION
clock_t
_DEFUN (_times_r, (ptr, ptms),
- struct _reent *ptr _AND
+ struct _reent *ptr,
struct tms *ptms)
{
clock_t ret;
diff --git a/newlib/libc/reent/unlinkr.c b/newlib/libc/reent/unlinkr.c
index 53b8f11e3..eb000be15 100644
--- a/newlib/libc/reent/unlinkr.c
+++ b/newlib/libc/reent/unlinkr.c
@@ -39,7 +39,7 @@ DESCRIPTION
int
_DEFUN (_unlink_r, (ptr, file),
- struct _reent *ptr _AND
+ struct _reent *ptr,
_CONST char *file)
{
int ret;
diff --git a/newlib/libc/reent/writer.c b/newlib/libc/reent/writer.c
index 4190a9059..4e06d74ef 100644
--- a/newlib/libc/reent/writer.c
+++ b/newlib/libc/reent/writer.c
@@ -39,9 +39,9 @@ DESCRIPTION
_ssize_t
_DEFUN (_write_r, (ptr, fd, buf, cnt),
- struct _reent *ptr _AND
- int fd _AND
- _CONST _PTR buf _AND
+ struct _reent *ptr,
+ int fd,
+ _CONST _PTR buf,
size_t cnt)
{
_ssize_t ret;
diff --git a/newlib/libc/search/bsearch.c b/newlib/libc/search/bsearch.c
index 579633c12..c15ea64d2 100644
--- a/newlib/libc/search/bsearch.c
+++ b/newlib/libc/search/bsearch.c
@@ -57,10 +57,10 @@ No supporting OS subroutines are required.
_PTR
_DEFUN (bsearch, (key, base, nmemb, size, compar),
- _CONST _PTR key _AND
- _CONST _PTR base _AND
- size_t nmemb _AND
- size_t size _AND
+ _CONST _PTR key,
+ _CONST _PTR base,
+ size_t nmemb,
+ size_t size,
int _EXFNPTR(compar, (const _PTR, const _PTR)))
{
_PTR current;
diff --git a/newlib/libc/search/hash.c b/newlib/libc/search/hash.c
index 5fea88a82..f20322c42 100644
--- a/newlib/libc/search/hash.c
+++ b/newlib/libc/search/hash.c
@@ -105,10 +105,10 @@ int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
extern DB *
_DEFUN(__hash_open, (file, flags, mode, info, dflags),
- const char *file _AND
- int flags _AND
- int mode _AND
- int dflags _AND
+ const char *file,
+ int flags,
+ int mode,
+ int dflags,
const HASHINFO *info) /* Special directives for create */
{
HTAB *hashp;
diff --git a/newlib/libc/search/hcreate.c b/newlib/libc/search/hcreate.c
index b7be1cd6f..800211689 100644
--- a/newlib/libc/search/hcreate.c
+++ b/newlib/libc/search/hcreate.c
@@ -70,7 +70,7 @@ _DEFUN_VOID (hdestroy)
ENTRY *
_DEFUN(hsearch, (item, action),
- ENTRY item _AND
+ ENTRY item,
ACTION action)
{
ENTRY *retval;
diff --git a/newlib/libc/search/qsort.c b/newlib/libc/search/qsort.c
index 9a8e7fabe..e24a62a55 100644
--- a/newlib/libc/search/qsort.c
+++ b/newlib/libc/search/qsort.c
@@ -101,9 +101,9 @@ static inline void swapfunc _PARAMS((char *, char *, int, int));
static inline void
_DEFUN(swapfunc, (a, b, n, swaptype),
- char *a _AND
- char *b _AND
- int n _AND
+ char *a,
+ char *b,
+ int n,
int swaptype)
{
if(swaptype <= 1)
@@ -132,10 +132,10 @@ _DEFUN(swapfunc, (a, b, n, swaptype),
static inline char *
_DEFUN(med3, (a, b, c, cmp, thunk),
- char *a _AND
- char *b _AND
- char *c _AND
- cmp_t *cmp _AND
+ char *a,
+ char *b,
+ char *c,
+ cmp_t *cmp,
void *thunk
#if !defined(I_AM_QSORT_R) && !defined(I_AM_GNU_QSORT_R)
__unused
@@ -150,26 +150,26 @@ __unused
#if defined(I_AM_QSORT_R)
void
_DEFUN(__bsd_qsort_r, (a, n, es, thunk, cmp),
- void *a _AND
- size_t n _AND
- size_t es _AND
- void *thunk _AND
+ void *a,
+ size_t n,
+ size_t es,
+ void *thunk,
cmp_t *cmp)
#elif defined(I_AM_GNU_QSORT_R)
void
_DEFUN(qsort_r, (a, n, es, cmp, thunk),
- void *a _AND
- size_t n _AND
- size_t es _AND
- cmp_t *cmp _AND
+ void *a,
+ size_t n,
+ size_t es,
+ cmp_t *cmp,
void *thunk)
#else
#define thunk NULL
void
_DEFUN(qsort, (a, n, es, cmp),
- void *a _AND
- size_t n _AND
- size_t es _AND
+ void *a,
+ size_t n,
+ size_t es,
cmp_t *cmp)
#endif
{
diff --git a/newlib/libc/search/tdelete.c b/newlib/libc/search/tdelete.c
index b607b5421..a0128e98b 100644
--- a/newlib/libc/search/tdelete.c
+++ b/newlib/libc/search/tdelete.c
@@ -27,8 +27,8 @@ __RCSID("$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
/* delete node with given key */
void *
_DEFUN(tdelete, (vkey, vrootp, compar),
- const void *__restrict vkey _AND /* key to be deleted */
- void **__restrict vrootp _AND /* address of the root of tree */
+ const void *__restrict vkey, /* key to be deleted */
+ void **__restrict vrootp, /* address of the root of tree */
int (*compar)(const void *, const void *))
{
node_t **rootp = (node_t **)vrootp;
diff --git a/newlib/libc/search/tdestroy.c b/newlib/libc/search/tdestroy.c
index 3e7327c4d..e1418207a 100644
--- a/newlib/libc/search/tdestroy.c
+++ b/newlib/libc/search/tdestroy.c
@@ -41,7 +41,7 @@ trecurse(root, free_action)
void
_DEFUN(tdestroy, (vrootp, freefct),
- void *vrootp _AND
+ void *vrootp,
void (*freefct)(void *))
{
node_t *root = (node_t *) vrootp;
diff --git a/newlib/libc/search/tfind.c b/newlib/libc/search/tfind.c
index 5d7c40c93..108213048 100644
--- a/newlib/libc/search/tfind.c
+++ b/newlib/libc/search/tfind.c
@@ -26,8 +26,8 @@ __RCSID("$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
/* find a node, or return 0 */
void *
_DEFUN(tfind, (vkey, vrootp, compar),
- const void *vkey _AND /* key to be found */
- void **vrootp _AND /* address of the tree root */
+ const void *vkey, /* key to be found */
+ void **vrootp, /* address of the tree root */
int (*compar)(const void *, const void *))
{
node_t **rootp = (node_t **)vrootp;
diff --git a/newlib/libc/search/tsearch.c b/newlib/libc/search/tsearch.c
index 5f41b407d..8fe265703 100644
--- a/newlib/libc/search/tsearch.c
+++ b/newlib/libc/search/tsearch.c
@@ -26,8 +26,8 @@ __RCSID("$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $");
/* find or insert datum into search tree */
void *
_DEFUN(tsearch, (vkey, vrootp, compar),
- const void *vkey _AND /* key to be located */
- void **vrootp _AND /* address of tree root */
+ const void *vkey, /* key to be located */
+ void **vrootp, /* address of tree root */
int (*compar)(const void *, const void *))
{
node_t *q;
diff --git a/newlib/libc/search/twalk.c b/newlib/libc/search/twalk.c
index 74ad5a615..26d6e97db 100644
--- a/newlib/libc/search/twalk.c
+++ b/newlib/libc/search/twalk.c
@@ -50,7 +50,7 @@ trecurse(root, action, level)
/* Walk the nodes of a tree */
void
_DEFUN(twalk, (vroot, action),
- const void *vroot _AND /* Root of the tree to be walked */
+ const void *vroot, /* Root of the tree to be walked */
void (*action)(const void *, VISIT, int))
{
if (vroot != NULL && action != NULL)
diff --git a/newlib/libc/signal/psignal.c b/newlib/libc/signal/psignal.c
index f2cfdf3ff..f0c9b6ee6 100644
--- a/newlib/libc/signal/psignal.c
+++ b/newlib/libc/signal/psignal.c
@@ -35,7 +35,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
_VOID
_DEFUN(psignal, (sig, s),
- int sig _AND
+ int sig,
_CONST char *s)
{
if (s != NULL && *s != '\0')
diff --git a/newlib/libc/signal/raise.c b/newlib/libc/signal/raise.c
index df3ebb50f..6f93686e6 100644
--- a/newlib/libc/signal/raise.c
+++ b/newlib/libc/signal/raise.c
@@ -62,7 +62,7 @@ _DEFUN (raise, (sig),
int
_DEFUN (_raise_r, (reent, sig),
- struct _reent *reent _AND
+ struct _reent *reent,
int sig)
{
return _kill_r (reent, _getpid_r (reent), sig);
diff --git a/newlib/libc/signal/signal.c b/newlib/libc/signal/signal.c
index 5729f65e3..806abd888 100644
--- a/newlib/libc/signal/signal.c
+++ b/newlib/libc/signal/signal.c
@@ -109,8 +109,8 @@ _DEFUN (_init_signal_r, (ptr),
_sig_func_ptr
_DEFUN (_signal_r, (ptr, sig, func),
- struct _reent *ptr _AND
- int sig _AND
+ struct _reent *ptr,
+ int sig,
_sig_func_ptr func)
{
_sig_func_ptr old_func;
@@ -132,7 +132,7 @@ _DEFUN (_signal_r, (ptr, sig, func),
int
_DEFUN (_raise_r, (ptr, sig),
- struct _reent *ptr _AND
+ struct _reent *ptr,
int sig)
{
_sig_func_ptr func;
@@ -167,7 +167,7 @@ _DEFUN (_raise_r, (ptr, sig),
int
_DEFUN (__sigtramp_r, (ptr, sig),
- struct _reent *ptr _AND
+ struct _reent *ptr,
int sig)
{
_sig_func_ptr func;
@@ -206,7 +206,7 @@ _DEFUN (raise, (sig),
_sig_func_ptr
_DEFUN (signal, (sig, func),
- int sig _AND
+ int sig,
_sig_func_ptr func)
{
return _signal_r (_REENT, sig, func);
diff --git a/newlib/libc/stdio/asiprintf.c b/newlib/libc/stdio/asiprintf.c
index 0c363d5ea..86996737f 100644
--- a/newlib/libc/stdio/asiprintf.c
+++ b/newlib/libc/stdio/asiprintf.c
@@ -26,8 +26,8 @@
int
_DEFUN(_asiprintf_r, (ptr, strp, fmt),
- struct _reent *ptr _AND
- char **strp _AND
+ struct _reent *ptr,
+ char **strp,
const char *fmt _DOTS)
{
int ret;
@@ -54,7 +54,7 @@ _DEFUN(_asiprintf_r, (ptr, strp, fmt),
int
_DEFUN(asiprintf, (strp, fmt),
- char **strp _AND
+ char **strp,
const char *fmt _DOTS)
{
int ret;
diff --git a/newlib/libc/stdio/asniprintf.c b/newlib/libc/stdio/asniprintf.c
index 16ccfde63..f033f1b6b 100644
--- a/newlib/libc/stdio/asniprintf.c
+++ b/newlib/libc/stdio/asniprintf.c
@@ -15,9 +15,9 @@
char *
_DEFUN(_asniprintf_r, (ptr, buf, lenp, fmt),
- struct _reent *ptr _AND
- char *buf _AND
- size_t *lenp _AND
+ struct _reent *ptr,
+ char *buf,
+ size_t *lenp,
const char *fmt _DOTS)
{
int ret;
@@ -62,8 +62,8 @@ _DEFUN(_asniprintf_r, (ptr, buf, lenp, fmt),
char *
_DEFUN(asniprintf, (buf, lenp, fmt),
- char *buf _AND
- size_t *lenp _AND
+ char *buf,
+ size_t *lenp,
const char *fmt _DOTS)
{
int ret;
diff --git a/newlib/libc/stdio/asnprintf.c b/newlib/libc/stdio/asnprintf.c
index 2e8d8aabb..e80ca06cb 100644
--- a/newlib/libc/stdio/asnprintf.c
+++ b/newlib/libc/stdio/asnprintf.c
@@ -15,9 +15,9 @@
char *
_DEFUN(_asnprintf_r, (ptr, buf, lenp, fmt),
- struct _reent *__restrict ptr _AND
- char *buf _AND
- size_t *lenp _AND
+ struct _reent *__restrict ptr,
+ char *buf,
+ size_t *lenp,
const char *__restrict fmt _DOTS)
{
int ret;
@@ -68,8 +68,8 @@ _EXFUN(_asniprintf_r, (struct _reent *, char *, size_t *, const char *, ...)
char *
_DEFUN(asnprintf, (buf, lenp, fmt),
- char *__restrict buf _AND
- size_t *__restrict lenp _AND
+ char *__restrict buf,
+ size_t *__restrict lenp,
const char *__restrict fmt _DOTS)
{
int ret;
diff --git a/newlib/libc/stdio/asprintf.c b/newlib/libc/stdio/asprintf.c
index bf214f9af..1e75174d4 100644
--- a/newlib/libc/stdio/asprintf.c
+++ b/newlib/libc/stdio/asprintf.c
@@ -26,8 +26,8 @@
int
_DEFUN(_asprintf_r, (ptr, strp, fmt),
- struct _reent *ptr _AND
- char **__restrict strp _AND
+ struct _reent *ptr,
+ char **__restrict strp,
const char *__restrict fmt _DOTS)
{
int ret;
@@ -60,7 +60,7 @@ _EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...)
int
_DEFUN(asprintf, (strp, fmt),
- char **__restrict strp _AND
+ char **__restrict strp,
const char *__restrict fmt _DOTS)
{
int ret;
diff --git a/newlib/libc/stdio/diprintf.c b/newlib/libc/stdio/diprintf.c
index fde6ea44c..f57cbac81 100644
--- a/newlib/libc/stdio/diprintf.c
+++ b/newlib/libc/stdio/diprintf.c
@@ -50,8 +50,8 @@ Supporting OS subroutines required: <<sbrk>>, <<write>>.
int
_DEFUN(_diprintf_r, (ptr, fd, format),
- struct _reent *ptr _AND
- int fd _AND
+ struct _reent *ptr,
+ int fd,
const char *format _DOTS)
{
va_list ap;
@@ -67,7 +67,7 @@ _DEFUN(_diprintf_r, (ptr, fd, format),
int
_DEFUN(diprintf, (fd, format),
- int fd _AND
+ int fd,
const char *format _DOTS)
{
va_list ap;
diff --git a/newlib/libc/stdio/dprintf.c b/newlib/libc/stdio/dprintf.c
index 7389eefaa..831fe208c 100644
--- a/newlib/libc/stdio/dprintf.c
+++ b/newlib/libc/stdio/dprintf.c
@@ -54,8 +54,8 @@ Supporting OS subroutines required: <<sbrk>>, <<write>>.
int
_DEFUN(_dprintf_r, (ptr, fd, format),
- struct _reent *ptr _AND
- int fd _AND
+ struct _reent *ptr,
+ int fd,
const char *__restrict format _DOTS)
{
va_list ap;
@@ -77,7 +77,7 @@ _EXFUN(_diprintf_r, (struct _reent *, int, const char *, ...)
int
_DEFUN(dprintf, (fd, format),
- int fd _AND
+ int fd,
const char *__restrict format _DOTS)
{
va_list ap;
diff --git a/newlib/libc/stdio/fclose.c b/newlib/libc/stdio/fclose.c
index 3325a8920..264d2e48f 100644
--- a/newlib/libc/stdio/fclose.c
+++ b/newlib/libc/stdio/fclose.c
@@ -57,7 +57,7 @@ Required OS subroutines: <<close>>, <<fstat>>, <<isatty>>, <<lseek>>,
int
_DEFUN(_fclose_r, (rptr, fp),
- struct _reent *rptr _AND
+ struct _reent *rptr,
register FILE * fp)
{
int r;
diff --git a/newlib/libc/stdio/fdopen.c b/newlib/libc/stdio/fdopen.c
index e0268ed87..7dda3c359 100644
--- a/newlib/libc/stdio/fdopen.c
+++ b/newlib/libc/stdio/fdopen.c
@@ -54,8 +54,8 @@ PORTABILITY
FILE *
_DEFUN(_fdopen_r, (ptr, fd, mode),
- struct _reent *ptr _AND
- int fd _AND
+ struct _reent *ptr,
+ int fd,
_CONST char *mode)
{
register FILE *fp;
@@ -124,7 +124,7 @@ _DEFUN(_fdopen_r, (ptr, fd, mode),
FILE *
_DEFUN(fdopen, (fd, mode),
- int fd _AND
+ int fd,
_CONST char *mode)
{
return _fdopen_r (_REENT, fd, mode);
diff --git a/newlib/libc/stdio/fflush.c b/newlib/libc/stdio/fflush.c
index 199acbdc3..18d6d3e74 100644
--- a/newlib/libc/stdio/fflush.c
+++ b/newlib/libc/stdio/fflush.c
@@ -101,7 +101,7 @@ No supporting OS subroutines are required.
directly from __srefill. */
int
_DEFUN(__sflush_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register FILE * fp)
{
register unsigned char *p;
@@ -240,7 +240,7 @@ _DEFUN(__sflush_r, (ptr, fp),
writing. */
int
_DEFUN(__sflushw_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register FILE *fp)
{
return (fp->_flags & __SWR) ? __sflush_r (ptr, fp) : 0;
@@ -251,7 +251,7 @@ _DEFUN(__sflushw_r, (ptr, fp),
int
_DEFUN(_fflush_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register FILE * fp)
{
int ret;
diff --git a/newlib/libc/stdio/fgetc.c b/newlib/libc/stdio/fgetc.c
index 54322a069..45404d30e 100644
--- a/newlib/libc/stdio/fgetc.c
+++ b/newlib/libc/stdio/fgetc.c
@@ -86,7 +86,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
_DEFUN(_fgetc_r, (ptr, fp),
- struct _reent * ptr _AND
+ struct _reent * ptr,
FILE * fp)
{
int result;
diff --git a/newlib/libc/stdio/fgetc_u.c b/newlib/libc/stdio/fgetc_u.c
index 5bbd5a549..45ee3b1b5 100644
--- a/newlib/libc/stdio/fgetc_u.c
+++ b/newlib/libc/stdio/fgetc_u.c
@@ -30,7 +30,7 @@
int
_DEFUN(_fgetc_unlocked_r, (ptr, fp),
- struct _reent * ptr _AND
+ struct _reent * ptr,
FILE * fp)
{
CHECK_INIT(ptr, fp);
diff --git a/newlib/libc/stdio/fgetpos.c b/newlib/libc/stdio/fgetpos.c
index 3074526b4..373adfd8e 100644
--- a/newlib/libc/stdio/fgetpos.c
+++ b/newlib/libc/stdio/fgetpos.c
@@ -66,8 +66,8 @@ No supporting OS subroutines are required.
int
_DEFUN(_fgetpos_r, (ptr, fp, pos),
- struct _reent * ptr _AND
- FILE *__restrict fp _AND
+ struct _reent * ptr,
+ FILE *__restrict fp,
_fpos_t *__restrict pos)
{
*pos = _ftell_r (ptr, fp);
@@ -83,7 +83,7 @@ _DEFUN(_fgetpos_r, (ptr, fp, pos),
int
_DEFUN(fgetpos, (fp, pos),
- FILE *__restrict fp _AND
+ FILE *__restrict fp,
_fpos_t *__restrict pos)
{
return _fgetpos_r (_REENT, fp, pos);
diff --git a/newlib/libc/stdio/fgets.c b/newlib/libc/stdio/fgets.c
index 54097510d..5edeef957 100644
--- a/newlib/libc/stdio/fgets.c
+++ b/newlib/libc/stdio/fgets.c
@@ -95,9 +95,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
char *
_DEFUN(_fgets_r, (ptr, buf, n, fp),
- struct _reent * ptr _AND
- char *__restrict buf _AND
- int n _AND
+ struct _reent * ptr,
+ char *__restrict buf,
+ int n,
FILE *__restrict fp)
{
size_t len;
@@ -190,8 +190,8 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp),
char *
_DEFUN(fgets, (buf, n, fp),
- char *__restrict buf _AND
- int n _AND
+ char *__restrict buf,
+ int n,
FILE *__restrict fp)
{
return _fgets_r (_REENT, buf, n, fp);
diff --git a/newlib/libc/stdio/fgetwc.c b/newlib/libc/stdio/fgetwc.c
index 07731487d..718b53a16 100644
--- a/newlib/libc/stdio/fgetwc.c
+++ b/newlib/libc/stdio/fgetwc.c
@@ -126,7 +126,7 @@ PORTABILITY
wint_t
_DEFUN(__fgetwc, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register FILE *fp)
{
wchar_t wc;
@@ -173,7 +173,7 @@ _DEFUN(__fgetwc, (ptr, fp),
wint_t
_DEFUN(_fgetwc_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register FILE *fp)
{
wint_t r;
diff --git a/newlib/libc/stdio/fgetwc_u.c b/newlib/libc/stdio/fgetwc_u.c
index 4ccd5765c..f3a4fea61 100644
--- a/newlib/libc/stdio/fgetwc_u.c
+++ b/newlib/libc/stdio/fgetwc_u.c
@@ -31,7 +31,7 @@
wint_t
_DEFUN(_fgetwc_unlocked_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register FILE *fp)
{
ORIENT(fp, 1);
diff --git a/newlib/libc/stdio/fgetws.c b/newlib/libc/stdio/fgetws.c
index 3dbf3ef74..8ca95d170 100644
--- a/newlib/libc/stdio/fgetws.c
+++ b/newlib/libc/stdio/fgetws.c
@@ -100,9 +100,9 @@ PORTABILITY
wchar_t *
_DEFUN(_fgetws_r, (ptr, ws, n, fp),
- struct _reent *ptr _AND
- wchar_t * ws _AND
- int n _AND
+ struct _reent *ptr,
+ wchar_t * ws,
+ int n,
FILE * fp)
{
wchar_t *wsp;
@@ -173,8 +173,8 @@ error:
wchar_t *
_DEFUN(fgetws, (ws, n, fp),
- wchar_t *__restrict ws _AND
- int n _AND
+ wchar_t *__restrict ws,
+ int n,
FILE *__restrict fp)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index 737bde102..3d928c15d 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -45,8 +45,8 @@ _NOINLINE_STATIC _VOID
static _VOID
#endif
_DEFUN(std, (ptr, flags, file),
- FILE *ptr _AND
- int flags _AND
+ FILE *ptr,
+ int flags,
int file)
{
ptr->_p = 0;
@@ -125,7 +125,7 @@ struct glue_with_file {
struct _glue *
_DEFUN(__sfmoreglue, (d, n),
- struct _reent *d _AND
+ struct _reent *d,
register int n)
{
struct glue_with_file *g;
diff --git a/newlib/libc/stdio/fiprintf.c b/newlib/libc/stdio/fiprintf.c
index 7d417f88c..1510556b2 100644
--- a/newlib/libc/stdio/fiprintf.c
+++ b/newlib/libc/stdio/fiprintf.c
@@ -23,8 +23,8 @@
int
_DEFUN(_fiprintf_r, (ptr, fp, fmt),
- struct _reent *ptr _AND
- FILE * fp _AND
+ struct _reent *ptr,
+ FILE * fp,
const char *fmt _DOTS)
{
int ret;
@@ -40,7 +40,7 @@ _DEFUN(_fiprintf_r, (ptr, fp, fmt),
int
_DEFUN(fiprintf, (fp, fmt),
- FILE * fp _AND
+ FILE * fp,
const char *fmt _DOTS)
{
int ret;
diff --git a/newlib/libc/stdio/flags.c b/newlib/libc/stdio/flags.c
index 518cc33f1..b8f660ec4 100644
--- a/newlib/libc/stdio/flags.c
+++ b/newlib/libc/stdio/flags.c
@@ -31,8 +31,8 @@
int
_DEFUN(__sflags, (ptr, mode, optr),
- struct _reent *ptr _AND
- register char *mode _AND
+ struct _reent *ptr,
+ register char *mode,
int *optr)
{
register int ret, m, o;
diff --git a/newlib/libc/stdio/fmemopen.c b/newlib/libc/stdio/fmemopen.c
index 520ba1b80..6a6153fbd 100644
--- a/newlib/libc/stdio/fmemopen.c
+++ b/newlib/libc/stdio/fmemopen.c
@@ -84,9 +84,9 @@ typedef struct fmemcookie {
COOKIE; return number of bytes read (0 on EOF). */
static _READ_WRITE_RETURN_TYPE
_DEFUN(fmemreader, (ptr, cookie, buf, n),
- struct _reent *ptr _AND
- void *cookie _AND
- char *buf _AND
+ struct _reent *ptr,
+ void *cookie,
+ char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
{
fmemcookie *c = (fmemcookie *) cookie;
@@ -104,9 +104,9 @@ _DEFUN(fmemreader, (ptr, cookie, buf, n),
returning the number of bytes written or EOF on failure. */
static _READ_WRITE_RETURN_TYPE
_DEFUN(fmemwriter, (ptr, cookie, buf, n),
- struct _reent *ptr _AND
- void *cookie _AND
- const char *buf _AND
+ struct _reent *ptr,
+ void *cookie,
+ const char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
{
fmemcookie *c = (fmemcookie *) cookie;
@@ -160,9 +160,9 @@ _DEFUN(fmemwriter, (ptr, cookie, buf, n),
COOKIE; return resulting position or fail with EOF. */
static _fpos_t
_DEFUN(fmemseeker, (ptr, cookie, pos, whence),
- struct _reent *ptr _AND
- void *cookie _AND
- _fpos_t pos _AND
+ struct _reent *ptr,
+ void *cookie,
+ _fpos_t pos,
int whence)
{
fmemcookie *c = (fmemcookie *) cookie;
@@ -215,9 +215,9 @@ _DEFUN(fmemseeker, (ptr, cookie, pos, whence),
#ifdef __LARGE64_FILES
static _fpos64_t
_DEFUN(fmemseeker64, (ptr, cookie, pos, whence),
- struct _reent *ptr _AND
- void *cookie _AND
- _fpos64_t pos _AND
+ struct _reent *ptr,
+ void *cookie,
+ _fpos64_t pos,
int whence)
{
_off64_t offset = (_off64_t) pos;
@@ -257,7 +257,7 @@ _DEFUN(fmemseeker64, (ptr, cookie, pos, whence),
/* Reclaim resources used by stream described by COOKIE. */
static int
_DEFUN(fmemcloser, (ptr, cookie),
- struct _reent *ptr _AND
+ struct _reent *ptr,
void *cookie)
{
fmemcookie *c = (fmemcookie *) cookie;
@@ -269,9 +269,9 @@ _DEFUN(fmemcloser, (ptr, cookie),
Return the new stream, or fail with NULL. */
FILE *
_DEFUN(_fmemopen_r, (ptr, buf, size, mode),
- struct _reent *ptr _AND
- void *__restrict buf _AND
- size_t size _AND
+ struct _reent *ptr,
+ void *__restrict buf,
+ size_t size,
const char *__restrict mode)
{
FILE *fp;
@@ -362,8 +362,8 @@ _DEFUN(_fmemopen_r, (ptr, buf, size, mode),
#ifndef _REENT_ONLY
FILE *
_DEFUN(fmemopen, (buf, size, mode),
- void *__restrict buf _AND
- size_t size _AND
+ void *__restrict buf,
+ size_t size,
const char *__restrict mode)
{
return _fmemopen_r (_REENT, buf, size, mode);
diff --git a/newlib/libc/stdio/fopen.c b/newlib/libc/stdio/fopen.c
index 2551befed..92ec70670 100644
--- a/newlib/libc/stdio/fopen.c
+++ b/newlib/libc/stdio/fopen.c
@@ -114,8 +114,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
FILE *
_DEFUN(_fopen_r, (ptr, file, mode),
- struct _reent *ptr _AND
- _CONST char *__restrict file _AND
+ struct _reent *ptr,
+ _CONST char *__restrict file,
_CONST char *__restrict mode)
{
register FILE *fp;
@@ -164,7 +164,7 @@ _DEFUN(_fopen_r, (ptr, file, mode),
FILE *
_DEFUN(fopen, (file, mode),
- _CONST char *file _AND
+ _CONST char *file,
_CONST char *mode)
{
return _fopen_r (_REENT, file, mode);
diff --git a/newlib/libc/stdio/fopencookie.c b/newlib/libc/stdio/fopencookie.c
index eb9861392..4ea1ab1d1 100644
--- a/newlib/libc/stdio/fopencookie.c
+++ b/newlib/libc/stdio/fopencookie.c
@@ -99,9 +99,9 @@ typedef struct fccookie {
static _READ_WRITE_RETURN_TYPE
_DEFUN(fcreader, (ptr, cookie, buf, n),
- struct _reent *ptr _AND
- void *cookie _AND
- char *buf _AND
+ struct _reent *ptr,
+ void *cookie,
+ char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
{
int result;
@@ -114,9 +114,9 @@ _DEFUN(fcreader, (ptr, cookie, buf, n),
static _READ_WRITE_RETURN_TYPE
_DEFUN(fcwriter, (ptr, cookie, buf, n),
- struct _reent *ptr _AND
- void *cookie _AND
- const char *buf _AND
+ struct _reent *ptr,
+ void *cookie,
+ const char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
{
int result;
@@ -137,9 +137,9 @@ _DEFUN(fcwriter, (ptr, cookie, buf, n),
static _fpos_t
_DEFUN(fcseeker, (ptr, cookie, pos, whence),
- struct _reent *ptr _AND
- void *cookie _AND
- _fpos_t pos _AND
+ struct _reent *ptr,
+ void *cookie,
+ _fpos_t pos,
int whence)
{
fccookie *c = (fccookie *) cookie;
@@ -165,9 +165,9 @@ _DEFUN(fcseeker, (ptr, cookie, pos, whence),
#ifdef __LARGE64_FILES
static _fpos64_t
_DEFUN(fcseeker64, (ptr, cookie, pos, whence),
- struct _reent *ptr _AND
- void *cookie _AND
- _fpos64_t pos _AND
+ struct _reent *ptr,
+ void *cookie,
+ _fpos64_t pos,
int whence)
{
_off64_t offset;
@@ -181,7 +181,7 @@ _DEFUN(fcseeker64, (ptr, cookie, pos, whence),
static int
_DEFUN(fccloser, (ptr, cookie),
- struct _reent *ptr _AND
+ struct _reent *ptr,
void *cookie)
{
int result = 0;
@@ -198,9 +198,9 @@ _DEFUN(fccloser, (ptr, cookie),
FILE *
_DEFUN(_fopencookie_r, (ptr, cookie, mode, functions),
- struct _reent *ptr _AND
- void *cookie _AND
- const char *mode _AND
+ struct _reent *ptr,
+ void *cookie,
+ const char *mode,
cookie_io_functions_t functions)
{
FILE *fp;
@@ -254,8 +254,8 @@ _DEFUN(_fopencookie_r, (ptr, cookie, mode, functions),
#ifndef _REENT_ONLY
FILE *
_DEFUN(fopencookie, (cookie, mode, functions),
- void *cookie _AND
- const char *mode _AND
+ void *cookie,
+ const char *mode,
cookie_io_functions_t functions)
{
return _fopencookie_r (_REENT, cookie, mode, functions);
diff --git a/newlib/libc/stdio/fprintf.c b/newlib/libc/stdio/fprintf.c
index fe92a5b99..6a98237a2 100644
--- a/newlib/libc/stdio/fprintf.c
+++ b/newlib/libc/stdio/fprintf.c
@@ -23,8 +23,8 @@
int
_DEFUN(_fprintf_r, (ptr, fp, fmt),
- struct _reent *ptr _AND
- FILE *__restrict fp _AND
+ struct _reent *ptr,
+ FILE *__restrict fp,
const char *__restrict fmt _DOTS)
{
int ret;
@@ -46,7 +46,7 @@ _EXFUN(_fiprintf_r, (struct _reent *, FILE *, const char *, ...)
int
_DEFUN(fprintf, (fp, fmt),
- FILE *__restrict fp _AND
+ FILE *__restrict fp,
const char *__restrict fmt _DOTS)
{
int ret;
diff --git a/newlib/libc/stdio/fpurge.c b/newlib/libc/stdio/fpurge.c
index de621feb6..acd177a69 100644
--- a/newlib/libc/stdio/fpurge.c
+++ b/newlib/libc/stdio/fpurge.c
@@ -61,7 +61,7 @@ No supporting OS subroutines are required.
int
_DEFUN(_fpurge_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register FILE * fp)
{
int t;
diff --git a/newlib/libc/stdio/fputc.c b/newlib/libc/stdio/fputc.c
index f9273d6ae..452bb2961 100644
--- a/newlib/libc/stdio/fputc.c
+++ b/newlib/libc/stdio/fputc.c
@@ -88,8 +88,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
_DEFUN(_fputc_r, (ptr, ch, file),
- struct _reent *ptr _AND
- int ch _AND
+ struct _reent *ptr,
+ int ch,
FILE * file)
{
int result;
@@ -103,7 +103,7 @@ _DEFUN(_fputc_r, (ptr, ch, file),
#ifndef _REENT_ONLY
int
_DEFUN(fputc, (ch, file),
- int ch _AND
+ int ch,
FILE * file)
{
#if !defined(__OPTIMIZE_SIZE__) && !defined(PREFER_SIZE_OVER_SPEED)
diff --git a/newlib/libc/stdio/fputc_u.c b/newlib/libc/stdio/fputc_u.c
index ac64b0bc2..27690e213 100644
--- a/newlib/libc/stdio/fputc_u.c
+++ b/newlib/libc/stdio/fputc_u.c
@@ -30,8 +30,8 @@
int
_DEFUN(_fputc_unlocked_r, (ptr, ch, file),
- struct _reent *ptr _AND
- int ch _AND
+ struct _reent *ptr,
+ int ch,
FILE * file)
{
CHECK_INIT(ptr, file);
@@ -41,7 +41,7 @@ _DEFUN(_fputc_unlocked_r, (ptr, ch, file),
#ifndef _REENT_ONLY
int
_DEFUN(fputc_unlocked, (ch, file),
- int ch _AND
+ int ch,
FILE * file)
{
#if !defined(__OPTIMIZE_SIZE__) && !defined(PREFER_SIZE_OVER_SPEED)
diff --git a/newlib/libc/stdio/fputs.c b/newlib/libc/stdio/fputs.c
index c4588265b..7adb89a04 100644
--- a/newlib/libc/stdio/fputs.c
+++ b/newlib/libc/stdio/fputs.c
@@ -87,8 +87,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
*/
int
_DEFUN(_fputs_r, (ptr, s, fp),
- struct _reent * ptr _AND
- char _CONST *__restrict s _AND
+ struct _reent * ptr,
+ char _CONST *__restrict s,
FILE *__restrict fp)
{
#ifdef _FVWRITE_IN_STREAMIO
@@ -136,7 +136,7 @@ error:
#ifndef _REENT_ONLY
int
_DEFUN(fputs, (s, fp),
- char _CONST *__restrict s _AND
+ char _CONST *__restrict s,
FILE *__restrict fp)
{
return _fputs_r (_REENT, s, fp);
diff --git a/newlib/libc/stdio/fputwc.c b/newlib/libc/stdio/fputwc.c
index 5e2a9e322..4943cef99 100644
--- a/newlib/libc/stdio/fputwc.c
+++ b/newlib/libc/stdio/fputwc.c
@@ -129,8 +129,8 @@ PORTABILITY
wint_t
_DEFUN(__fputwc, (ptr, wc, fp),
- struct _reent *ptr _AND
- wchar_t wc _AND
+ struct _reent *ptr,
+ wchar_t wc,
FILE *fp)
{
char buf[MB_LEN_MAX];
@@ -164,8 +164,8 @@ _DEFUN(__fputwc, (ptr, wc, fp),
wint_t
_DEFUN(_fputwc_r, (ptr, wc, fp),
- struct _reent *ptr _AND
- wchar_t wc _AND
+ struct _reent *ptr,
+ wchar_t wc,
FILE *fp)
{
wint_t r;
@@ -179,7 +179,7 @@ _DEFUN(_fputwc_r, (ptr, wc, fp),
wint_t
_DEFUN(fputwc, (wc, fp),
- wchar_t wc _AND
+ wchar_t wc,
FILE *fp)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/fputwc_u.c b/newlib/libc/stdio/fputwc_u.c
index 43be648f7..4d4f07a0a 100644
--- a/newlib/libc/stdio/fputwc_u.c
+++ b/newlib/libc/stdio/fputwc_u.c
@@ -31,8 +31,8 @@
wint_t
_DEFUN(_fputwc_unlocked_r, (ptr, wc, fp),
- struct _reent *ptr _AND
- wchar_t wc _AND
+ struct _reent *ptr,
+ wchar_t wc,
FILE *fp)
{
ORIENT(fp, 1);
@@ -41,7 +41,7 @@ _DEFUN(_fputwc_unlocked_r, (ptr, wc, fp),
wint_t
_DEFUN(fputwc_unlocked, (wc, fp),
- wchar_t wc _AND
+ wchar_t wc,
FILE *fp)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/fputws.c b/newlib/libc/stdio/fputws.c
index c68241c92..8a470fcfb 100644
--- a/newlib/libc/stdio/fputws.c
+++ b/newlib/libc/stdio/fputws.c
@@ -95,8 +95,8 @@ PORTABILITY
int
_DEFUN(_fputws_r, (ptr, ws, fp),
- struct _reent *ptr _AND
- const wchar_t *ws _AND
+ struct _reent *ptr,
+ const wchar_t *ws,
FILE *fp)
{
size_t nbytes;
@@ -159,7 +159,7 @@ error:
int
_DEFUN(fputws, (ws, fp),
- const wchar_t *__restrict ws _AND
+ const wchar_t *__restrict ws,
FILE *__restrict fp)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
index c2e60bedc..cff60efe1 100644
--- a/newlib/libc/stdio/fread.c
+++ b/newlib/libc/stdio/fread.c
@@ -94,10 +94,10 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifdef __SCLE
static size_t
_DEFUN(crlf_r, (ptr, fp, buf, count, eof),
- struct _reent * ptr _AND
- FILE * fp _AND
- char * buf _AND
- size_t count _AND
+ struct _reent * ptr,
+ FILE * fp,
+ char * buf,
+ size_t count,
int eof)
{
int r;
@@ -143,10 +143,10 @@ _DEFUN(crlf_r, (ptr, fp, buf, count, eof),
size_t
_DEFUN(_fread_r, (ptr, buf, size, count, fp),
- struct _reent * ptr _AND
- _PTR __restrict buf _AND
- size_t size _AND
- size_t count _AND
+ struct _reent * ptr,
+ _PTR __restrict buf,
+ size_t size,
+ size_t count,
FILE * __restrict fp)
{
register size_t resid;
@@ -261,9 +261,9 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp),
#ifndef _REENT_ONLY
size_t
_DEFUN(fread, (buf, size, count, fp),
- _PTR __restrict buf _AND
- size_t size _AND
- size_t count _AND
+ _PTR __restrict buf,
+ size_t size,
+ size_t count,
FILE *__restrict fp)
{
return _fread_r (_REENT, buf, size, count, fp);
diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c
index e5bb73a26..b9fee0c7b 100644
--- a/newlib/libc/stdio/freopen.c
+++ b/newlib/libc/stdio/freopen.c
@@ -76,9 +76,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
FILE *
_DEFUN(_freopen_r, (ptr, file, mode, fp),
- struct _reent *ptr _AND
- const char *__restrict file _AND
- const char *__restrict mode _AND
+ struct _reent *ptr,
+ const char *__restrict file,
+ const char *__restrict mode,
register FILE *__restrict fp)
{
register int f;
@@ -244,8 +244,8 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
FILE *
_DEFUN(freopen, (file, mode, fp),
- _CONST char *__restrict file _AND
- _CONST char *__restrict mode _AND
+ _CONST char *__restrict file,
+ _CONST char *__restrict mode,
register FILE *__restrict fp)
{
return _freopen_r (_REENT, file, mode, fp);
diff --git a/newlib/libc/stdio/fseek.c b/newlib/libc/stdio/fseek.c
index b5bd979d3..4b8a1e099 100644
--- a/newlib/libc/stdio/fseek.c
+++ b/newlib/libc/stdio/fseek.c
@@ -82,9 +82,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
_DEFUN(_fseek_r, (ptr, fp, offset, whence),
- struct _reent *ptr _AND
- register FILE *fp _AND
- long offset _AND
+ struct _reent *ptr,
+ register FILE *fp,
+ long offset,
int whence)
{
return _fseeko_r (ptr, fp, offset, whence);
@@ -94,8 +94,8 @@ _DEFUN(_fseek_r, (ptr, fp, offset, whence),
int
_DEFUN(fseek, (fp, offset, whence),
- register FILE *fp _AND
- long offset _AND
+ register FILE *fp,
+ long offset,
int whence)
{
return _fseek_r (_REENT, fp, offset, whence);
diff --git a/newlib/libc/stdio/fseeko.c b/newlib/libc/stdio/fseeko.c
index 52f978929..58bb9511b 100644
--- a/newlib/libc/stdio/fseeko.c
+++ b/newlib/libc/stdio/fseeko.c
@@ -94,9 +94,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
_DEFUN(_fseeko_r, (ptr, fp, offset, whence),
- struct _reent *ptr _AND
- register FILE *fp _AND
- _off_t offset _AND
+ struct _reent *ptr,
+ register FILE *fp,
+ _off_t offset,
int whence)
{
_fpos_t _EXFNPTR(seekfn, (struct _reent *, _PTR, _fpos_t, int));
@@ -360,8 +360,8 @@ dumb:
int
_DEFUN(fseeko, (fp, offset, whence),
- register FILE *fp _AND
- _off_t offset _AND
+ register FILE *fp,
+ _off_t offset,
int whence)
{
return _fseeko_r (_REENT, fp, offset, whence);
diff --git a/newlib/libc/stdio/fsetlocking.c b/newlib/libc/stdio/fsetlocking.c
index d62aef334..e27aa42fc 100644
--- a/newlib/libc/stdio/fsetlocking.c
+++ b/newlib/libc/stdio/fsetlocking.c
@@ -66,7 +66,7 @@ No supporting OS subroutines are required.
int
_DEFUN(__fsetlocking, (fp, type),
- FILE * fp _AND
+ FILE * fp,
int type)
{
int result;
diff --git a/newlib/libc/stdio/fsetpos.c b/newlib/libc/stdio/fsetpos.c
index a2a5d7b2e..ffc9d794c 100644
--- a/newlib/libc/stdio/fsetpos.c
+++ b/newlib/libc/stdio/fsetpos.c
@@ -60,8 +60,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
_DEFUN(_fsetpos_r, (ptr, iop, pos),
- struct _reent * ptr _AND
- FILE * iop _AND
+ struct _reent * ptr,
+ FILE * iop,
_CONST _fpos_t * pos)
{
int x = _fseek_r (ptr, iop, *pos, SEEK_SET);
@@ -75,7 +75,7 @@ _DEFUN(_fsetpos_r, (ptr, iop, pos),
int
_DEFUN(fsetpos, (iop, pos),
- FILE * iop _AND
+ FILE * iop,
_CONST _fpos_t * pos)
{
return _fsetpos_r (_REENT, iop, pos);
diff --git a/newlib/libc/stdio/ftell.c b/newlib/libc/stdio/ftell.c
index 70eed84c0..1260d5ef4 100644
--- a/newlib/libc/stdio/ftell.c
+++ b/newlib/libc/stdio/ftell.c
@@ -84,7 +84,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
long
_DEFUN(_ftell_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register FILE * fp)
{
_fpos_t pos;
diff --git a/newlib/libc/stdio/ftello.c b/newlib/libc/stdio/ftello.c
index c120c26a9..19299c3ad 100644
--- a/newlib/libc/stdio/ftello.c
+++ b/newlib/libc/stdio/ftello.c
@@ -84,7 +84,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
_off_t
_DEFUN(_ftello_r, (ptr, fp),
- struct _reent * ptr _AND
+ struct _reent * ptr,
register FILE * fp)
{
_fpos_t pos;
diff --git a/newlib/libc/stdio/funopen.c b/newlib/libc/stdio/funopen.c
index 58b75648a..23bed7b8e 100644
--- a/newlib/libc/stdio/funopen.c
+++ b/newlib/libc/stdio/funopen.c
@@ -105,9 +105,9 @@ typedef struct funcookie {
static _READ_WRITE_RETURN_TYPE
_DEFUN(funreader, (ptr, cookie, buf, n),
- struct _reent *ptr _AND
- void *cookie _AND
- char *buf _AND
+ struct _reent *ptr,
+ void *cookie,
+ char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
{
int result;
@@ -120,9 +120,9 @@ _DEFUN(funreader, (ptr, cookie, buf, n),
static _READ_WRITE_RETURN_TYPE
_DEFUN(funwriter, (ptr, cookie, buf, n),
- struct _reent *ptr _AND
- void *cookie _AND
- const char *buf _AND
+ struct _reent *ptr,
+ void *cookie,
+ const char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
{
int result;
@@ -135,9 +135,9 @@ _DEFUN(funwriter, (ptr, cookie, buf, n),
static _fpos_t
_DEFUN(funseeker, (ptr, cookie, off, whence),
- struct _reent *ptr _AND
- void *cookie _AND
- _fpos_t off _AND
+ struct _reent *ptr,
+ void *cookie,
+ _fpos_t off,
int whence)
{
funcookie *c = (funcookie *) cookie;
@@ -163,9 +163,9 @@ _DEFUN(funseeker, (ptr, cookie, off, whence),
#ifdef __LARGE64_FILES
static _fpos64_t
_DEFUN(funseeker64, (ptr, cookie, off, whence),
- struct _reent *ptr _AND
- void *cookie _AND
- _fpos64_t off _AND
+ struct _reent *ptr,
+ void *cookie,
+ _fpos64_t off,
int whence)
{
_fpos64_t result;
@@ -179,7 +179,7 @@ _DEFUN(funseeker64, (ptr, cookie, off, whence),
static int
_DEFUN(funcloser, (ptr, cookie),
- struct _reent *ptr _AND
+ struct _reent *ptr,
void *cookie)
{
int result = 0;
@@ -196,11 +196,11 @@ _DEFUN(funcloser, (ptr, cookie),
FILE *
_DEFUN(_funopen_r, (ptr, cookie, readfn, writefn, seekfn, closefn),
- struct _reent *ptr _AND
- const void *cookie _AND
- funread readfn _AND
- funwrite writefn _AND
- funseek seekfn _AND
+ struct _reent *ptr,
+ const void *cookie,
+ funread readfn,
+ funwrite writefn,
+ funseek seekfn,
funclose closefn)
{
FILE *fp;
@@ -268,10 +268,10 @@ _DEFUN(_funopen_r, (ptr, cookie, readfn, writefn, seekfn, closefn),
#ifndef _REENT_ONLY
FILE *
_DEFUN(funopen, (cookie, readfn, writefn, seekfn, closefn),
- const void *cookie _AND
- funread readfn _AND
- funwrite writefn _AND
- funseek seekfn _AND
+ const void *cookie,
+ funread readfn,
+ funwrite writefn,
+ funseek seekfn,
funclose closefn)
{
return _funopen_r (_REENT, cookie, readfn, writefn, seekfn, closefn);
diff --git a/newlib/libc/stdio/fvwrite.c b/newlib/libc/stdio/fvwrite.c
index 455666006..a0432a03d 100644
--- a/newlib/libc/stdio/fvwrite.c
+++ b/newlib/libc/stdio/fvwrite.c
@@ -46,8 +46,8 @@
int
_DEFUN(__sfvwrite_r, (ptr, fp, uio),
- struct _reent *ptr _AND
- register FILE *fp _AND
+ struct _reent *ptr,
+ register FILE *fp,
register struct __suio *uio)
{
register size_t len;
diff --git a/newlib/libc/stdio/fwalk.c b/newlib/libc/stdio/fwalk.c
index cceaa96c2..8b7b5b0e3 100644
--- a/newlib/libc/stdio/fwalk.c
+++ b/newlib/libc/stdio/fwalk.c
@@ -29,7 +29,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(_fwalk, (ptr, function),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register int (*function) (FILE *))
{
register FILE *fp;
@@ -56,7 +56,7 @@ _DEFUN(_fwalk, (ptr, function),
I/O function (e.g. _fclose_r). */
int
_DEFUN(_fwalk_reent, (ptr, reent_function),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register int (*reent_function) (struct _reent *, FILE *))
{
register FILE *fp;
diff --git a/newlib/libc/stdio/fwide.c b/newlib/libc/stdio/fwide.c
index a57a77c95..719a58acd 100644
--- a/newlib/libc/stdio/fwide.c
+++ b/newlib/libc/stdio/fwide.c
@@ -49,8 +49,8 @@ C99, POSIX.1-2001.
int
_DEFUN(_fwide_r, (ptr, fp, mode),
- struct _reent *ptr _AND
- FILE *fp _AND
+ struct _reent *ptr,
+ FILE *fp,
int mode)
{
int ret;
@@ -71,7 +71,7 @@ _DEFUN(_fwide_r, (ptr, fp, mode),
int
_DEFUN(fwide, (fp, mode),
- FILE *fp _AND
+ FILE *fp,
int mode)
{
return _fwide_r (_REENT, fp, mode);
diff --git a/newlib/libc/stdio/fwprintf.c b/newlib/libc/stdio/fwprintf.c
index 4b05824c4..00a8d41f9 100644
--- a/newlib/libc/stdio/fwprintf.c
+++ b/newlib/libc/stdio/fwprintf.c
@@ -24,8 +24,8 @@
int
_DEFUN(_fwprintf_r, (ptr, fp, fmt),
- struct _reent *ptr _AND
- FILE *fp _AND
+ struct _reent *ptr,
+ FILE *fp,
const wchar_t *fmt _DOTS)
{
int ret;
@@ -41,7 +41,7 @@ _DEFUN(_fwprintf_r, (ptr, fp, fmt),
int
_DEFUN(fwprintf, (fp, fmt),
- FILE *__restrict fp _AND
+ FILE *__restrict fp,
const wchar_t *__restrict fmt _DOTS)
{
int ret;
diff --git a/newlib/libc/stdio/fwrite.c b/newlib/libc/stdio/fwrite.c
index 2ba71f38a..a805eff7f 100644
--- a/newlib/libc/stdio/fwrite.c
+++ b/newlib/libc/stdio/fwrite.c
@@ -109,10 +109,10 @@ static char sccsid[] = "%W% (Berkeley) %G%";
size_t
_DEFUN(_fwrite_r, (ptr, buf, size, count, fp),
- struct _reent * ptr _AND
- _CONST _PTR __restrict buf _AND
- size_t size _AND
- size_t count _AND
+ struct _reent * ptr,
+ _CONST _PTR __restrict buf,
+ size_t size,
+ size_t count,
FILE * __restrict fp)
{
size_t n;
@@ -171,9 +171,9 @@ ret:
#ifndef _REENT_ONLY
size_t
_DEFUN(fwrite, (buf, size, count, fp),
- _CONST _PTR __restrict buf _AND
- size_t size _AND
- size_t count _AND
+ _CONST _PTR __restrict buf,
+ size_t size,
+ size_t count,
FILE * fp)
{
return _fwrite_r (_REENT, buf, size, count, fp);
diff --git a/newlib/libc/stdio/getc.c b/newlib/libc/stdio/getc.c
index 37e345870..269bfb1d3 100644
--- a/newlib/libc/stdio/getc.c
+++ b/newlib/libc/stdio/getc.c
@@ -77,7 +77,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(_getc_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register FILE *fp)
{
int result;
diff --git a/newlib/libc/stdio/getc_u.c b/newlib/libc/stdio/getc_u.c
index 6b71ce52d..2f9f0e818 100644
--- a/newlib/libc/stdio/getc_u.c
+++ b/newlib/libc/stdio/getc_u.c
@@ -70,7 +70,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(_getc_unlocked_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register FILE *fp)
{
/* CHECK_INIT is called (eventually) by __srefill_r. */
diff --git a/newlib/libc/stdio/getdelim.c b/newlib/libc/stdio/getdelim.c
index d806c02cf..4164be5c5 100644
--- a/newlib/libc/stdio/getdelim.c
+++ b/newlib/libc/stdio/getdelim.c
@@ -41,9 +41,9 @@ No supporting OS subroutines are directly required.
ssize_t
_DEFUN(__getdelim, (bufptr, n, delim, fp),
- char **bufptr _AND
- size_t *n _AND
- int delim _AND
+ char **bufptr,
+ size_t *n,
+ int delim,
FILE *fp)
{
char *buf;
diff --git a/newlib/libc/stdio/getline.c b/newlib/libc/stdio/getline.c
index 66ffd1990..b212a8c8f 100644
--- a/newlib/libc/stdio/getline.c
+++ b/newlib/libc/stdio/getline.c
@@ -38,8 +38,8 @@ extern ssize_t _EXFUN(__getdelim, (char **, size_t *, int, FILE *));
ssize_t
_DEFUN(__getline, (lptr, n, fp),
- char **lptr _AND
- size_t *n _AND
+ char **lptr,
+ size_t *n,
FILE *fp)
{
return __getdelim (lptr, n, '\n', fp);
diff --git a/newlib/libc/stdio/gets.c b/newlib/libc/stdio/gets.c
index a78d06b89..4e951efe3 100644
--- a/newlib/libc/stdio/gets.c
+++ b/newlib/libc/stdio/gets.c
@@ -64,7 +64,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
char *
_DEFUN(_gets_r, (ptr, buf),
- struct _reent *ptr _AND
+ struct _reent *ptr,
char *buf)
{
register int c;
diff --git a/newlib/libc/stdio/getwc.c b/newlib/libc/stdio/getwc.c
index 6d88fa869..db9a43768 100644
--- a/newlib/libc/stdio/getwc.c
+++ b/newlib/libc/stdio/getwc.c
@@ -34,7 +34,7 @@
wint_t
_DEFUN(_getwc_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
FILE *fp)
{
return _fgetwc_r (ptr, fp);
diff --git a/newlib/libc/stdio/getwc_u.c b/newlib/libc/stdio/getwc_u.c
index 613b69eca..913c3e08b 100644
--- a/newlib/libc/stdio/getwc_u.c
+++ b/newlib/libc/stdio/getwc_u.c
@@ -35,7 +35,7 @@
wint_t
_DEFUN(_getwc_unlocked_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
FILE *fp)
{
return _fgetwc_unlocked_r (ptr, fp);
diff --git a/newlib/libc/stdio/iprintf.c b/newlib/libc/stdio/iprintf.c
index c55f7ce17..6c30c4257 100644
--- a/newlib/libc/stdio/iprintf.c
+++ b/newlib/libc/stdio/iprintf.c
@@ -43,7 +43,7 @@ _DEFUN(iprintf, (fmt),
int
_DEFUN(_iprintf_r, (ptr, fmt),
- struct _reent *ptr _AND
+ struct _reent *ptr,
const char *fmt _DOTS)
{
int ret;
diff --git a/newlib/libc/stdio/makebuf.c b/newlib/libc/stdio/makebuf.c
index ab20a0838..ac1276b48 100644
--- a/newlib/libc/stdio/makebuf.c
+++ b/newlib/libc/stdio/makebuf.c
@@ -36,7 +36,7 @@
_VOID
_DEFUN(__smakebuf_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register FILE *fp)
{
register _PTR p;
@@ -77,9 +77,9 @@ _DEFUN(__smakebuf_r, (ptr, fp),
*/
int
_DEFUN(__swhatbuf_r, (ptr, fp, bufsize, couldbetty),
- struct _reent *ptr _AND
- FILE *fp _AND
- size_t *bufsize _AND
+ struct _reent *ptr,
+ FILE *fp,
+ size_t *bufsize,
int *couldbetty)
{
#ifdef _FSEEK_OPTIMIZATION
diff --git a/newlib/libc/stdio/mktemp.c b/newlib/libc/stdio/mktemp.c
index 3ece9ab2c..37092496b 100644
--- a/newlib/libc/stdio/mktemp.c
+++ b/newlib/libc/stdio/mktemp.c
@@ -140,11 +140,11 @@ Supporting OS subroutines required: <<getpid>>, <<mkdir>>, <<open>>, <<stat>>.
static int
_DEFUN(_gettemp, (ptr, path, doopen, domkdir, suffixlen, flags),
- struct _reent *ptr _AND
- char *path _AND
- register int *doopen _AND
- int domkdir _AND
- size_t suffixlen _AND
+ struct _reent *ptr,
+ char *path,
+ register int *doopen,
+ int domkdir,
+ size_t suffixlen,
int flags)
{
register char *start, *trv;
@@ -264,7 +264,7 @@ _DEFUN(_gettemp, (ptr, path, doopen, domkdir, suffixlen, flags),
int
_DEFUN(_mkstemp_r, (ptr, path),
- struct _reent *ptr _AND
+ struct _reent *ptr,
char *path)
{
int fd;
@@ -275,7 +275,7 @@ _DEFUN(_mkstemp_r, (ptr, path),
#if !defined _ELIX_LEVEL || _ELIX_LEVEL >= 4
char *
_DEFUN(_mkdtemp_r, (ptr, path),
- struct _reent *ptr _AND
+ struct _reent *ptr,
char *path)
{
return (_gettemp (ptr, path, (int *) NULL, 1, 0, 0) ? path : NULL);
@@ -283,8 +283,8 @@ _DEFUN(_mkdtemp_r, (ptr, path),
int
_DEFUN(_mkstemps_r, (ptr, path, len),
- struct _reent *ptr _AND
- char *path _AND
+ struct _reent *ptr,
+ char *path,
int len)
{
int fd;
@@ -294,8 +294,8 @@ _DEFUN(_mkstemps_r, (ptr, path, len),
int
_DEFUN(_mkostemp_r, (ptr, path, flags),
- struct _reent *ptr _AND
- char *path _AND
+ struct _reent *ptr,
+ char *path,
int flags)
{
int fd;
@@ -305,9 +305,9 @@ _DEFUN(_mkostemp_r, (ptr, path, flags),
int
_DEFUN(_mkostemps_r, (ptr, path, len, flags),
- struct _reent *ptr _AND
- char *path _AND
- int len _AND
+ struct _reent *ptr,
+ char *path,
+ int len,
int flags)
{
int fd;
@@ -318,7 +318,7 @@ _DEFUN(_mkostemps_r, (ptr, path, len, flags),
char *
_DEFUN(_mktemp_r, (ptr, path),
- struct _reent *ptr _AND
+ struct _reent *ptr,
char *path)
{
return (_gettemp (ptr, path, (int *) NULL, 0, 0, 0) ? path : (char *) NULL);
@@ -345,7 +345,7 @@ _DEFUN(mkdtemp, (path),
int
_DEFUN(mkstemps, (path, len),
- char *path _AND
+ char *path,
int len)
{
int fd;
@@ -355,7 +355,7 @@ _DEFUN(mkstemps, (path, len),
int
_DEFUN(mkostemp, (path, flags),
- char *path _AND
+ char *path,
int flags)
{
int fd;
@@ -365,8 +365,8 @@ _DEFUN(mkostemp, (path, flags),
int
_DEFUN(mkostemps, (path, len, flags),
- char *path _AND
- int len _AND
+ char *path,
+ int len,
int flags)
{
int fd;
diff --git a/newlib/libc/stdio/nano-vfprintf.c b/newlib/libc/stdio/nano-vfprintf.c
index e6604e771..648bb33a7 100644
--- a/newlib/libc/stdio/nano-vfprintf.c
+++ b/newlib/libc/stdio/nano-vfprintf.c
@@ -173,9 +173,9 @@ static char *rcsid = "$Id$";
#ifdef STRING_ONLY
int
_DEFUN(__ssputs_r, (ptr, fp, buf, len),
- struct _reent *ptr _AND
- FILE *fp _AND
- _CONST char *buf _AND
+ struct _reent *ptr,
+ FILE *fp,
+ _CONST char *buf,
size_t len)
{
register int w;
@@ -244,8 +244,8 @@ err:
by a serial of functions like svfwprintf for wide char output. */
int
_DEFUN(__ssprint_r, (ptr, fp, uio),
- struct _reent *ptr _AND
- FILE *fp _AND
+ struct _reent *ptr,
+ FILE *fp,
register struct __suio *uio)
{
register size_t len;
@@ -348,8 +348,8 @@ err:
then reset it so that it can be reused. */
int
_DEFUN(__sprint_r, (ptr, fp, uio),
- struct _reent *ptr _AND
- FILE *fp _AND
+ struct _reent *ptr,
+ FILE *fp,
register struct __suio *uio)
{
register int err = 0;
@@ -393,8 +393,8 @@ out:
_NOINLINE_STATIC int
_DEFUN(__sfputc_r, (ptr, c, fp),
- struct _reent *ptr _AND
- int c _AND
+ struct _reent *ptr,
+ int c,
FILE *fp)
{
if (--fp->_w >= 0 || (fp->_w >= fp->_lbfsize && (char)c != '\n'))
@@ -405,9 +405,9 @@ _DEFUN(__sfputc_r, (ptr, c, fp),
int
_DEFUN(__sfputs_r, (ptr, fp, buf, len),
- struct _reent *ptr _AND
- FILE *fp _AND
- _CONST char *buf _AND
+ struct _reent *ptr,
+ FILE *fp,
+ _CONST char *buf,
size_t len)
{
register int i;
@@ -443,8 +443,8 @@ int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, _CONST char *, va_list));
#ifndef STRING_ONLY
int
_DEFUN(VFPRINTF, (fp, fmt0, ap),
- FILE * fp _AND
- _CONST char *fmt0 _AND
+ FILE * fp,
+ _CONST char *fmt0,
va_list ap)
{
int result;
@@ -472,9 +472,9 @@ _EXFUN(vfiprintf, (FILE *, const char *, __VALIST)
int
_DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
- struct _reent *data _AND
- FILE * fp _AND
- _CONST char *fmt0 _AND
+ struct _reent *data,
+ FILE * fp,
+ _CONST char *fmt0,
va_list ap)
{
register char *fmt; /* Format string. */
diff --git a/newlib/libc/stdio/nano-vfscanf.c b/newlib/libc/stdio/nano-vfscanf.c
index 564f2916d..479f9776f 100644
--- a/newlib/libc/stdio/nano-vfscanf.c
+++ b/newlib/libc/stdio/nano-vfscanf.c
@@ -136,8 +136,8 @@ Supporting OS subroutines required:
int
_DEFUN(VFSCANF, (fp, fmt, ap),
- register FILE *fp _AND
- _CONST char *fmt _AND
+ register FILE *fp,
+ _CONST char *fmt,
va_list ap)
{
CHECK_INIT(_REENT, fp);
@@ -150,8 +150,8 @@ _EXFUN(vfiscanf, (FILE *, const char *, __VALIST)
int
_DEFUN(__SVFSCANF, (fp, fmt0, ap),
- register FILE *fp _AND
- char _CONST *fmt0 _AND
+ register FILE *fp,
+ char _CONST *fmt0,
va_list ap)
{
return __SVFSCANF_R (_REENT, fp, fmt0, ap);
@@ -161,9 +161,9 @@ _DEFUN(__SVFSCANF, (fp, fmt0, ap),
int
_DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
- struct _reent *data _AND
- register FILE *fp _AND
- _CONST char *fmt _AND
+ struct _reent *data,
+ register FILE *fp,
+ _CONST char *fmt,
va_list ap)
{
CHECK_INIT(data, fp);
@@ -181,8 +181,8 @@ _EXFUN(_vfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
So, we create our own trimmed-down version. */
int
_DEFUN(_sungetc_r, (data, fp, ch),
- struct _reent *data _AND
- int c _AND
+ struct _reent *data,
+ int c,
register FILE *fp)
{
if (c == EOF)
@@ -230,7 +230,7 @@ _DEFUN(_sungetc_r, (data, fp, ch),
/* String only version of __srefill_r for sscanf family. */
int
_DEFUN(__ssrefill_r, (ptr, fp),
- struct _reent * ptr _AND
+ struct _reent * ptr,
register FILE * fp)
{
/* Our only hope of further input is the ungetc buffer.
@@ -260,9 +260,9 @@ size_t _EXFUN (_sfread_r, (struct _reent *, _PTR buf, size_t, size_t, FILE *));
int
_DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
- struct _reent *rptr _AND
- register FILE *fp _AND
- char _CONST *fmt0 _AND
+ struct _reent *rptr,
+ register FILE *fp,
+ char _CONST *fmt0,
va_list ap)
{
register u_char *fmt = (u_char *) fmt0;
diff --git a/newlib/libc/stdio/open_memstream.c b/newlib/libc/stdio/open_memstream.c
index 9e6736f77..5dd64115b 100644
--- a/newlib/libc/stdio/open_memstream.c
+++ b/newlib/libc/stdio/open_memstream.c
@@ -94,9 +94,9 @@ typedef struct memstream {
returning the number of bytes written or EOF on failure. */
static _READ_WRITE_RETURN_TYPE
_DEFUN(memwriter, (ptr, cookie, buf, n),
- struct _reent *ptr _AND
- void *cookie _AND
- const char *buf _AND
+ struct _reent *ptr,
+ void *cookie,
+ const char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
{
memstream *c = (memstream *) cookie;
@@ -148,9 +148,9 @@ _DEFUN(memwriter, (ptr, cookie, buf, n),
COOKIE; return resulting position or fail with EOF. */
static _fpos_t
_DEFUN(memseeker, (ptr, cookie, pos, whence),
- struct _reent *ptr _AND
- void *cookie _AND
- _fpos_t pos _AND
+ struct _reent *ptr,
+ void *cookie,
+ _fpos_t pos,
int whence)
{
memstream *c = (memstream *) cookie;
@@ -216,9 +216,9 @@ _DEFUN(memseeker, (ptr, cookie, pos, whence),
#ifdef __LARGE64_FILES
static _fpos64_t
_DEFUN(memseeker64, (ptr, cookie, pos, whence),
- struct _reent *ptr _AND
- void *cookie _AND
- _fpos64_t pos _AND
+ struct _reent *ptr,
+ void *cookie,
+ _fpos64_t pos,
int whence)
{
_off64_t offset = (_off64_t) pos;
@@ -276,7 +276,7 @@ _DEFUN(memseeker64, (ptr, cookie, pos, whence),
/* Reclaim resources used by stream described by COOKIE. */
static int
_DEFUN(memcloser, (ptr, cookie),
- struct _reent *ptr _AND
+ struct _reent *ptr,
void *cookie)
{
memstream *c = (memstream *) cookie;
@@ -296,9 +296,9 @@ _DEFUN(memcloser, (ptr, cookie),
Return the new stream, or fail with NULL. */
static FILE *
_DEFUN(internal_open_memstream_r, (ptr, buf, size, wide),
- struct _reent *ptr _AND
- char **buf _AND
- size_t *size _AND
+ struct _reent *ptr,
+ char **buf,
+ size_t *size,
int wide)
{
FILE *fp;
@@ -379,8 +379,8 @@ _DEFUN(internal_open_memstream_r, (ptr, buf, size, wide),
FILE *
_DEFUN(_open_memstream_r, (ptr, buf, size),
- struct _reent *ptr _AND
- char **buf _AND
+ struct _reent *ptr,
+ char **buf,
size_t *size)
{
return internal_open_memstream_r (ptr, buf, size, -1);
@@ -388,8 +388,8 @@ _DEFUN(_open_memstream_r, (ptr, buf, size),
FILE *
_DEFUN(_open_wmemstream_r, (ptr, buf, size),
- struct _reent *ptr _AND
- wchar_t **buf _AND
+ struct _reent *ptr,
+ wchar_t **buf,
size_t *size)
{
return internal_open_memstream_r (ptr, (char **)buf, size, 1);
@@ -398,7 +398,7 @@ _DEFUN(_open_wmemstream_r, (ptr, buf, size),
#ifndef _REENT_ONLY
FILE *
_DEFUN(open_memstream, (buf, size),
- char **buf _AND
+ char **buf,
size_t *size)
{
return _open_memstream_r (_REENT, buf, size);
@@ -406,7 +406,7 @@ _DEFUN(open_memstream, (buf, size),
FILE *
_DEFUN(open_wmemstream, (buf, size),
- wchar_t **buf _AND
+ wchar_t **buf,
size_t *size)
{
return _open_wmemstream_r (_REENT, buf, size);
diff --git a/newlib/libc/stdio/perror.c b/newlib/libc/stdio/perror.c
index 0f0259632..cd1829180 100644
--- a/newlib/libc/stdio/perror.c
+++ b/newlib/libc/stdio/perror.c
@@ -60,7 +60,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
_VOID
_DEFUN(_perror_r, (ptr, s),
- struct _reent *ptr _AND
+ struct _reent *ptr,
_CONST char *s)
{
char *error;
diff --git a/newlib/libc/stdio/printf.c b/newlib/libc/stdio/printf.c
index d5dedf906..ba5b76850 100644
--- a/newlib/libc/stdio/printf.c
+++ b/newlib/libc/stdio/printf.c
@@ -24,7 +24,7 @@
int
_DEFUN(_printf_r, (ptr, fmt),
- struct _reent *ptr _AND
+ struct _reent *ptr,
const char *__restrict fmt _DOTS)
{
int ret;
diff --git a/newlib/libc/stdio/putc.c b/newlib/libc/stdio/putc.c
index a00aaad08..e69841d17 100644
--- a/newlib/libc/stdio/putc.c
+++ b/newlib/libc/stdio/putc.c
@@ -79,8 +79,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(_putc_r, (ptr, c, fp),
- struct _reent *ptr _AND
- int c _AND
+ struct _reent *ptr,
+ int c,
register FILE *fp)
{
int result;
@@ -94,7 +94,7 @@ _DEFUN(_putc_r, (ptr, c, fp),
#ifndef _REENT_ONLY
int
_DEFUN(putc, (c, fp),
- int c _AND
+ int c,
register FILE *fp)
{
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/stdio/putc_u.c b/newlib/libc/stdio/putc_u.c
index f710aaf57..b53060bed 100644
--- a/newlib/libc/stdio/putc_u.c
+++ b/newlib/libc/stdio/putc_u.c
@@ -71,8 +71,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(_putc_unlocked_r, (ptr, c, fp),
- struct _reent *ptr _AND
- int c _AND
+ struct _reent *ptr,
+ int c,
register FILE *fp)
{
/* CHECK_INIT is (eventually) called by __swbuf. */
@@ -83,7 +83,7 @@ _DEFUN(_putc_unlocked_r, (ptr, c, fp),
#ifndef _REENT_ONLY
int
_DEFUN(putc_unlocked, (c, fp),
- int c _AND
+ int c,
register FILE *fp)
{
/* CHECK_INIT is (eventually) called by __swbuf. */
diff --git a/newlib/libc/stdio/putchar.c b/newlib/libc/stdio/putchar.c
index a4b669832..813144a2b 100644
--- a/newlib/libc/stdio/putchar.c
+++ b/newlib/libc/stdio/putchar.c
@@ -68,7 +68,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(_putchar_r, (ptr, c),
- struct _reent *ptr _AND
+ struct _reent *ptr,
int c)
{
_REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/putchar_u.c b/newlib/libc/stdio/putchar_u.c
index a866c7799..e0ed8f7d7 100644
--- a/newlib/libc/stdio/putchar_u.c
+++ b/newlib/libc/stdio/putchar_u.c
@@ -62,7 +62,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(_putchar_unlocked_r, (ptr, c),
- struct _reent *ptr _AND
+ struct _reent *ptr,
int c)
{
return putc_unlocked (c, _stdout_r (ptr));
diff --git a/newlib/libc/stdio/puts.c b/newlib/libc/stdio/puts.c
index 72f929eea..36cc83203 100644
--- a/newlib/libc/stdio/puts.c
+++ b/newlib/libc/stdio/puts.c
@@ -66,7 +66,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(_puts_r, (ptr, s),
- struct _reent *ptr _AND
+ struct _reent *ptr,
_CONST char * s)
{
#ifdef _FVWRITE_IN_STREAMIO
diff --git a/newlib/libc/stdio/putw.c b/newlib/libc/stdio/putw.c
index d4f785814..1e3c78c3e 100644
--- a/newlib/libc/stdio/putw.c
+++ b/newlib/libc/stdio/putw.c
@@ -50,7 +50,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(putw, (w, fp),
- int w _AND
+ int w,
register FILE *fp)
{
if (fwrite ((_CONST char*)&w, sizeof (w), 1, fp) != 1)
diff --git a/newlib/libc/stdio/putwc.c b/newlib/libc/stdio/putwc.c
index 9a84f35fb..7c31d23d8 100644
--- a/newlib/libc/stdio/putwc.c
+++ b/newlib/libc/stdio/putwc.c
@@ -34,8 +34,8 @@
wint_t
_DEFUN(_putwc_r, (ptr, wc, fp),
- struct _reent *ptr _AND
- wchar_t wc _AND
+ struct _reent *ptr,
+ wchar_t wc,
FILE *fp)
{
return _fputwc_r (ptr, wc, fp);
@@ -46,7 +46,7 @@ _DEFUN(_putwc_r, (ptr, wc, fp),
*/
wint_t
_DEFUN(putwc, (wc, fp),
- wchar_t wc _AND
+ wchar_t wc,
FILE *fp)
{
return fputwc (wc, fp);
diff --git a/newlib/libc/stdio/putwc_u.c b/newlib/libc/stdio/putwc_u.c
index bb71acc2a..cb09fd2db 100644
--- a/newlib/libc/stdio/putwc_u.c
+++ b/newlib/libc/stdio/putwc_u.c
@@ -35,8 +35,8 @@
wint_t
_DEFUN(_putwc_unlocked_r, (ptr, wc, fp),
- struct _reent *ptr _AND
- wchar_t wc _AND
+ struct _reent *ptr,
+ wchar_t wc,
FILE *fp)
{
return _fputwc_unlocked_r (ptr, wc, fp);
@@ -47,7 +47,7 @@ _DEFUN(_putwc_unlocked_r, (ptr, wc, fp),
*/
wint_t
_DEFUN(putwc_unlocked, (wc, fp),
- wchar_t wc _AND
+ wchar_t wc,
FILE *fp)
{
return fputwc_unlocked (wc, fp);
diff --git a/newlib/libc/stdio/putwchar.c b/newlib/libc/stdio/putwchar.c
index 248d5922d..66ed30ac0 100644
--- a/newlib/libc/stdio/putwchar.c
+++ b/newlib/libc/stdio/putwchar.c
@@ -88,7 +88,7 @@ PORTABILITY
wint_t
_DEFUN(_putwchar_r, (ptr, wc),
- struct _reent *ptr _AND
+ struct _reent *ptr,
wchar_t wc)
{
return _fputwc_r (ptr, wc, stdout);
diff --git a/newlib/libc/stdio/putwchar_u.c b/newlib/libc/stdio/putwchar_u.c
index 3235472a2..68c5abe26 100644
--- a/newlib/libc/stdio/putwchar_u.c
+++ b/newlib/libc/stdio/putwchar_u.c
@@ -35,7 +35,7 @@
wint_t
_DEFUN(_putwchar_unlocked_r, (ptr, wc),
- struct _reent *ptr _AND
+ struct _reent *ptr,
wchar_t wc)
{
return _fputwc_unlocked_r (ptr, wc, stdout);
diff --git a/newlib/libc/stdio/refill.c b/newlib/libc/stdio/refill.c
index 9d853f94d..fc738d455 100644
--- a/newlib/libc/stdio/refill.c
+++ b/newlib/libc/stdio/refill.c
@@ -38,7 +38,7 @@ _DEFUN(lflush, (fp),
int
_DEFUN(__srefill_r, (ptr, fp),
- struct _reent * ptr _AND
+ struct _reent * ptr,
register FILE * fp)
{
/* make sure stdio is set up */
diff --git a/newlib/libc/stdio/remove.c b/newlib/libc/stdio/remove.c
index 7b8d3060f..18c468d61 100644
--- a/newlib/libc/stdio/remove.c
+++ b/newlib/libc/stdio/remove.c
@@ -60,7 +60,7 @@ Supporting OS subroutine required: <<unlink>>.
int
_DEFUN(_remove_r, (ptr, filename),
- struct _reent *ptr _AND
+ struct _reent *ptr,
_CONST char *filename)
{
if (_unlink_r (ptr, filename) == -1)
diff --git a/newlib/libc/stdio/rename.c b/newlib/libc/stdio/rename.c
index 1b807f8b2..a2b0d4188 100644
--- a/newlib/libc/stdio/rename.c
+++ b/newlib/libc/stdio/rename.c
@@ -55,7 +55,7 @@ Supporting OS subroutines required: <<link>>, <<unlink>>, or <<rename>>.
int
_DEFUN(rename, (old, new),
- _CONST char *old _AND
+ _CONST char *old,
_CONST char *new)
{
return _rename_r (_REENT, old, new);
diff --git a/newlib/libc/stdio/rewind.c b/newlib/libc/stdio/rewind.c
index 417a5963d..873083b85 100644
--- a/newlib/libc/stdio/rewind.c
+++ b/newlib/libc/stdio/rewind.c
@@ -53,7 +53,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
_VOID
_DEFUN(_rewind_r, (ptr, fp),
- struct _reent * ptr _AND
+ struct _reent * ptr,
register FILE * fp)
{
_CAST_VOID _fseek_r (ptr, fp, 0L, SEEK_SET);
diff --git a/newlib/libc/stdio/rget.c b/newlib/libc/stdio/rget.c
index 9474bd9f6..d76f307d7 100644
--- a/newlib/libc/stdio/rget.c
+++ b/newlib/libc/stdio/rget.c
@@ -33,7 +33,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(__srget_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register FILE *fp)
{
/* Ensure that any fake std stream is resolved before
diff --git a/newlib/libc/stdio/sccl.c b/newlib/libc/stdio/sccl.c
index b01801145..d0bdfd936 100644
--- a/newlib/libc/stdio/sccl.c
+++ b/newlib/libc/stdio/sccl.c
@@ -32,7 +32,7 @@
u_char *
_DEFUN(__sccl, (tab, fmt),
- register char *tab _AND
+ register char *tab,
register u_char *fmt)
{
register int c, n, v;
diff --git a/newlib/libc/stdio/setbuf.c b/newlib/libc/stdio/setbuf.c
index 29f5377a7..a7df3a1f4 100644
--- a/newlib/libc/stdio/setbuf.c
+++ b/newlib/libc/stdio/setbuf.c
@@ -66,7 +66,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
_VOID
_DEFUN(setbuf, (fp, buf),
- FILE *__restrict fp _AND
+ FILE *__restrict fp,
char *__restrict buf)
{
_CAST_VOID setvbuf (fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
diff --git a/newlib/libc/stdio/setbuffer.c b/newlib/libc/stdio/setbuffer.c
index 880779d13..cbcbde3db 100644
--- a/newlib/libc/stdio/setbuffer.c
+++ b/newlib/libc/stdio/setbuffer.c
@@ -66,8 +66,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
_VOID
_DEFUN(setbuffer, (fp, buf, size),
- FILE * fp _AND
- char *buf _AND
+ FILE * fp,
+ char *buf,
int size)
{
_CAST_VOID setvbuf (fp, buf, buf ? _IOFBF : _IONBF, (size_t) size);
diff --git a/newlib/libc/stdio/setvbuf.c b/newlib/libc/stdio/setvbuf.c
index 6fa0252b0..684a8b582 100644
--- a/newlib/libc/stdio/setvbuf.c
+++ b/newlib/libc/stdio/setvbuf.c
@@ -89,9 +89,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
_DEFUN(setvbuf, (fp, buf, mode, size),
- register FILE * fp _AND
- char *buf _AND
- register int mode _AND
+ register FILE * fp,
+ char *buf,
+ register int mode,
register size_t size)
{
int ret = 0;
diff --git a/newlib/libc/stdio/siprintf.c b/newlib/libc/stdio/siprintf.c
index d9559c359..861fc8d67 100644
--- a/newlib/libc/stdio/siprintf.c
+++ b/newlib/libc/stdio/siprintf.c
@@ -105,8 +105,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
#ifdef _HAVE_STDC
_DEFUN(_siprintf_r, (ptr, str, fmt),
- struct _reent *ptr _AND
- char *str _AND
+ struct _reent *ptr,
+ char *str,
_CONST char *fmt _DOTS)
#else
_siprintf_r(ptr, str, fmt, va_alist)
@@ -140,7 +140,7 @@ _siprintf_r(ptr, str, fmt, va_alist)
int
#ifdef _HAVE_STDC
_DEFUN(siprintf, (str, fmt),
- char *str _AND
+ char *str,
_CONST char *fmt _DOTS)
#else
siprintf(str, fmt, va_alist)
diff --git a/newlib/libc/stdio/siscanf.c b/newlib/libc/stdio/siscanf.c
index c89eb7c8d..81d60d0ba 100644
--- a/newlib/libc/stdio/siscanf.c
+++ b/newlib/libc/stdio/siscanf.c
@@ -88,7 +88,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifdef _HAVE_STDC
int
_DEFUN(siscanf, (str, fmt),
- _CONST char *str _AND
+ _CONST char *str,
_CONST char *fmt _DOTS)
#else
int
@@ -124,8 +124,8 @@ siscanf(str, fmt, va_alist)
#ifdef _HAVE_STDC
int
_DEFUN(_siscanf_r, (ptr, str, fmt),
- struct _reent *ptr _AND
- _CONST char *str _AND
+ struct _reent *ptr,
+ _CONST char *str,
_CONST char *fmt _DOTS)
#else
int
diff --git a/newlib/libc/stdio/sniprintf.c b/newlib/libc/stdio/sniprintf.c
index 98a2c2509..65e5b067f 100644
--- a/newlib/libc/stdio/sniprintf.c
+++ b/newlib/libc/stdio/sniprintf.c
@@ -33,9 +33,9 @@
int
#ifdef _HAVE_STDC
_DEFUN (_sniprintf_r, (ptr, str, size, fmt),
- struct _reent *ptr _AND
- char *str _AND
- size_t size _AND
+ struct _reent *ptr,
+ char *str,
+ size_t size,
_CONST char *fmt _DOTS)
#else
_sniprintf_r (ptr, str, size, fmt, va_alist)
@@ -78,8 +78,8 @@ _sniprintf_r (ptr, str, size, fmt, va_alist)
int
#ifdef _HAVE_STDC
_DEFUN (sniprintf, (str, size, fmt),
- char *str _AND
- size_t size _AND
+ char *str,
+ size_t size,
_CONST char *fmt _DOTS)
#else
sniprintf (str, size, fmt, va_alist)
diff --git a/newlib/libc/stdio/snprintf.c b/newlib/libc/stdio/snprintf.c
index d2408b2f0..2066a56ba 100644
--- a/newlib/libc/stdio/snprintf.c
+++ b/newlib/libc/stdio/snprintf.c
@@ -32,9 +32,9 @@
int
#ifdef _HAVE_STDC
_DEFUN(_snprintf_r, (ptr, str, size, fmt),
- struct _reent *ptr _AND
- char *__restrict str _AND
- size_t size _AND
+ struct _reent *ptr,
+ char *__restrict str,
+ size_t size,
_CONST char *__restrict fmt _DOTS)
#else
_snprintf_r(ptr, str, size, fmt, va_alist)
@@ -83,8 +83,8 @@ _EXFUN(_sniprintf_r, (struct _reent *, char *, size_t, const char *, ...)
int
#ifdef _HAVE_STDC
_DEFUN(snprintf, (str, size, fmt),
- char *__restrict str _AND
- size_t size _AND
+ char *__restrict str,
+ size_t size,
_CONST char *__restrict fmt _DOTS)
#else
snprintf(str, size, fmt, va_alist)
diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index 7fc9e6821..7ed0a0fd4 100644
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -581,8 +581,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
#ifdef _HAVE_STDC
_DEFUN(_sprintf_r, (ptr, str, fmt),
- struct _reent *ptr _AND
- char *__restrict str _AND
+ struct _reent *ptr,
+ char *__restrict str,
_CONST char *__restrict fmt _DOTS)
#else
_sprintf_r(ptr, str, fmt, va_alist)
@@ -622,7 +622,7 @@ _EXFUN(_siprintf_r, (struct _reent *, char *, const char *, ...)
int
#ifdef _HAVE_STDC
_DEFUN(sprintf, (str, fmt),
- char *__restrict str _AND
+ char *__restrict str,
_CONST char *__restrict fmt _DOTS)
#else
sprintf(str, fmt, va_alist)
diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index d2d9dfe8b..bfec067e9 100644
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -427,7 +427,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifdef _HAVE_STDC
int
_DEFUN(sscanf, (str, fmt),
- _CONST char *__restrict str _AND
+ _CONST char *__restrict str,
_CONST char * fmt _DOTS)
#else
int
@@ -469,8 +469,8 @@ _EXFUN(siscanf, (const char *, const char *, ...)
#ifdef _HAVE_STDC
int
_DEFUN(_sscanf_r, (ptr, str, fmt),
- struct _reent *ptr _AND
- _CONST char *__restrict str _AND
+ struct _reent *ptr,
+ _CONST char *__restrict str,
_CONST char *__restrict fmt _DOTS)
#else
int
diff --git a/newlib/libc/stdio/stdio.c b/newlib/libc/stdio/stdio.c
index a6e28f5a9..e64c061dd 100644
--- a/newlib/libc/stdio/stdio.c
+++ b/newlib/libc/stdio/stdio.c
@@ -31,9 +31,9 @@
_READ_WRITE_RETURN_TYPE
_DEFUN(__sread, (ptr, cookie, buf, n),
- struct _reent *ptr _AND
- void *cookie _AND
- char *buf _AND
+ struct _reent *ptr,
+ void *cookie,
+ char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
{
register FILE *fp = (FILE *) cookie;
@@ -64,9 +64,9 @@ _DEFUN(__sread, (ptr, cookie, buf, n),
/* Dummy function used in sscanf/swscanf. */
_READ_WRITE_RETURN_TYPE
_DEFUN(__seofread, (ptr, cookie, buf, len),
- struct _reent *_ptr _AND
- _PTR cookie _AND
- char *buf _AND
+ struct _reent *_ptr,
+ _PTR cookie,
+ char *buf,
_READ_WRITE_BUFSIZE_TYPE len)
{
return 0;
@@ -74,9 +74,9 @@ _DEFUN(__seofread, (ptr, cookie, buf, len),
_READ_WRITE_RETURN_TYPE
_DEFUN(__swrite, (ptr, cookie, buf, n),
- struct _reent *ptr _AND
- void *cookie _AND
- char const *buf _AND
+ struct _reent *ptr,
+ void *cookie,
+ char const *buf,
_READ_WRITE_BUFSIZE_TYPE n)
{
register FILE *fp = (FILE *) cookie;
@@ -106,9 +106,9 @@ _DEFUN(__swrite, (ptr, cookie, buf, n),
_fpos_t
_DEFUN(__sseek, (ptr, cookie, offset, whence),
- struct _reent *ptr _AND
- void *cookie _AND
- _fpos_t offset _AND
+ struct _reent *ptr,
+ void *cookie,
+ _fpos_t offset,
int whence)
{
register FILE *fp = (FILE *) cookie;
@@ -127,7 +127,7 @@ _DEFUN(__sseek, (ptr, cookie, offset, whence),
int
_DEFUN(__sclose, (ptr, cookie),
- struct _reent *ptr _AND
+ struct _reent *ptr,
void *cookie)
{
FILE *fp = (FILE *) cookie;
diff --git a/newlib/libc/stdio/swprintf.c b/newlib/libc/stdio/swprintf.c
index fe106f036..0ddc492ee 100644
--- a/newlib/libc/stdio/swprintf.c
+++ b/newlib/libc/stdio/swprintf.c
@@ -554,9 +554,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
_DEFUN(_swprintf_r, (ptr, str, size, fmt),
- struct _reent *ptr _AND
- wchar_t *str _AND
- size_t size _AND
+ struct _reent *ptr,
+ wchar_t *str,
+ size_t size,
_CONST wchar_t *fmt _DOTS)
{
int ret;
@@ -595,8 +595,8 @@ _DEFUN(_swprintf_r, (ptr, str, size, fmt),
int
_DEFUN(swprintf, (str, size, fmt),
- wchar_t *__restrict str _AND
- size_t size _AND
+ wchar_t *__restrict str,
+ size_t size,
_CONST wchar_t *__restrict fmt _DOTS)
{
int ret;
diff --git a/newlib/libc/stdio/tmpnam.c b/newlib/libc/stdio/tmpnam.c
index 765d27afd..fbd60fc7c 100644
--- a/newlib/libc/stdio/tmpnam.c
+++ b/newlib/libc/stdio/tmpnam.c
@@ -87,11 +87,11 @@ The global pointer <<environ>> is also required.
static int
_DEFUN(worker, (ptr, result, part1, part2, part3, part4),
- struct _reent *ptr _AND
- char *result _AND
- _CONST char *part1 _AND
- _CONST char *part2 _AND
- int part3 _AND
+ struct _reent *ptr,
+ char *result,
+ _CONST char *part1,
+ _CONST char *part2,
+ int part3,
int *part4)
{
/* Generate the filename and make sure that there isn't one called
@@ -119,7 +119,7 @@ _DEFUN(worker, (ptr, result, part1, part2, part3, part4),
char *
_DEFUN(_tmpnam_r, (p, s),
- struct _reent *p _AND
+ struct _reent *p,
char *s)
{
char *result;
@@ -148,8 +148,8 @@ _DEFUN(_tmpnam_r, (p, s),
char *
_DEFUN(_tempnam_r, (p, dir, pfx),
- struct _reent *p _AND
- _CONST char *dir _AND
+ struct _reent *p,
+ _CONST char *dir,
_CONST char *pfx)
{
char *filename;
@@ -175,7 +175,7 @@ _DEFUN(_tempnam_r, (p, dir, pfx),
char *
_DEFUN(tempnam, (dir, pfx),
- _CONST char *dir _AND
+ _CONST char *dir,
_CONST char *pfx)
{
return _tempnam_r (_REENT, dir, pfx);
diff --git a/newlib/libc/stdio/ungetc.c b/newlib/libc/stdio/ungetc.c
index da4b19d3c..98590478b 100644
--- a/newlib/libc/stdio/ungetc.c
+++ b/newlib/libc/stdio/ungetc.c
@@ -78,7 +78,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
/*static*/
int
_DEFUN(__submore, (rptr, fp),
- struct _reent *rptr _AND
+ struct _reent *rptr,
register FILE *fp)
{
register int i;
@@ -112,8 +112,8 @@ _DEFUN(__submore, (rptr, fp),
int
_DEFUN(_ungetc_r, (rptr, c, fp),
- struct _reent *rptr _AND
- int c _AND
+ struct _reent *rptr,
+ int c,
register FILE *fp)
{
if (c == EOF)
@@ -209,7 +209,7 @@ _DEFUN(_ungetc_r, (rptr, c, fp),
#ifndef _REENT_ONLY
int
_DEFUN(ungetc, (c, fp),
- int c _AND
+ int c,
register FILE *fp)
{
return _ungetc_r (_REENT, c, fp);
diff --git a/newlib/libc/stdio/ungetwc.c b/newlib/libc/stdio/ungetwc.c
index 000d4bdbb..60f3e5b49 100644
--- a/newlib/libc/stdio/ungetwc.c
+++ b/newlib/libc/stdio/ungetwc.c
@@ -75,8 +75,8 @@ C99
wint_t
_DEFUN(_ungetwc_r, (ptr, wc, fp),
- struct _reent *ptr _AND
- wint_t wc _AND
+ struct _reent *ptr,
+ wint_t wc,
register FILE *fp)
{
char buf[MB_LEN_MAX];
@@ -107,7 +107,7 @@ _DEFUN(_ungetwc_r, (ptr, wc, fp),
*/
wint_t
_DEFUN(ungetwc, (wint_t wc, FILE *fp),
- wint_t wc _AND
+ wint_t wc,
FILE *fp)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/vasiprintf.c b/newlib/libc/stdio/vasiprintf.c
index f96de0d79..259d44b0e 100644
--- a/newlib/libc/stdio/vasiprintf.c
+++ b/newlib/libc/stdio/vasiprintf.c
@@ -32,8 +32,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(vasiprintf, (strp, fmt, ap),
- char **strp _AND
- const char *fmt _AND
+ char **strp,
+ const char *fmt,
va_list ap)
{
return _vasiprintf_r (_REENT, strp, fmt, ap);
@@ -43,9 +43,9 @@ _DEFUN(vasiprintf, (strp, fmt, ap),
int
_DEFUN(_vasiprintf_r, (ptr, strp, fmt, ap),
- struct _reent *ptr _AND
- char **strp _AND
- const char *fmt _AND
+ struct _reent *ptr,
+ char **strp,
+ const char *fmt,
va_list ap)
{
int ret;
diff --git a/newlib/libc/stdio/vasniprintf.c b/newlib/libc/stdio/vasniprintf.c
index 56db45ec0..9bbe30c59 100644
--- a/newlib/libc/stdio/vasniprintf.c
+++ b/newlib/libc/stdio/vasniprintf.c
@@ -15,10 +15,10 @@
char *
_DEFUN(_vasniprintf_r, (ptr, buf, lenp, fmt, ap),
- struct _reent *ptr _AND
- char *buf _AND
- size_t *lenp _AND
- const char *fmt _AND
+ struct _reent *ptr,
+ char *buf,
+ size_t *lenp,
+ const char *fmt,
va_list ap)
{
int ret;
@@ -60,9 +60,9 @@ _DEFUN(_vasniprintf_r, (ptr, buf, lenp, fmt, ap),
char *
_DEFUN(vasniprintf, (buf, lenp, fmt, ap),
- char *buf _AND
- size_t *lenp _AND
- const char *fmt _AND
+ char *buf,
+ size_t *lenp,
+ const char *fmt,
va_list ap)
{
return _vasniprintf_r (_REENT, buf, lenp, fmt, ap);
diff --git a/newlib/libc/stdio/vasnprintf.c b/newlib/libc/stdio/vasnprintf.c
index 4cb43ce7a..6edb47398 100644
--- a/newlib/libc/stdio/vasnprintf.c
+++ b/newlib/libc/stdio/vasnprintf.c
@@ -15,10 +15,10 @@
char *
_DEFUN(_vasnprintf_r, (ptr, buf, lenp, fmt, ap),
- struct _reent *ptr _AND
- char *buf _AND
- size_t *lenp _AND
- const char *fmt _AND
+ struct _reent *ptr,
+ char *buf,
+ size_t *lenp,
+ const char *fmt,
va_list ap)
{
int ret;
@@ -67,9 +67,9 @@ _EXFUN(_vasniprintf_r, (struct _reent*, char *, size_t *,
char *
_DEFUN(vasnprintf, (buf, lenp, fmt, ap),
- char *buf _AND
- size_t *lenp _AND
- const char *fmt _AND
+ char *buf,
+ size_t *lenp,
+ const char *fmt,
va_list ap)
{
return _vasnprintf_r (_REENT, buf, lenp, fmt, ap);
diff --git a/newlib/libc/stdio/vasprintf.c b/newlib/libc/stdio/vasprintf.c
index 5ba817d7b..c0961de01 100644
--- a/newlib/libc/stdio/vasprintf.c
+++ b/newlib/libc/stdio/vasprintf.c
@@ -32,8 +32,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(vasprintf, (strp, fmt, ap),
- char **strp _AND
- const char *fmt _AND
+ char **strp,
+ const char *fmt,
va_list ap)
{
return _vasprintf_r (_REENT, strp, fmt, ap);
@@ -49,9 +49,9 @@ _EXFUN(vasiprintf, (char **, const char *, __VALIST)
int
_DEFUN(_vasprintf_r, (ptr, strp, fmt, ap),
- struct _reent *ptr _AND
- char **strp _AND
- const char *fmt _AND
+ struct _reent *ptr,
+ char **strp,
+ const char *fmt,
va_list ap)
{
int ret;
diff --git a/newlib/libc/stdio/vdiprintf.c b/newlib/libc/stdio/vdiprintf.c
index 51bdb000e..73a3b19d1 100644
--- a/newlib/libc/stdio/vdiprintf.c
+++ b/newlib/libc/stdio/vdiprintf.c
@@ -14,9 +14,9 @@
int
_DEFUN(_vdiprintf_r, (ptr, fd, format, ap),
- struct _reent *ptr _AND
- int fd _AND
- const char *format _AND
+ struct _reent *ptr,
+ int fd,
+ const char *format,
va_list ap)
{
char *p;
@@ -37,8 +37,8 @@ _DEFUN(_vdiprintf_r, (ptr, fd, format, ap),
int
_DEFUN(vdiprintf, (fd, format, ap),
- int fd _AND
- const char *format _AND
+ int fd,
+ const char *format,
va_list ap)
{
return _vdiprintf_r (_REENT, fd, format, ap);
diff --git a/newlib/libc/stdio/vdprintf.c b/newlib/libc/stdio/vdprintf.c
index c295a3959..1b50e8833 100644
--- a/newlib/libc/stdio/vdprintf.c
+++ b/newlib/libc/stdio/vdprintf.c
@@ -14,9 +14,9 @@
int
_DEFUN(_vdprintf_r, (ptr, fd, format, ap),
- struct _reent *ptr _AND
- int fd _AND
- const char *__restrict format _AND
+ struct _reent *ptr,
+ int fd,
+ const char *__restrict format,
va_list ap)
{
char *p;
@@ -43,8 +43,8 @@ _EXFUN(_vdiprintf_r, (struct _reent *, int, const char *, __VALIST)
int
_DEFUN(vdprintf, (fd, format, ap),
- int fd _AND
- const char *__restrict format _AND
+ int fd,
+ const char *__restrict format,
va_list ap)
{
return _vdprintf_r (_REENT, fd, format, ap);
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index 50a3478a4..29dcb1633 100644
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -199,9 +199,9 @@ static char *rcsid = "$Id$";
#ifndef _FVWRITE_IN_STREAMIO
int
_DEFUN(__ssputs_r, (ptr, fp, buf, len),
- struct _reent *ptr _AND
- FILE *fp _AND
- _CONST char *buf _AND
+ struct _reent *ptr,
+ FILE *fp,
+ _CONST char *buf,
size_t len)
{
register int w;
@@ -268,8 +268,8 @@ err:
int
_DEFUN(__ssprint_r, (ptr, fp, uio),
- struct _reent *ptr _AND
- FILE *fp _AND
+ struct _reent *ptr,
+ FILE *fp,
register struct __suio *uio)
{
register size_t len;
@@ -370,9 +370,9 @@ int __ssprint_r (struct _reent *, FILE *, register struct __suio *);
#ifndef _FVWRITE_IN_STREAMIO
int
_DEFUN(__sfputs_r, (ptr, fp, buf, len),
- struct _reent *ptr _AND
- FILE *fp _AND
- _CONST char *buf _AND
+ struct _reent *ptr,
+ FILE *fp,
+ _CONST char *buf,
size_t len)
{
register int i;
@@ -404,8 +404,8 @@ _DEFUN(__sfputs_r, (ptr, fp, buf, len),
*/
int
_DEFUN(__sprint_r, (ptr, fp, uio),
- struct _reent *ptr _AND
- FILE *fp _AND
+ struct _reent *ptr,
+ FILE *fp,
register struct __suio *uio)
{
register int err = 0;
@@ -457,9 +457,9 @@ int __sprint_r (struct _reent *, FILE *, register struct __suio *);
*/
_NOINLINE_STATIC int
_DEFUN(__sbprintf, (rptr, fp, fmt, ap),
- struct _reent *rptr _AND
- register FILE *fp _AND
- _CONST char *fmt _AND
+ struct _reent *rptr,
+ register FILE *fp,
+ _CONST char *fmt,
va_list ap)
{
int ret;
@@ -649,8 +649,8 @@ int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, _CONST char *, va_list));
#ifndef STRING_ONLY
int
_DEFUN(VFPRINTF, (fp, fmt0, ap),
- FILE * fp _AND
- _CONST char *fmt0 _AND
+ FILE * fp,
+ _CONST char *fmt0,
va_list ap)
{
int result;
@@ -661,9 +661,9 @@ _DEFUN(VFPRINTF, (fp, fmt0, ap),
int
_DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
- struct _reent *data _AND
- FILE * fp _AND
- _CONST char *fmt0 _AND
+ struct _reent *data,
+ FILE * fp,
+ _CONST char *fmt0,
va_list ap)
{
register char *fmt; /* format string */
@@ -2044,13 +2044,13 @@ _CONST __ACTION __action_table[MAX_STATE][MAX_CH_CLASS] = {
/* function to get positional parameter N where n = N - 1 */
static union arg_val *
_DEFUN(get_arg, (data, n, fmt, ap, numargs_p, args, arg_type, last_fmt),
- struct _reent *data _AND
- int n _AND
- char *fmt _AND
- va_list *ap _AND
- int *numargs_p _AND
- union arg_val *args _AND
- int *arg_type _AND
+ struct _reent *data,
+ int n,
+ char *fmt,
+ va_list *ap,
+ int *numargs_p,
+ union arg_val *args,
+ int *arg_type,
char **last_fmt)
{
int ch;
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index b1453452c..3f67b2304 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -225,8 +225,8 @@ typedef unsigned long long u_long_long;
int
_DEFUN(VFSCANF, (fp, fmt, ap),
- register FILE *fp _AND
- _CONST char *fmt _AND
+ register FILE *fp,
+ _CONST char *fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -237,8 +237,8 @@ _DEFUN(VFSCANF, (fp, fmt, ap),
int
_DEFUN(__SVFSCANF, (fp, fmt0, ap),
- register FILE *fp _AND
- char _CONST *fmt0 _AND
+ register FILE *fp,
+ char _CONST *fmt0,
va_list ap)
{
return __SVFSCANF_R (_REENT, fp, fmt0, ap);
@@ -248,9 +248,9 @@ _DEFUN(__SVFSCANF, (fp, fmt0, ap),
int
_DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
- struct _reent *data _AND
- register FILE *fp _AND
- _CONST char *fmt _AND
+ struct _reent *data,
+ register FILE *fp,
+ _CONST char *fmt,
va_list ap)
{
CHECK_INIT(data, fp);
@@ -264,8 +264,8 @@ _DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
* So, we create our own trimmed-down version. */
int
_DEFUN(_sungetc_r, (data, fp, ch),
- struct _reent *data _AND
- int c _AND
+ struct _reent *data,
+ int c,
register FILE *fp)
{
if (c == EOF)
@@ -322,7 +322,7 @@ _DEFUN(_sungetc_r, (data, fp, ch),
/* String only version of __srefill_r for sscanf family. */
int
_DEFUN(__ssrefill_r, (ptr, fp),
- struct _reent * ptr _AND
+ struct _reent * ptr,
register FILE * fp)
{
/*
@@ -348,10 +348,10 @@ _DEFUN(__ssrefill_r, (ptr, fp),
size_t
_DEFUN(_sfread_r, (ptr, buf, size, count, fp),
- struct _reent * ptr _AND
- _PTR buf _AND
- size_t size _AND
- size_t count _AND
+ struct _reent * ptr,
+ _PTR buf,
+ size_t size,
+ size_t count,
FILE * fp)
{
register size_t resid;
@@ -403,9 +403,9 @@ __wctob (struct _reent *rptr, wint_t wc)
int
_DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
- struct _reent *rptr _AND
- register FILE *fp _AND
- char _CONST *fmt0 _AND
+ struct _reent *rptr,
+ register FILE *fp,
+ char _CONST *fmt0,
va_list ap)
{
register u_char *fmt = (u_char *) fmt0;
diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
index 9c421d267..7339ffe53 100644
--- a/newlib/libc/stdio/vfwprintf.c
+++ b/newlib/libc/stdio/vfwprintf.c
@@ -175,9 +175,9 @@ int _EXFUN(__SPRINT, (struct _reent *, FILE *, _CONST char *, size_t));
*/
static int
_DEFUN(__sbwprintf, (rptr, fp, fmt, ap),
- struct _reent *rptr _AND
- register FILE *fp _AND
- _CONST wchar_t *fmt _AND
+ struct _reent *rptr,
+ register FILE *fp,
+ _CONST wchar_t *fmt,
va_list ap)
{
int ret;
@@ -367,8 +367,8 @@ _EXFUN(get_arg, (struct _reent *data, int n, wchar_t *fmt,
#ifndef STRING_ONLY
int
_DEFUN(VFWPRINTF, (fp, fmt0, ap),
- FILE *__restrict fp _AND
- _CONST wchar_t *__restrict fmt0 _AND
+ FILE *__restrict fp,
+ _CONST wchar_t *__restrict fmt0,
va_list ap)
{
int result;
@@ -379,9 +379,9 @@ _DEFUN(VFWPRINTF, (fp, fmt0, ap),
int
_DEFUN(_VFWPRINTF_R, (data, fp, fmt0, ap),
- struct _reent *data _AND
- FILE * fp _AND
- _CONST wchar_t *fmt0 _AND
+ struct _reent *data,
+ FILE * fp,
+ _CONST wchar_t *fmt0,
va_list ap)
{
register wchar_t *fmt; /* format string */
@@ -1735,13 +1735,13 @@ wexponent(wchar_t *p0, int exp, int fmtch)
/* function to get positional parameter N where n = N - 1 */
static union arg_val *
_DEFUN(get_arg, (data, n, fmt, ap, numargs_p, args, arg_type, last_fmt),
- struct _reent *data _AND
- int n _AND
- wchar_t *fmt _AND
- va_list *ap _AND
- int *numargs_p _AND
- union arg_val *args _AND
- int *arg_type _AND
+ struct _reent *data,
+ int n,
+ wchar_t *fmt,
+ va_list *ap,
+ int *numargs_p,
+ union arg_val *args,
+ int *arg_type,
wchar_t **last_fmt)
{
wchar_t ch;
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
index a286464e6..715f231e3 100644
--- a/newlib/libc/stdio/vfwscanf.c
+++ b/newlib/libc/stdio/vfwscanf.c
@@ -227,8 +227,8 @@ static void * get_arg (int, va_list *, int *, void **);
int
_DEFUN(VFWSCANF, (fp, fmt, ap),
- register FILE *__restrict fp _AND
- _CONST wchar_t *__restrict fmt _AND
+ register FILE *__restrict fp,
+ _CONST wchar_t *__restrict fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -239,8 +239,8 @@ _DEFUN(VFWSCANF, (fp, fmt, ap),
int
_DEFUN(__SVFWSCANF, (fp, fmt0, ap),
- register FILE *fp _AND
- wchar_t _CONST *fmt0 _AND
+ register FILE *fp,
+ wchar_t _CONST *fmt0,
va_list ap)
{
return __SVFWSCANF_R (_REENT, fp, fmt0, ap);
@@ -250,9 +250,9 @@ _DEFUN(__SVFWSCANF, (fp, fmt0, ap),
int
_DEFUN(_VFWSCANF_R, (data, fp, fmt, ap),
- struct _reent *data _AND
- register FILE *fp _AND
- _CONST wchar_t *fmt _AND
+ struct _reent *data,
+ register FILE *fp,
+ _CONST wchar_t *fmt,
va_list ap)
{
CHECK_INIT(data, fp);
@@ -266,8 +266,8 @@ _DEFUN(_VFWSCANF_R, (data, fp, fmt, ap),
* So, we create our own trimmed-down version. */
static wint_t
_DEFUN(_sungetwc_r, (data, fp, ch),
- struct _reent *data _AND
- wint_t wc _AND
+ struct _reent *data,
+ wint_t wc,
register FILE *fp)
{
if (wc == WEOF)
@@ -326,7 +326,7 @@ extern int __ssrefill_r _PARAMS ((struct _reent *ptr, register FILE * fp));
static size_t
_DEFUN(_sfgetwc_r, (ptr, fp),
- struct _reent * ptr _AND
+ struct _reent * ptr,
FILE * fp)
{
wchar_t wc;
@@ -342,9 +342,9 @@ _DEFUN(_sfgetwc_r, (ptr, fp),
int
_DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap),
- struct _reent *rptr _AND
- register FILE *fp _AND
- wchar_t _CONST *fmt0 _AND
+ struct _reent *rptr,
+ register FILE *fp,
+ wchar_t _CONST *fmt0,
va_list ap)
{
register wchar_t *fmt = (wchar_t *) fmt0;
diff --git a/newlib/libc/stdio/viprintf.c b/newlib/libc/stdio/viprintf.c
index 85ae286bb..ef2a04e2f 100644
--- a/newlib/libc/stdio/viprintf.c
+++ b/newlib/libc/stdio/viprintf.c
@@ -106,7 +106,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
_DEFUN(viprintf, (fmt, ap),
- _CONST char *fmt _AND
+ _CONST char *fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -119,8 +119,8 @@ _DEFUN(viprintf, (fmt, ap),
int
_DEFUN(_viprintf_r, (ptr, fmt, ap),
- struct _reent *ptr _AND
- _CONST char *fmt _AND
+ struct _reent *ptr,
+ _CONST char *fmt,
va_list ap)
{
_REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/viscanf.c b/newlib/libc/stdio/viscanf.c
index 379daa232..569fad91c 100644
--- a/newlib/libc/stdio/viscanf.c
+++ b/newlib/libc/stdio/viscanf.c
@@ -90,7 +90,7 @@ Supporting OS subroutines required:
int
_DEFUN(viscanf, (fmt, ap),
- _CONST char *fmt _AND
+ _CONST char *fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -103,8 +103,8 @@ _DEFUN(viscanf, (fmt, ap),
int
_DEFUN(_viscanf_r, (ptr, fmt, ap),
- struct _reent *ptr _AND
- _CONST char *fmt _AND
+ struct _reent *ptr,
+ _CONST char *fmt,
va_list ap)
{
_REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/vprintf.c b/newlib/libc/stdio/vprintf.c
index 00b8023b7..26671f70c 100644
--- a/newlib/libc/stdio/vprintf.c
+++ b/newlib/libc/stdio/vprintf.c
@@ -30,7 +30,7 @@
int
_DEFUN(vprintf, (fmt, ap),
- _CONST char *fmt _AND
+ _CONST char *fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -48,8 +48,8 @@ _EXFUN(viprintf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vprintf"))));
int
_DEFUN(_vprintf_r, (ptr, fmt, ap),
- struct _reent *ptr _AND
- _CONST char *__restrict fmt _AND
+ struct _reent *ptr,
+ _CONST char *__restrict fmt,
va_list ap)
{
_REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/vscanf.c b/newlib/libc/stdio/vscanf.c
index 4371e23a7..2506919c4 100644
--- a/newlib/libc/stdio/vscanf.c
+++ b/newlib/libc/stdio/vscanf.c
@@ -31,7 +31,7 @@
int
_DEFUN(vscanf, (fmt, ap),
- _CONST char *fmt _AND
+ _CONST char *fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -49,8 +49,8 @@ _EXFUN(viscanf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vscanf"))));
int
_DEFUN(_vscanf_r, (ptr, fmt, ap),
- struct _reent *ptr _AND
- _CONST char *__restrict fmt _AND
+ struct _reent *ptr,
+ _CONST char *__restrict fmt,
va_list ap)
{
_REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/vsiprintf.c b/newlib/libc/stdio/vsiprintf.c
index 150b4e7d0..ff83b7856 100644
--- a/newlib/libc/stdio/vsiprintf.c
+++ b/newlib/libc/stdio/vsiprintf.c
@@ -32,8 +32,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(vsiprintf, (str, fmt, ap),
- char *str _AND
- const char *fmt _AND
+ char *str,
+ const char *fmt,
va_list ap)
{
return _vsiprintf_r (_REENT, str, fmt, ap);
@@ -43,9 +43,9 @@ _DEFUN(vsiprintf, (str, fmt, ap),
int
_DEFUN(_vsiprintf_r, (ptr, str, fmt, ap),
- struct _reent *ptr _AND
- char *str _AND
- const char *fmt _AND
+ struct _reent *ptr,
+ char *str,
+ const char *fmt,
va_list ap)
{
int ret;
diff --git a/newlib/libc/stdio/vsiscanf.c b/newlib/libc/stdio/vsiscanf.c
index 01295995e..cf5120fa3 100644
--- a/newlib/libc/stdio/vsiscanf.c
+++ b/newlib/libc/stdio/vsiscanf.c
@@ -36,8 +36,8 @@
int
_DEFUN(vsiscanf, (str, fmt, ap),
- _CONST char *str _AND
- _CONST char *fmt _AND
+ _CONST char *str,
+ _CONST char *fmt,
va_list ap)
{
return _vsiscanf_r (_REENT, str, fmt, ap);
@@ -47,9 +47,9 @@ _DEFUN(vsiscanf, (str, fmt, ap),
int
_DEFUN(_vsiscanf_r, (ptr, str, fmt, ap),
- struct _reent *ptr _AND
- _CONST char *str _AND
- _CONST char *fmt _AND
+ struct _reent *ptr,
+ _CONST char *str,
+ _CONST char *fmt,
va_list ap)
{
FILE f;
diff --git a/newlib/libc/stdio/vsniprintf.c b/newlib/libc/stdio/vsniprintf.c
index c4305c1a9..e60f779ca 100644
--- a/newlib/libc/stdio/vsniprintf.c
+++ b/newlib/libc/stdio/vsniprintf.c
@@ -33,9 +33,9 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(vsniprintf, (str, size, fmt, ap),
- char *str _AND
- size_t size _AND
- const char *fmt _AND
+ char *str,
+ size_t size,
+ const char *fmt,
va_list ap)
{
return _vsniprintf_r (_REENT, str, size, fmt, ap);
@@ -45,10 +45,10 @@ _DEFUN(vsniprintf, (str, size, fmt, ap),
int
_DEFUN(_vsniprintf_r, (ptr, str, size, fmt, ap),
- struct _reent *ptr _AND
- char *str _AND
- size_t size _AND
- const char *fmt _AND
+ struct _reent *ptr,
+ char *str,
+ size_t size,
+ const char *fmt,
va_list ap)
{
int ret;
diff --git a/newlib/libc/stdio/vsnprintf.c b/newlib/libc/stdio/vsnprintf.c
index e08f267bd..dda45256a 100644
--- a/newlib/libc/stdio/vsnprintf.c
+++ b/newlib/libc/stdio/vsnprintf.c
@@ -33,9 +33,9 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(vsnprintf, (str, size, fmt, ap),
- char *__restrict str _AND
- size_t size _AND
- const char *__restrict fmt _AND
+ char *__restrict str,
+ size_t size,
+ const char *__restrict fmt,
va_list ap)
{
return _vsnprintf_r (_REENT, str, size, fmt, ap);
@@ -51,10 +51,10 @@ _EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST)
int
_DEFUN(_vsnprintf_r, (ptr, str, size, fmt, ap),
- struct _reent *ptr _AND
- char *__restrict str _AND
- size_t size _AND
- const char *__restrict fmt _AND
+ struct _reent *ptr,
+ char *__restrict str,
+ size_t size,
+ const char *__restrict fmt,
va_list ap)
{
int ret;
diff --git a/newlib/libc/stdio/vsprintf.c b/newlib/libc/stdio/vsprintf.c
index 742cde0df..4940b974e 100644
--- a/newlib/libc/stdio/vsprintf.c
+++ b/newlib/libc/stdio/vsprintf.c
@@ -32,8 +32,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(vsprintf, (str, fmt, ap),
- char *__restrict str _AND
- const char *__restrict fmt _AND
+ char *__restrict str,
+ const char *__restrict fmt,
va_list ap)
{
return _vsprintf_r (_REENT, str, fmt, ap);
@@ -49,9 +49,9 @@ _EXFUN(vsiprintf, (char *, const char *, __VALIST)
int
_DEFUN(_vsprintf_r, (ptr, str, fmt, ap),
- struct _reent *ptr _AND
- char *__restrict str _AND
- const char *__restrict fmt _AND
+ struct _reent *ptr,
+ char *__restrict str,
+ const char *__restrict fmt,
va_list ap)
{
int ret;
diff --git a/newlib/libc/stdio/vsscanf.c b/newlib/libc/stdio/vsscanf.c
index 1660fa1cf..706461d47 100644
--- a/newlib/libc/stdio/vsscanf.c
+++ b/newlib/libc/stdio/vsscanf.c
@@ -36,8 +36,8 @@
int
_DEFUN(vsscanf, (str, fmt, ap),
- _CONST char *__restrict str _AND
- _CONST char *__restrict fmt _AND
+ _CONST char *__restrict str,
+ _CONST char *__restrict fmt,
va_list ap)
{
return _vsscanf_r (_REENT, str, fmt, ap);
@@ -53,9 +53,9 @@ _EXFUN(vsiscanf, (const char *, const char *, __VALIST)
int
_DEFUN(_vsscanf_r, (ptr, str, fmt, ap),
- struct _reent *ptr _AND
- _CONST char *__restrict str _AND
- _CONST char *__restrict fmt _AND
+ struct _reent *ptr,
+ _CONST char *__restrict str,
+ _CONST char *__restrict fmt,
va_list ap)
{
FILE f;
diff --git a/newlib/libc/stdio/vswprintf.c b/newlib/libc/stdio/vswprintf.c
index ac321b662..9c9127cd6 100644
--- a/newlib/libc/stdio/vswprintf.c
+++ b/newlib/libc/stdio/vswprintf.c
@@ -32,10 +32,10 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(_vswprintf_r, (ptr, str, size, fmt, ap),
- struct _reent *ptr _AND
- wchar_t *str _AND
- size_t size _AND
- const wchar_t *fmt _AND
+ struct _reent *ptr,
+ wchar_t *str,
+ size_t size,
+ const wchar_t *fmt,
va_list ap)
{
int ret;
@@ -71,9 +71,9 @@ _DEFUN(_vswprintf_r, (ptr, str, size, fmt, ap),
int
_DEFUN(vswprintf, (str, size, fmt, ap),
- wchar_t *__restrict str _AND
- size_t size _AND
- const wchar_t *__restrict fmt _AND
+ wchar_t *__restrict str,
+ size_t size,
+ const wchar_t *__restrict fmt,
va_list ap)
{
return _vswprintf_r (_REENT, str, size, fmt, ap);
diff --git a/newlib/libc/stdio/vwprintf.c b/newlib/libc/stdio/vwprintf.c
index 51d1df3a9..191fb70c9 100644
--- a/newlib/libc/stdio/vwprintf.c
+++ b/newlib/libc/stdio/vwprintf.c
@@ -27,7 +27,7 @@
int
_DEFUN(vwprintf, (fmt, ap),
- _CONST wchar_t *__restrict fmt _AND
+ _CONST wchar_t *__restrict fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -40,8 +40,8 @@ _DEFUN(vwprintf, (fmt, ap),
int
_DEFUN(_vwprintf_r, (ptr, fmt, ap),
- struct _reent *ptr _AND
- _CONST wchar_t *fmt _AND
+ struct _reent *ptr,
+ _CONST wchar_t *fmt,
va_list ap)
{
_REENT_SMALL_CHECK_INIT (ptr);
diff --git a/newlib/libc/stdio/wbuf.c b/newlib/libc/stdio/wbuf.c
index f9197ea9e..13578ea33 100644
--- a/newlib/libc/stdio/wbuf.c
+++ b/newlib/libc/stdio/wbuf.c
@@ -34,8 +34,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
int
_DEFUN(__swbuf_r, (ptr, c, fp),
- struct _reent *ptr _AND
- register int c _AND
+ struct _reent *ptr,
+ register int c,
register FILE *fp)
{
register int n;
@@ -89,7 +89,7 @@ _DEFUN(__swbuf_r, (ptr, c, fp),
earlier dynamically built newlib libraries. */
int
_DEFUN(__swbuf, (c, fp),
- register int c _AND
+ register int c,
register FILE *fp)
{
return __swbuf_r (_REENT, c, fp);
diff --git a/newlib/libc/stdio/wprintf.c b/newlib/libc/stdio/wprintf.c
index e05ba1013..99c5696df 100644
--- a/newlib/libc/stdio/wprintf.c
+++ b/newlib/libc/stdio/wprintf.c
@@ -25,7 +25,7 @@
int
_DEFUN(_wprintf_r, (ptr, fmt),
- struct _reent *ptr _AND
+ struct _reent *ptr,
const wchar_t *fmt _DOTS)
{
int ret;
diff --git a/newlib/libc/stdio/wsetup.c b/newlib/libc/stdio/wsetup.c
index 08ae70f2c..72280d2df 100644
--- a/newlib/libc/stdio/wsetup.c
+++ b/newlib/libc/stdio/wsetup.c
@@ -31,7 +31,7 @@
int
_DEFUN(__swsetup_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register FILE * fp)
{
/* Make sure stdio is set up. */
diff --git a/newlib/libc/stdio64/fdopen64.c b/newlib/libc/stdio64/fdopen64.c
index f386583ca..1a238f732 100644
--- a/newlib/libc/stdio64/fdopen64.c
+++ b/newlib/libc/stdio64/fdopen64.c
@@ -36,8 +36,8 @@ extern int __sflags ();
FILE *
_DEFUN (_fdopen64_r, (ptr, fd, mode),
- struct _reent *ptr _AND
- int fd _AND
+ struct _reent *ptr,
+ int fd,
_CONST char *mode)
{
register FILE *fp;
@@ -109,7 +109,7 @@ _DEFUN (_fdopen64_r, (ptr, fd, mode),
FILE *
_DEFUN (fdopen64, (fd, mode),
- int fd _AND
+ int fd,
_CONST char *mode)
{
return _fdopen64_r (_REENT, fd, mode);
diff --git a/newlib/libc/stdio64/fgetpos64.c b/newlib/libc/stdio64/fgetpos64.c
index a1d0a3724..e2dd28914 100644
--- a/newlib/libc/stdio64/fgetpos64.c
+++ b/newlib/libc/stdio64/fgetpos64.c
@@ -46,8 +46,8 @@ No supporting OS subroutines are required.
int
_DEFUN (_fgetpos64_r, (ptr, fp, pos),
- struct _reent * ptr _AND
- FILE * fp _AND
+ struct _reent * ptr,
+ FILE * fp,
_fpos64_t * pos)
{
*pos = (_fpos64_t)_ftello64_r (ptr, fp);
@@ -63,7 +63,7 @@ _DEFUN (_fgetpos64_r, (ptr, fp, pos),
int
_DEFUN (fgetpos64, (fp, pos),
- FILE * fp _AND
+ FILE * fp,
_fpos64_t * pos)
{
return _fgetpos64_r (_REENT, fp, pos);
diff --git a/newlib/libc/stdio64/fopen64.c b/newlib/libc/stdio64/fopen64.c
index 60ac73fda..7edb5d807 100644
--- a/newlib/libc/stdio64/fopen64.c
+++ b/newlib/libc/stdio64/fopen64.c
@@ -65,8 +65,8 @@ static char sccsid[] = "%W% (Berkeley) %G%";
FILE *
_DEFUN (_fopen64_r, (ptr, file, mode),
- struct _reent *ptr _AND
- _CONST char *file _AND
+ struct _reent *ptr,
+ _CONST char *file,
_CONST char *mode)
{
register FILE *fp;
@@ -118,7 +118,7 @@ _DEFUN (_fopen64_r, (ptr, file, mode),
FILE *
_DEFUN (fopen64, (file, mode),
- _CONST char *file _AND
+ _CONST char *file,
_CONST char *mode)
{
return _fopen64_r (_REENT, file, mode);
diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c
index 379462c31..6e42d0e3b 100644
--- a/newlib/libc/stdio64/freopen64.c
+++ b/newlib/libc/stdio64/freopen64.c
@@ -76,9 +76,9 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
FILE *
_DEFUN (_freopen64_r, (ptr, file, mode, fp),
- struct _reent *ptr _AND
- _CONST char *file _AND
- _CONST char *mode _AND
+ struct _reent *ptr,
+ _CONST char *file,
+ _CONST char *mode,
register FILE *fp)
{
register int f;
@@ -248,8 +248,8 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp),
FILE *
_DEFUN (freopen64, (file, mode, fp),
- _CONST char *file _AND
- _CONST char *mode _AND
+ _CONST char *file,
+ _CONST char *mode,
register FILE *fp)
{
return _freopen64_r (_REENT, file, mode, fp);
diff --git a/newlib/libc/stdio64/fseeko64.c b/newlib/libc/stdio64/fseeko64.c
index 624e91275..8cd11fa67 100644
--- a/newlib/libc/stdio64/fseeko64.c
+++ b/newlib/libc/stdio64/fseeko64.c
@@ -86,9 +86,9 @@ Supporting OS subroutines required: <<close>>, <<fstat64>>, <<isatty>>,
_off64_t
_DEFUN (_fseeko64_r, (ptr, fp, offset, whence),
- struct _reent *ptr _AND
- register FILE *fp _AND
- _off64_t offset _AND
+ struct _reent *ptr,
+ register FILE *fp,
+ _off64_t offset,
int whence)
{
_fpos64_t _EXFNPTR(seekfn, (struct _reent *, void *, _fpos64_t, int));
@@ -343,8 +343,8 @@ dumb:
_off64_t
_DEFUN (fseeko64, (fp, offset, whence),
- register FILE *fp _AND
- _off64_t offset _AND
+ register FILE *fp,
+ _off64_t offset,
int whence)
{
return _fseeko64_r (_REENT, fp, offset, whence);
diff --git a/newlib/libc/stdio64/fsetpos64.c b/newlib/libc/stdio64/fsetpos64.c
index 83d99627d..9cfc10733 100644
--- a/newlib/libc/stdio64/fsetpos64.c
+++ b/newlib/libc/stdio64/fsetpos64.c
@@ -42,8 +42,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
_DEFUN (_fsetpos64_r, (ptr, iop, pos),
- struct _reent *ptr _AND
- FILE * iop _AND
+ struct _reent *ptr,
+ FILE * iop,
_CONST _fpos64_t * pos)
{
int x = _fseeko64_r (ptr, iop, (_off64_t)(*pos), SEEK_SET);
@@ -57,7 +57,7 @@ _DEFUN (_fsetpos64_r, (ptr, iop, pos),
int
_DEFUN (fsetpos64, (iop, pos),
- FILE * iop _AND
+ FILE * iop,
_CONST _fpos64_t * pos)
{
return _fsetpos64_r (_REENT, iop, pos);
diff --git a/newlib/libc/stdio64/ftello64.c b/newlib/libc/stdio64/ftello64.c
index c6226d105..3c4663ba4 100644
--- a/newlib/libc/stdio64/ftello64.c
+++ b/newlib/libc/stdio64/ftello64.c
@@ -77,7 +77,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
_off64_t
_DEFUN (_ftello64_r, (ptr, fp),
- struct _reent *ptr _AND
+ struct _reent *ptr,
register FILE * fp)
{
_fpos64_t pos;
diff --git a/newlib/libc/stdio64/stdio64.c b/newlib/libc/stdio64/stdio64.c
index dd3b4adc9..813b919bf 100644
--- a/newlib/libc/stdio64/stdio64.c
+++ b/newlib/libc/stdio64/stdio64.c
@@ -27,9 +27,9 @@
#ifdef __LARGE64_FILES
_fpos64_t
_DEFUN(__sseek64, (ptr, cookie, offset, whence),
- struct _reent *ptr _AND
- void *cookie _AND
- _fpos64_t offset _AND
+ struct _reent *ptr,
+ void *cookie,
+ _fpos64_t offset,
int whence)
{
register FILE *fp = (FILE *) cookie;
@@ -48,9 +48,9 @@ _DEFUN(__sseek64, (ptr, cookie, offset, whence),
_READ_WRITE_RETURN_TYPE
_DEFUN(__swrite64, (ptr, cookie, buf, n),
- struct _reent *ptr _AND
- void *cookie _AND
- char const *buf _AND
+ struct _reent *ptr,
+ void *cookie,
+ char const *buf,
_READ_WRITE_BUFSIZE_TYPE n)
{
register FILE *fp = (FILE *) cookie;
diff --git a/newlib/libc/stdlib/__adjust.c b/newlib/libc/stdlib/__adjust.c
index d5c70758b..7627cc7ac 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 0f4aeb8a9..cb4a2682e 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 6a809cc4d..e6c1ee643 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 637197be2..a7fe70caf 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 a6218746c..ba5b46197 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 ac3b39a0e..936b381bd 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 8d0e5cd0b..8c2f5560d 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 9d8a64a9c..d0d498349 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 3a723783b..dfdb7f5dc 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 39a59d53a..c66b28e7d 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 a780a2d3a..4d2ffee48 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 c72ffac5e..3b8976435 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 f4929f228..a857c2452 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 ee58c9a9a..2326f55ca 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 ae6424559..e354bb170 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 26b39fb5b..a62ff345a 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 fd3903c4f..931ced3a7 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 24e3783be..22033d90f 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 c64241ee6..2d394e240 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 7376f7407..b34c2a9b3 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 3178cd454..25e6c3516 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 9e2f92cb6..4f8c12bd1 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 d415d0478..607842723 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 548f32757..f40dede82 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 242b6bd87..00bca6286 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 61a9b50ca..8433e76bd 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 1eded306b..d36846f98 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 30d759be0..3ea91f4ba 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 5e58e1e45..1456ceae2 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 69e3acb62..4ca2143cf 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 018f075ee..206a0623e 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 65e46d32e..48d36d028 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 70ed9ede6..41ad7b67a 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 495049972..7c95e4aba 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 0c29cf3d9..182884aab 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 9d782566f..cbc534a7b 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 2b982ef55..cb6866d50 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 88cb54c40..b7aa93b28 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 39e9fb13c..43a6d0cfb 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 d22fc3728..b21cf0cb2 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 a0f476721..a780a149e 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 b9bf320b2..0fc5cc0a9 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 0cdbdb619..8258e211e 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 a9d329398..b3f1b2aab 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 43629cc40..5f3ae2e95 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 d423678f3..7e8949417 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 c32c6aca9..75f21733e 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 69bdbfc3b..7042e834c 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 236daa5f6..e3c9b7f17 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 ba58b6e8c..7ffa6a95d 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 2922452c7..51752655a 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 9414661ec..e18472254 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 aff1fc7c3..4dfb28f79 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 6cacfa587..f172e5de9 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 75e8616ea..cc5440783 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 df7741a8c..3b6cbd62c 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 ed5f36968..3561257cb 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 2b6777cae..ac0c9dece 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 201a2c32c..239f8d2c0 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 417a46d63..1f5fd4b3a 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 3a7a0e28d..be9500027 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 9e1937887..6df2dac55 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 0680cd783..d965dc228 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 d649810ea..2470bfa71 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 4bb0cd781..55ab3cae6 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 8b267a324..b68a43ba7 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 2c018f916..7c4fac1e4 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;
diff --git a/newlib/libc/string/bcmp.c b/newlib/libc/string/bcmp.c
index 86aada10c..342237742 100644
--- a/newlib/libc/string/bcmp.c
+++ b/newlib/libc/string/bcmp.c
@@ -33,8 +33,8 @@ QUICKREF
int
_DEFUN (bcmp, (m1, m2, n),
- _CONST void *m1 _AND
- _CONST void *m2 _AND
+ _CONST void *m1,
+ _CONST void *m2,
size_t n)
{
diff --git a/newlib/libc/string/bcopy.c b/newlib/libc/string/bcopy.c
index 22a7f1bfe..1ad8b3e41 100644
--- a/newlib/libc/string/bcopy.c
+++ b/newlib/libc/string/bcopy.c
@@ -25,8 +25,8 @@ QUICKREF
void
_DEFUN (bcopy, (b1, b2, length),
- _CONST void *b1 _AND
- void *b2 _AND
+ _CONST void *b1,
+ void *b2,
size_t length)
{
memmove (b2, b1, length);
diff --git a/newlib/libc/string/index.c b/newlib/libc/string/index.c
index 2c4b49016..756bbff3e 100644
--- a/newlib/libc/string/index.c
+++ b/newlib/libc/string/index.c
@@ -32,7 +32,7 @@ QUICKREF
char *
_DEFUN (index, (s, c),
- _CONST char *s _AND
+ _CONST char *s,
int c)
{
return strchr (s, c);
diff --git a/newlib/libc/string/memccpy.c b/newlib/libc/string/memccpy.c
index 219aa5cfe..6e49a1c6d 100644
--- a/newlib/libc/string/memccpy.c
+++ b/newlib/libc/string/memccpy.c
@@ -57,9 +57,9 @@ PORTABILITY
_PTR
_DEFUN (memccpy, (dst0, src0, endchar, len0),
- _PTR __restrict dst0 _AND
- _CONST _PTR __restrict src0 _AND
- int endchar0 _AND
+ _PTR __restrict dst0,
+ _CONST _PTR __restrict src0,
+ int endchar0,
size_t len0)
{
diff --git a/newlib/libc/string/memchr.c b/newlib/libc/string/memchr.c
index 152cd718a..a6c5556d7 100644
--- a/newlib/libc/string/memchr.c
+++ b/newlib/libc/string/memchr.c
@@ -63,8 +63,8 @@ QUICKREF
_PTR
_DEFUN (memchr, (src_void, c, length),
- _CONST _PTR src_void _AND
- int c _AND
+ _CONST _PTR src_void,
+ int c,
size_t length)
{
_CONST unsigned char *src = (_CONST unsigned char *) src_void;
diff --git a/newlib/libc/string/memcmp.c b/newlib/libc/string/memcmp.c
index 8f86e7afd..1af9219de 100644
--- a/newlib/libc/string/memcmp.c
+++ b/newlib/libc/string/memcmp.c
@@ -44,8 +44,8 @@ QUICKREF
int
_DEFUN (memcmp, (m1, m2, n),
- _CONST _PTR m1 _AND
- _CONST _PTR m2 _AND
+ _CONST _PTR m1,
+ _CONST _PTR m2,
size_t n)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/memcpy.c b/newlib/libc/string/memcpy.c
index c76ab484f..3d0dca209 100644
--- a/newlib/libc/string/memcpy.c
+++ b/newlib/libc/string/memcpy.c
@@ -45,8 +45,8 @@ QUICKREF
_PTR
_DEFUN (memcpy, (dst0, src0, len0),
- _PTR __restrict dst0 _AND
- _CONST _PTR __restrict src0 _AND
+ _PTR __restrict dst0,
+ _CONST _PTR __restrict src0,
size_t len0)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/memmem.c b/newlib/libc/string/memmem.c
index 59e19d245..5588b9f59 100644
--- a/newlib/libc/string/memmem.c
+++ b/newlib/libc/string/memmem.c
@@ -47,9 +47,9 @@ QUICKREF
void *
_DEFUN (memmem, (haystack_start, haystack_len, needle_start, needle_len),
- const void *haystack_start _AND
- size_t haystack_len _AND
- const void *needle_start _AND
+ const void *haystack_start,
+ size_t haystack_len,
+ const void *needle_start,
size_t needle_len)
{
/* Abstract memory is considered to be an array of 'unsigned char' values,
diff --git a/newlib/libc/string/memmove.c b/newlib/libc/string/memmove.c
index e6275a7e1..10a3dfd2b 100644
--- a/newlib/libc/string/memmove.c
+++ b/newlib/libc/string/memmove.c
@@ -51,8 +51,8 @@ QUICKREF
_PTR
__inhibit_loop_to_libcall
_DEFUN (memmove, (dst_void, src_void, length),
- _PTR dst_void _AND
- _CONST _PTR src_void _AND
+ _PTR dst_void,
+ _CONST _PTR src_void,
size_t length)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/mempcpy.c b/newlib/libc/string/mempcpy.c
index 1a8e7cd34..74c453b47 100644
--- a/newlib/libc/string/mempcpy.c
+++ b/newlib/libc/string/mempcpy.c
@@ -44,8 +44,8 @@ PORTABILITY
_PTR
_DEFUN (mempcpy, (dst0, src0, len0),
- _PTR dst0 _AND
- _CONST _PTR src0 _AND
+ _PTR dst0,
+ _CONST _PTR src0,
size_t len0)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/memrchr.c b/newlib/libc/string/memrchr.c
index 974cebc16..6a2c03e4e 100644
--- a/newlib/libc/string/memrchr.c
+++ b/newlib/libc/string/memrchr.c
@@ -63,8 +63,8 @@ QUICKREF
_PTR
_DEFUN (memrchr, (src_void, c, length),
- _CONST _PTR src_void _AND
- int c _AND
+ _CONST _PTR src_void,
+ int c,
size_t length)
{
_CONST unsigned char *src = (_CONST unsigned char *) src_void + length - 1;
diff --git a/newlib/libc/string/memset.c b/newlib/libc/string/memset.c
index 7d05478eb..284c36e2c 100644
--- a/newlib/libc/string/memset.c
+++ b/newlib/libc/string/memset.c
@@ -36,8 +36,8 @@ QUICKREF
_PTR
__inhibit_loop_to_libcall
_DEFUN (memset, (m, c, n),
- _PTR m _AND
- int c _AND
+ _PTR m,
+ int c,
size_t n)
{
char *s = (char *) m;
diff --git a/newlib/libc/string/rawmemchr.c b/newlib/libc/string/rawmemchr.c
index c1b360dd3..51fe8e37e 100644
--- a/newlib/libc/string/rawmemchr.c
+++ b/newlib/libc/string/rawmemchr.c
@@ -62,7 +62,7 @@ QUICKREF
_PTR
_DEFUN (rawmemchr, (src_void, c),
- _CONST _PTR src_void _AND
+ _CONST _PTR src_void,
int c)
{
_CONST unsigned char *src = (_CONST unsigned char *) src_void;
diff --git a/newlib/libc/string/rindex.c b/newlib/libc/string/rindex.c
index 3284361f8..e18fcb667 100644
--- a/newlib/libc/string/rindex.c
+++ b/newlib/libc/string/rindex.c
@@ -32,7 +32,7 @@ QUICKREF
char *
_DEFUN (rindex, (s, c),
- _CONST char *s _AND
+ _CONST char *s,
int c)
{
return strrchr (s, c);
diff --git a/newlib/libc/string/stpcpy.c b/newlib/libc/string/stpcpy.c
index 6272f1da6..5e00b24a2 100644
--- a/newlib/libc/string/stpcpy.c
+++ b/newlib/libc/string/stpcpy.c
@@ -54,7 +54,7 @@ QUICKREF
char*
_DEFUN (stpcpy, (dst, src),
- char *__restrict dst _AND
+ char *__restrict dst,
_CONST char *__restrict src)
{
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/stpncpy.c b/newlib/libc/string/stpncpy.c
index aa5acd45f..9e8a12950 100644
--- a/newlib/libc/string/stpncpy.c
+++ b/newlib/libc/string/stpncpy.c
@@ -62,8 +62,8 @@ QUICKREF
char *
_DEFUN (stpncpy, (dst, src),
- char *__restrict dst _AND
- _CONST char *__restrict src _AND
+ char *__restrict dst,
+ _CONST char *__restrict src,
size_t count)
{
char *ret = NULL;
diff --git a/newlib/libc/string/strcasecmp.c b/newlib/libc/string/strcasecmp.c
index a6c34862f..1ee8f0ebf 100644
--- a/newlib/libc/string/strcasecmp.c
+++ b/newlib/libc/string/strcasecmp.c
@@ -37,7 +37,7 @@ QUICKREF
int
_DEFUN (strcasecmp, (s1, s2),
- _CONST char *s1 _AND
+ _CONST char *s1,
_CONST char *s2)
{
int d = 0;
diff --git a/newlib/libc/string/strcasestr.c b/newlib/libc/string/strcasestr.c
index 599f50227..71ade6664 100644
--- a/newlib/libc/string/strcasestr.c
+++ b/newlib/libc/string/strcasestr.c
@@ -91,7 +91,7 @@ QUICKREF
*/
char *
_DEFUN (strcasestr, (s, find),
- _CONST char *s _AND
+ _CONST char *s,
_CONST char *find)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strcat.c b/newlib/libc/string/strcat.c
index 44b6b03f0..96de39ba2 100644
--- a/newlib/libc/string/strcat.c
+++ b/newlib/libc/string/strcat.c
@@ -55,7 +55,7 @@ QUICKREF
char *
_DEFUN (strcat, (s1, s2),
- char *__restrict s1 _AND
+ char *__restrict s1,
_CONST char *__restrict s2)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strchr.c b/newlib/libc/string/strchr.c
index 7147bd457..f293612d5 100644
--- a/newlib/libc/string/strchr.c
+++ b/newlib/libc/string/strchr.c
@@ -53,7 +53,7 @@ QUICKREF
char *
_DEFUN (strchr, (s1, i),
- _CONST char *s1 _AND
+ _CONST char *s1,
int i)
{
_CONST unsigned char *s = (_CONST unsigned char *)s1;
diff --git a/newlib/libc/string/strchrnul.c b/newlib/libc/string/strchrnul.c
index 3b6cd62fb..3d110b920 100644
--- a/newlib/libc/string/strchrnul.c
+++ b/newlib/libc/string/strchrnul.c
@@ -32,7 +32,7 @@ QUICKREF
char *
_DEFUN (strchrnul, (s1, i),
- _CONST char *s1 _AND
+ _CONST char *s1,
int i)
{
char *s = strchr(s1, i);
diff --git a/newlib/libc/string/strcmp.c b/newlib/libc/string/strcmp.c
index d5e9148ef..c117c38ff 100644
--- a/newlib/libc/string/strcmp.c
+++ b/newlib/libc/string/strcmp.c
@@ -53,7 +53,7 @@ QUICKREF
int
_DEFUN (strcmp, (s1, s2),
- _CONST char *s1 _AND
+ _CONST char *s1,
_CONST char *s2)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strcoll.c b/newlib/libc/string/strcoll.c
index 551ede65b..d95a42e2b 100644
--- a/newlib/libc/string/strcoll.c
+++ b/newlib/libc/string/strcoll.c
@@ -37,7 +37,7 @@ QUICKREF
int
_DEFUN (strcoll, (a, b),
- _CONST char *a _AND
+ _CONST char *a,
_CONST char *b)
{
diff --git a/newlib/libc/string/strcpy.c b/newlib/libc/string/strcpy.c
index 9670d2c13..4354472d3 100644
--- a/newlib/libc/string/strcpy.c
+++ b/newlib/libc/string/strcpy.c
@@ -53,7 +53,7 @@ QUICKREF
char*
_DEFUN (strcpy, (dst0, src0),
- char *dst0 _AND
+ char *dst0,
_CONST char *src0)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strcspn.c b/newlib/libc/string/strcspn.c
index f80b61f37..f0e30c80c 100644
--- a/newlib/libc/string/strcspn.c
+++ b/newlib/libc/string/strcspn.c
@@ -27,7 +27,7 @@ PORTABILITY
size_t
_DEFUN (strcspn, (s1, s2),
- _CONST char *s1 _AND
+ _CONST char *s1,
_CONST char *s2)
{
_CONST char *s = s1;
diff --git a/newlib/libc/string/strdup_r.c b/newlib/libc/string/strdup_r.c
index ef77a58eb..474ec9668 100644
--- a/newlib/libc/string/strdup_r.c
+++ b/newlib/libc/string/strdup_r.c
@@ -4,7 +4,7 @@
char *
_DEFUN (_strdup_r, (reent_ptr, str),
- struct _reent *reent_ptr _AND
+ struct _reent *reent_ptr,
_CONST char *str)
{
size_t len = strlen (str) + 1;
diff --git a/newlib/libc/string/strerror.c b/newlib/libc/string/strerror.c
index 8da7d5185..43fa1f592 100644
--- a/newlib/libc/string/strerror.c
+++ b/newlib/libc/string/strerror.c
@@ -386,9 +386,9 @@ QUICKREF
char *
_DEFUN (_strerror_r, (ptr, errnum, internal, errptr),
- struct _reent *ptr _AND
- int errnum _AND
- int internal _AND
+ struct _reent *ptr,
+ int errnum,
+ int internal,
int *errptr)
{
char *error;
diff --git a/newlib/libc/string/strerror_r.c b/newlib/libc/string/strerror_r.c
index af9337563..c888f9ff3 100644
--- a/newlib/libc/string/strerror_r.c
+++ b/newlib/libc/string/strerror_r.c
@@ -66,8 +66,8 @@ a non-empty alternate string without assigning into its third argument.
see xpg_strerror_r.c for the POSIX version. */
char *
_DEFUN (strerror_r, (errnum, buffer, n),
- int errnum _AND
- char *buffer _AND
+ int errnum,
+ char *buffer,
size_t n)
{
char *error = _strerror_r (_REENT, errnum, 1, NULL);
diff --git a/newlib/libc/string/strlcat.c b/newlib/libc/string/strlcat.c
index 0c47bd527..c606f3b30 100644
--- a/newlib/libc/string/strlcat.c
+++ b/newlib/libc/string/strlcat.c
@@ -43,8 +43,8 @@ static char *rcsid = "$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp
*/
size_t
_DEFUN (strlcat, (dst, src, siz),
- char *dst _AND
- _CONST char *src _AND
+ char *dst,
+ _CONST char *src,
size_t siz)
{
register char *d = dst;
diff --git a/newlib/libc/string/strlcpy.c b/newlib/libc/string/strlcpy.c
index c31001642..300ac82c1 100644
--- a/newlib/libc/string/strlcpy.c
+++ b/newlib/libc/string/strlcpy.c
@@ -41,8 +41,8 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp
*/
size_t
_DEFUN (strlcpy, (dst, src, siz),
- char *dst _AND
- _CONST char *src _AND
+ char *dst,
+ _CONST char *src,
size_t siz)
{
register char *d = dst;
diff --git a/newlib/libc/string/strncasecmp.c b/newlib/libc/string/strncasecmp.c
index c06294232..a30fccf81 100644
--- a/newlib/libc/string/strncasecmp.c
+++ b/newlib/libc/string/strncasecmp.c
@@ -38,8 +38,8 @@ QUICKREF
int
_DEFUN (strncasecmp, (s1, s2, n),
- _CONST char *s1 _AND
- _CONST char *s2 _AND
+ _CONST char *s1,
+ _CONST char *s2,
size_t n)
{
int d = 0;
diff --git a/newlib/libc/string/strncat.c b/newlib/libc/string/strncat.c
index 761cf87a7..f800221c6 100644
--- a/newlib/libc/string/strncat.c
+++ b/newlib/libc/string/strncat.c
@@ -59,8 +59,8 @@ QUICKREF
char *
_DEFUN (strncat, (s1, s2, n),
- char *__restrict s1 _AND
- _CONST char *__restrict s2 _AND
+ char *__restrict s1,
+ _CONST char *__restrict s2,
size_t n)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strncmp.c b/newlib/libc/string/strncmp.c
index 3bbe47bcc..98a31d32b 100644
--- a/newlib/libc/string/strncmp.c
+++ b/newlib/libc/string/strncmp.c
@@ -53,8 +53,8 @@ QUICKREF
int
_DEFUN (strncmp, (s1, s2, n),
- _CONST char *s1 _AND
- _CONST char *s2 _AND
+ _CONST char *s1,
+ _CONST char *s2,
size_t n)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strncpy.c b/newlib/libc/string/strncpy.c
index 83596f408..91b274590 100644
--- a/newlib/libc/string/strncpy.c
+++ b/newlib/libc/string/strncpy.c
@@ -60,8 +60,8 @@ QUICKREF
char *
_DEFUN (strncpy, (dst0, src0),
- char *__restrict dst0 _AND
- _CONST char *__restrict src0 _AND
+ char *__restrict dst0,
+ _CONST char *__restrict src0,
size_t count)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strndup.c b/newlib/libc/string/strndup.c
index caa1b68b7..64e9ae68e 100644
--- a/newlib/libc/string/strndup.c
+++ b/newlib/libc/string/strndup.c
@@ -7,7 +7,7 @@
char *
_DEFUN (strndup, (str, n),
- _CONST char *str _AND
+ _CONST char *str,
size_t n)
{
return _strndup_r (_REENT, str, n);
diff --git a/newlib/libc/string/strndup_r.c b/newlib/libc/string/strndup_r.c
index 2acf63dec..c8ec072fa 100644
--- a/newlib/libc/string/strndup_r.c
+++ b/newlib/libc/string/strndup_r.c
@@ -4,8 +4,8 @@
char *
_DEFUN (_strndup_r, (reent_ptr, str, n),
- struct _reent *reent_ptr _AND
- _CONST char *str _AND
+ struct _reent *reent_ptr,
+ _CONST char *str,
size_t n)
{
_CONST char *ptr = str;
diff --git a/newlib/libc/string/strnlen.c b/newlib/libc/string/strnlen.c
index 07ece0d8b..4978f726d 100644
--- a/newlib/libc/string/strnlen.c
+++ b/newlib/libc/string/strnlen.c
@@ -31,7 +31,7 @@ PORTABILITY
size_t
_DEFUN (strnlen, (str, n),
- _CONST char *str _AND
+ _CONST char *str,
size_t n)
{
_CONST char *start = str;
diff --git a/newlib/libc/string/strpbrk.c b/newlib/libc/string/strpbrk.c
index 4507a86a4..f589fbdac 100644
--- a/newlib/libc/string/strpbrk.c
+++ b/newlib/libc/string/strpbrk.c
@@ -26,7 +26,7 @@ PORTABILITY
char *
_DEFUN (strpbrk, (s1, s2),
- _CONST char *s1 _AND
+ _CONST char *s1,
_CONST char *s2)
{
_CONST char *c = s2;
diff --git a/newlib/libc/string/strrchr.c b/newlib/libc/string/strrchr.c
index 8217c6df3..721bb91dc 100644
--- a/newlib/libc/string/strrchr.c
+++ b/newlib/libc/string/strrchr.c
@@ -31,7 +31,7 @@ QUICKREF
char *
_DEFUN (strrchr, (s, i),
- _CONST char *s _AND
+ _CONST char *s,
int i)
{
_CONST char *last = NULL;
diff --git a/newlib/libc/string/strsep.c b/newlib/libc/string/strsep.c
index d3d0ad0a9..e59782795 100644
--- a/newlib/libc/string/strsep.c
+++ b/newlib/libc/string/strsep.c
@@ -12,7 +12,7 @@ extern char *__strtok_r (char *, const char *, char **, int);
char *
_DEFUN (strsep, (source_ptr, delim),
- register char **source_ptr _AND
+ register char **source_ptr,
register const char *delim)
{
return __strtok_r (*source_ptr, delim, source_ptr, 0);
diff --git a/newlib/libc/string/strspn.c b/newlib/libc/string/strspn.c
index 3f43b8f82..287da4d7e 100644
--- a/newlib/libc/string/strspn.c
+++ b/newlib/libc/string/strspn.c
@@ -31,7 +31,7 @@ QUICKREF
size_t
_DEFUN (strspn, (s1, s2),
- _CONST char *s1 _AND
+ _CONST char *s1,
_CONST char *s2)
{
_CONST char *s = s1;
diff --git a/newlib/libc/string/strstr.c b/newlib/libc/string/strstr.c
index 288c74466..94fe297e7 100644
--- a/newlib/libc/string/strstr.c
+++ b/newlib/libc/string/strstr.c
@@ -40,7 +40,7 @@ QUICKREF
char *
_DEFUN (strstr, (searchee, lookfor),
- _CONST char *searchee _AND
+ _CONST char *searchee,
_CONST char *lookfor)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strtok.c b/newlib/libc/string/strtok.c
index a24c538e4..92c801731 100644
--- a/newlib/libc/string/strtok.c
+++ b/newlib/libc/string/strtok.c
@@ -80,7 +80,7 @@ extern char *__strtok_r (char *, const char *, char **, int);
char *
_DEFUN (strtok, (s, delim),
- register char *__restrict s _AND
+ register char *__restrict s,
register const char *__restrict delim)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/string/strtok_r.c b/newlib/libc/string/strtok_r.c
index 6ace7008b..0d01dcaad 100644
--- a/newlib/libc/string/strtok_r.c
+++ b/newlib/libc/string/strtok_r.c
@@ -31,9 +31,9 @@
char *
_DEFUN (__strtok_r, (s, delim, lasts, skip_leading_delim),
- register char *s _AND
- register const char *delim _AND
- char **lasts _AND
+ register char *s,
+ register const char *delim,
+ char **lasts,
int skip_leading_delim)
{
register char *spanp;
@@ -91,8 +91,8 @@ cont:
char *
_DEFUN (strtok_r, (s, delim, lasts),
- register char *__restrict s _AND
- register const char *__restrict delim _AND
+ register char *__restrict s,
+ register const char *__restrict delim,
char **__restrict lasts)
{
return __strtok_r (s, delim, lasts, 1);
diff --git a/newlib/libc/string/strxfrm.c b/newlib/libc/string/strxfrm.c
index de397210b..55b81b335 100644
--- a/newlib/libc/string/strxfrm.c
+++ b/newlib/libc/string/strxfrm.c
@@ -47,8 +47,8 @@ QUICKREF
size_t
_DEFUN (strxfrm, (s1, s2, n),
- char *__restrict s1 _AND
- _CONST char *__restrict s2 _AND
+ char *__restrict s1,
+ _CONST char *__restrict s2,
size_t n)
{
size_t res;
diff --git a/newlib/libc/string/swab.c b/newlib/libc/string/swab.c
index ecf5abed9..b08066875 100644
--- a/newlib/libc/string/swab.c
+++ b/newlib/libc/string/swab.c
@@ -19,8 +19,8 @@ PORTABILITY
void
_DEFUN (swab, (b1, b2, length),
- _CONST void *b1 _AND
- void *b2 _AND
+ _CONST void *b1,
+ void *b2,
ssize_t length)
{
const char *from = b1;
diff --git a/newlib/libc/string/u_strerr.c b/newlib/libc/string/u_strerr.c
index 2978df0cf..d3204df72 100644
--- a/newlib/libc/string/u_strerr.c
+++ b/newlib/libc/string/u_strerr.c
@@ -2,8 +2,8 @@
char *
_DEFUN(_user_strerror, (errnum, internal, errptr),
- int errnum _AND
- int internal _AND
+ int errnum,
+ int internal,
int *errptr)
{
/* prevent warning about unused parameters */
diff --git a/newlib/libc/string/wcpcpy.c b/newlib/libc/string/wcpcpy.c
index f0f9c4a08..0fda226e7 100644
--- a/newlib/libc/string/wcpcpy.c
+++ b/newlib/libc/string/wcpcpy.c
@@ -27,7 +27,7 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcpcpy, (s1, s2),
- wchar_t *__restrict s1 _AND
+ wchar_t *__restrict s1,
_CONST wchar_t *__restrict s2)
{
while ((*s1++ = *s2++))
diff --git a/newlib/libc/string/wcpncpy.c b/newlib/libc/string/wcpncpy.c
index 8f7ee796f..f643b1e43 100644
--- a/newlib/libc/string/wcpncpy.c
+++ b/newlib/libc/string/wcpncpy.c
@@ -34,8 +34,8 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcpncpy, (dst, src, count),
- wchar_t *__restrict dst _AND
- _CONST wchar_t *__restrict src _AND
+ wchar_t *__restrict dst,
+ _CONST wchar_t *__restrict src,
size_t count)
{
wchar_t *ret = NULL;
diff --git a/newlib/libc/string/wcscasecmp.c b/newlib/libc/string/wcscasecmp.c
index 26c7cc237..f23e37227 100644
--- a/newlib/libc/string/wcscasecmp.c
+++ b/newlib/libc/string/wcscasecmp.c
@@ -37,7 +37,7 @@ QUICKREF
int
_DEFUN (wcscasecmp, (s1, s2),
- _CONST wchar_t *s1 _AND
+ _CONST wchar_t *s1,
_CONST wchar_t *s2)
{
int d = 0;
diff --git a/newlib/libc/string/wcscat.c b/newlib/libc/string/wcscat.c
index 586512d0f..900c3cc52 100644
--- a/newlib/libc/string/wcscat.c
+++ b/newlib/libc/string/wcscat.c
@@ -62,7 +62,7 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcscat, (s1, s2),
- wchar_t *__restrict s1 _AND
+ wchar_t *__restrict s1,
_CONST wchar_t *__restrict s2)
{
wchar_t *p;
diff --git a/newlib/libc/string/wcschr.c b/newlib/libc/string/wcschr.c
index c705a08d5..7590009e9 100644
--- a/newlib/libc/string/wcschr.c
+++ b/newlib/libc/string/wcschr.c
@@ -59,7 +59,7 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcschr, (s, c),
- _CONST wchar_t * s _AND
+ _CONST wchar_t * s,
wchar_t c)
{
_CONST wchar_t *p;
diff --git a/newlib/libc/string/wcscmp.c b/newlib/libc/string/wcscmp.c
index 8155742b8..f14eb5d8d 100644
--- a/newlib/libc/string/wcscmp.c
+++ b/newlib/libc/string/wcscmp.c
@@ -68,7 +68,7 @@ No supporting OS subroutines are required.
*/
int
_DEFUN (wcscmp, (s1, s2),
- _CONST wchar_t * s1 _AND
+ _CONST wchar_t * s1,
_CONST wchar_t * s2)
{
diff --git a/newlib/libc/string/wcscoll.c b/newlib/libc/string/wcscoll.c
index 020f7e57f..27a12456e 100644
--- a/newlib/libc/string/wcscoll.c
+++ b/newlib/libc/string/wcscoll.c
@@ -34,7 +34,7 @@ PORTABILITY
int
_DEFUN (wcscoll, (a, b),
- _CONST wchar_t *a _AND
+ _CONST wchar_t *a,
_CONST wchar_t *b)
{
diff --git a/newlib/libc/string/wcscpy.c b/newlib/libc/string/wcscpy.c
index 79f065ca0..2dff63996 100644
--- a/newlib/libc/string/wcscpy.c
+++ b/newlib/libc/string/wcscpy.c
@@ -58,7 +58,7 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcscpy, (s1, s2),
- wchar_t *__restrict s1 _AND
+ wchar_t *__restrict s1,
_CONST wchar_t *__restrict s2)
{
wchar_t *p;
diff --git a/newlib/libc/string/wcscspn.c b/newlib/libc/string/wcscspn.c
index 7be5f5eee..355499699 100644
--- a/newlib/libc/string/wcscspn.c
+++ b/newlib/libc/string/wcscspn.c
@@ -57,7 +57,7 @@ No supporting OS subroutines are required.
size_t
_DEFUN (wcscspn, (s, set),
- _CONST wchar_t * s _AND
+ _CONST wchar_t * s,
_CONST wchar_t * set)
{
_CONST wchar_t *p;
diff --git a/newlib/libc/string/wcslcat.c b/newlib/libc/string/wcslcat.c
index 2caa58820..1015c4c36 100644
--- a/newlib/libc/string/wcslcat.c
+++ b/newlib/libc/string/wcslcat.c
@@ -69,8 +69,8 @@ No supporting OS subroutines are required.
*/
size_t
_DEFUN (wcslcat, (dst, src, siz),
- wchar_t * dst _AND
- _CONST wchar_t * src _AND
+ wchar_t * dst,
+ _CONST wchar_t * src,
size_t siz)
{
wchar_t *d = dst;
diff --git a/newlib/libc/string/wcslcpy.c b/newlib/libc/string/wcslcpy.c
index 34352fb9d..396dda71a 100644
--- a/newlib/libc/string/wcslcpy.c
+++ b/newlib/libc/string/wcslcpy.c
@@ -63,8 +63,8 @@ No supporting OS subroutines are required.
*/
size_t
_DEFUN (wcslcpy, (dst, src, siz),
- wchar_t * dst _AND
- _CONST wchar_t * src _AND
+ wchar_t * dst,
+ _CONST wchar_t * src,
size_t siz)
{
wchar_t *d = dst;
diff --git a/newlib/libc/string/wcsncasecmp.c b/newlib/libc/string/wcsncasecmp.c
index a339bbfa5..90f310158 100644
--- a/newlib/libc/string/wcsncasecmp.c
+++ b/newlib/libc/string/wcsncasecmp.c
@@ -38,8 +38,8 @@ QUICKREF
int
_DEFUN (wcsncasecmp, (s1, s2, n),
- _CONST wchar_t *s1 _AND
- _CONST wchar_t *s2 _AND
+ _CONST wchar_t *s1,
+ _CONST wchar_t *s2,
size_t n)
{
int d = 0;
diff --git a/newlib/libc/string/wcsncat.c b/newlib/libc/string/wcsncat.c
index 34a694790..57dc9031b 100644
--- a/newlib/libc/string/wcsncat.c
+++ b/newlib/libc/string/wcsncat.c
@@ -63,8 +63,8 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcsncat, (s1, s2, n),
- wchar_t *__restrict s1 _AND
- _CONST wchar_t *__restrict s2 _AND
+ wchar_t *__restrict s1,
+ _CONST wchar_t *__restrict s2,
size_t n)
{
wchar_t *p;
diff --git a/newlib/libc/string/wcsncmp.c b/newlib/libc/string/wcsncmp.c
index 72c5d1291..83b899d84 100644
--- a/newlib/libc/string/wcsncmp.c
+++ b/newlib/libc/string/wcsncmp.c
@@ -64,8 +64,8 @@ No supporting OS subroutines are required.
int
_DEFUN (wcsncmp, (s1, s2, n),
- _CONST wchar_t * s1 _AND
- _CONST wchar_t * s2 _AND
+ _CONST wchar_t * s1,
+ _CONST wchar_t * s2,
size_t n)
{
diff --git a/newlib/libc/string/wcsncpy.c b/newlib/libc/string/wcsncpy.c
index 793e522da..d09b95df7 100644
--- a/newlib/libc/string/wcsncpy.c
+++ b/newlib/libc/string/wcsncpy.c
@@ -36,8 +36,8 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcsncpy, (s1, s2, n),
- wchar_t *__restrict s1 _AND
- _CONST wchar_t *__restrict s2 _AND
+ wchar_t *__restrict s1,
+ _CONST wchar_t *__restrict s2,
size_t n)
{
wchar_t *dscan=s1;
diff --git a/newlib/libc/string/wcsnlen.c b/newlib/libc/string/wcsnlen.c
index 77aad65a3..e9715e749 100644
--- a/newlib/libc/string/wcsnlen.c
+++ b/newlib/libc/string/wcsnlen.c
@@ -53,7 +53,7 @@ PORTABILITY
size_t
_DEFUN(wcsnlen, (s, maxlen),
- _CONST wchar_t *s _AND
+ _CONST wchar_t *s,
size_t maxlen)
{
_CONST wchar_t *p;
diff --git a/newlib/libc/string/wcspbrk.c b/newlib/libc/string/wcspbrk.c
index 55401f1a9..b4d8230cc 100644
--- a/newlib/libc/string/wcspbrk.c
+++ b/newlib/libc/string/wcspbrk.c
@@ -58,7 +58,7 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcspbrk, (s, set),
- _CONST wchar_t * s _AND
+ _CONST wchar_t * s,
_CONST wchar_t * set)
{
_CONST wchar_t *p;
diff --git a/newlib/libc/string/wcsrchr.c b/newlib/libc/string/wcsrchr.c
index b99cb9760..68f1e28b6 100644
--- a/newlib/libc/string/wcsrchr.c
+++ b/newlib/libc/string/wcsrchr.c
@@ -61,7 +61,7 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wcsrchr, (s, c),
- _CONST wchar_t * s _AND
+ _CONST wchar_t * s,
wchar_t c)
{
_CONST wchar_t *p;
diff --git a/newlib/libc/string/wcsspn.c b/newlib/libc/string/wcsspn.c
index 652d971dd..8e8ce6c69 100644
--- a/newlib/libc/string/wcsspn.c
+++ b/newlib/libc/string/wcsspn.c
@@ -57,7 +57,7 @@ No supporting OS subroutines are required.
size_t
_DEFUN (wcsspn, (s, set),
- _CONST wchar_t * s _AND
+ _CONST wchar_t * s,
_CONST wchar_t * set)
{
_CONST wchar_t *p;
diff --git a/newlib/libc/string/wcsstr.c b/newlib/libc/string/wcsstr.c
index bb6e3eda8..2fdec0f97 100644
--- a/newlib/libc/string/wcsstr.c
+++ b/newlib/libc/string/wcsstr.c
@@ -62,7 +62,7 @@ PORTABILITY
wchar_t *
_DEFUN (wcsstr, (big, little),
- _CONST wchar_t *__restrict big _AND
+ _CONST wchar_t *__restrict big,
_CONST wchar_t *__restrict little)
{
_CONST wchar_t *p;
diff --git a/newlib/libc/string/wcstok.c b/newlib/libc/string/wcstok.c
index 091f4bd3e..2467704fd 100644
--- a/newlib/libc/string/wcstok.c
+++ b/newlib/libc/string/wcstok.c
@@ -91,8 +91,8 @@ QUICKREF
wchar_t *
_DEFUN (wcstok, (s, delim, lasts),
- register wchar_t *__restrict s _AND
- register const wchar_t *__restrict delim _AND
+ register wchar_t *__restrict s,
+ register const wchar_t *__restrict delim,
wchar_t **__restrict lasts)
{
register const wchar_t *spanp;
diff --git a/newlib/libc/string/wcswidth.c b/newlib/libc/string/wcswidth.c
index 4cb8fa812..3764883a9 100644
--- a/newlib/libc/string/wcswidth.c
+++ b/newlib/libc/string/wcswidth.c
@@ -35,7 +35,7 @@ PORTABILITY
int
_DEFUN (wcswidth, (pwcs, n),
- _CONST wchar_t *pwcs _AND
+ _CONST wchar_t *pwcs,
size_t n)
{
diff --git a/newlib/libc/string/wcsxfrm.c b/newlib/libc/string/wcsxfrm.c
index e11516ff4..6911b21e2 100644
--- a/newlib/libc/string/wcsxfrm.c
+++ b/newlib/libc/string/wcsxfrm.c
@@ -37,8 +37,8 @@ PORTABILITY
size_t
_DEFUN (wcsxfrm, (a, b, n),
- wchar_t *__restrict a _AND
- _CONST wchar_t *__restrict b _AND
+ wchar_t *__restrict a,
+ _CONST wchar_t *__restrict b,
size_t n)
{
diff --git a/newlib/libc/string/wmemchr.c b/newlib/libc/string/wmemchr.c
index 097e47a03..2a6f8e1a4 100644
--- a/newlib/libc/string/wmemchr.c
+++ b/newlib/libc/string/wmemchr.c
@@ -64,8 +64,8 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wmemchr, (s, c, n),
- _CONST wchar_t * s _AND
- wchar_t c _AND
+ _CONST wchar_t * s,
+ wchar_t c,
size_t n)
{
size_t i;
diff --git a/newlib/libc/string/wmemcmp.c b/newlib/libc/string/wmemcmp.c
index a01bf32f1..bfe1e69b4 100644
--- a/newlib/libc/string/wmemcmp.c
+++ b/newlib/libc/string/wmemcmp.c
@@ -63,8 +63,8 @@ No supporting OS subroutines are required.
int
_DEFUN (wmemcmp, (s1, s2, n),
- _CONST wchar_t * s1 _AND
- _CONST wchar_t * s2 _AND
+ _CONST wchar_t * s1,
+ _CONST wchar_t * s2,
size_t n)
{
size_t i;
diff --git a/newlib/libc/string/wmemcpy.c b/newlib/libc/string/wmemcpy.c
index 0e8d6e494..9e4fdc517 100644
--- a/newlib/libc/string/wmemcpy.c
+++ b/newlib/libc/string/wmemcpy.c
@@ -62,8 +62,8 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wmemcpy, (d, s, n),
- wchar_t *__restrict d _AND
- _CONST wchar_t *__restrict s _AND
+ wchar_t *__restrict d,
+ _CONST wchar_t *__restrict s,
size_t n)
{
diff --git a/newlib/libc/string/wmemmove.c b/newlib/libc/string/wmemmove.c
index 18d2a2bfd..567f55afd 100644
--- a/newlib/libc/string/wmemmove.c
+++ b/newlib/libc/string/wmemmove.c
@@ -67,8 +67,8 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wmemmove, (d, s, n),
- wchar_t * d _AND
- _CONST wchar_t * s _AND
+ wchar_t * d,
+ _CONST wchar_t * s,
size_t n)
{
diff --git a/newlib/libc/string/wmempcpy.c b/newlib/libc/string/wmempcpy.c
index a3b2ce637..f11485262 100644
--- a/newlib/libc/string/wmempcpy.c
+++ b/newlib/libc/string/wmempcpy.c
@@ -35,8 +35,8 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN (wmempcpy, (d, s, n),
- wchar_t *__restrict d _AND
- _CONST wchar_t *__restrict s _AND
+ wchar_t *__restrict d,
+ _CONST wchar_t *__restrict s,
size_t n)
{
return (wchar_t *) mempcpy (d, s, n * sizeof (wchar_t));
diff --git a/newlib/libc/string/wmemset.c b/newlib/libc/string/wmemset.c
index 377fbee1f..f9ec361cd 100644
--- a/newlib/libc/string/wmemset.c
+++ b/newlib/libc/string/wmemset.c
@@ -60,8 +60,8 @@ No supporting OS subroutines are required.
wchar_t *
_DEFUN(wmemset, (s, c, n),
- wchar_t *s _AND
- wchar_t c _AND
+ wchar_t *s,
+ wchar_t c,
size_t n)
{
size_t i;
diff --git a/newlib/libc/string/xpg_strerror_r.c b/newlib/libc/string/xpg_strerror_r.c
index e503880b0..bc1858738 100644
--- a/newlib/libc/string/xpg_strerror_r.c
+++ b/newlib/libc/string/xpg_strerror_r.c
@@ -5,8 +5,8 @@
int
_DEFUN (__xpg_strerror_r, (errnum, buffer, n),
- int errnum _AND
- char *buffer _AND
+ int errnum,
+ char *buffer,
size_t n)
{
char *error;
diff --git a/newlib/libc/sys/a29khif/kill.c b/newlib/libc/sys/a29khif/kill.c
index ff9fe5428..0254367e4 100644
--- a/newlib/libc/sys/a29khif/kill.c
+++ b/newlib/libc/sys/a29khif/kill.c
@@ -7,7 +7,7 @@
int
_DEFUN (_kill, (pid, sig),
- int pid _AND
+ int pid,
int sig)
{
if (pid == 1 || pid < 0)
diff --git a/newlib/libc/sys/h8300hms/misc.c b/newlib/libc/sys/h8300hms/misc.c
index 6021b5cb6..4869af2d3 100644
--- a/newlib/libc/sys/h8300hms/misc.c
+++ b/newlib/libc/sys/h8300hms/misc.c
@@ -19,7 +19,7 @@ int _DEFUN(_getpid,(),)
}
int _DEFUN(_kill,(pid, sig),
- int pid _AND
+ int pid,
int sig)
{
if (pid == 0)
diff --git a/newlib/libc/sys/h8500hms/misc.c b/newlib/libc/sys/h8500hms/misc.c
index a791704a1..d16c797d9 100644
--- a/newlib/libc/sys/h8500hms/misc.c
+++ b/newlib/libc/sys/h8500hms/misc.c
@@ -20,7 +20,7 @@ int _DEFUN(_getpid,(),)
}
int _DEFUN(_kill,(pid, sig),
- int pid _AND
+ int pid,
int sig)
{
if (sig == SIGABRT)
diff --git a/newlib/libc/sys/linux/pread.c b/newlib/libc/sys/linux/pread.c
index ff8371e15..8a016e08a 100644
--- a/newlib/libc/sys/linux/pread.c
+++ b/newlib/libc/sys/linux/pread.c
@@ -7,10 +7,10 @@
ssize_t
_DEFUN (_pread_r, (rptr, fd, buf, n, off),
- struct _reent *rptr _AND
- int fd _AND
- _PTR buf _AND
- size_t n _AND
+ struct _reent *rptr,
+ int fd,
+ _PTR buf,
+ size_t n,
off_t off)
{
off_t cur_pos;
@@ -34,9 +34,9 @@ _DEFUN (_pread_r, (rptr, fd, buf, n, off),
ssize_t
_DEFUN (__libc_pread, (fd, buf, n, off),
- int fd _AND
- _PTR buf _AND
- size_t n _AND
+ int fd,
+ _PTR buf,
+ size_t n,
off_t off)
{
return _pread_r (_REENT, fd, buf, n, off);
diff --git a/newlib/libc/sys/linux/pread64.c b/newlib/libc/sys/linux/pread64.c
index 3ced04818..f95989b45 100644
--- a/newlib/libc/sys/linux/pread64.c
+++ b/newlib/libc/sys/linux/pread64.c
@@ -31,9 +31,9 @@ Supporting OS subroutine required: <<read>>, <<lseek64>>.
ssize_t
_DEFUN (__libc_pread64, (fd, buf, n, off),
- int fd _AND
- _PTR buf _AND
- size_t n _AND
+ int fd,
+ _PTR buf,
+ size_t n,
loff_t off)
{
loff_t cur_pos;
diff --git a/newlib/libc/sys/linux/pwrite.c b/newlib/libc/sys/linux/pwrite.c
index 239463e59..c2b79ad13 100644
--- a/newlib/libc/sys/linux/pwrite.c
+++ b/newlib/libc/sys/linux/pwrite.c
@@ -7,10 +7,10 @@
ssize_t
_DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
- struct _reent *rptr _AND
- int fd _AND
- _CONST _PTR buf _AND
- size_t n _AND
+ struct _reent *rptr,
+ int fd,
+ _CONST _PTR buf,
+ size_t n,
off_t off)
{
off_t cur_pos;
@@ -34,9 +34,9 @@ _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
ssize_t
_DEFUN (__libc_pwrite, (fd, buf, n, off),
- int fd _AND
- _CONST _PTR buf _AND
- size_t n _AND
+ int fd,
+ _CONST _PTR buf,
+ size_t n,
off_t off)
{
return _pwrite_r (_REENT, fd, buf, n, off);
diff --git a/newlib/libc/sys/linux/pwrite64.c b/newlib/libc/sys/linux/pwrite64.c
index 876749943..d486988dd 100644
--- a/newlib/libc/sys/linux/pwrite64.c
+++ b/newlib/libc/sys/linux/pwrite64.c
@@ -31,9 +31,9 @@ Supporting OS subroutine required: <<write>>, <<lseek64>>.
ssize_t
_DEFUN (__libc_pwrite64, (fd, buf, n, off),
- int fd _AND
- _PTR buf _AND
- size_t n _AND
+ int fd,
+ _PTR buf,
+ size_t n,
loff_t off)
{
loff_t cur_pos;
diff --git a/newlib/libc/sys/sysnec810/misc.c b/newlib/libc/sys/sysnec810/misc.c
index f44c03d51..354ecd81c 100644
--- a/newlib/libc/sys/sysnec810/misc.c
+++ b/newlib/libc/sys/sysnec810/misc.c
@@ -31,7 +31,7 @@ isatty() {
int
_DEFUN(_fstat,(file, st),
- int file _AND
+ int file,
struct stat *st)
{
st->st_mode = S_IFCHR;
diff --git a/newlib/libc/syscalls/sysexecve.c b/newlib/libc/syscalls/sysexecve.c
index 154c082f9..3471e893f 100644
--- a/newlib/libc/syscalls/sysexecve.c
+++ b/newlib/libc/syscalls/sysexecve.c
@@ -5,8 +5,8 @@
int
_DEFUN (execve, (name, argv, env),
- _CONST char *name _AND
- char *_CONST argv[] _AND
+ _CONST char *name,
+ char *_CONST argv[],
char *_CONST env[])
{
return _execve_r (_REENT, name, argv, env);
diff --git a/newlib/libc/syscalls/sysfcntl.c b/newlib/libc/syscalls/sysfcntl.c
index 12d09a8af..b063d766f 100644
--- a/newlib/libc/syscalls/sysfcntl.c
+++ b/newlib/libc/syscalls/sysfcntl.c
@@ -6,8 +6,8 @@
int
_DEFUN (fcntl, (fd, flag, arg),
- int fd _AND
- int flag _AND
+ int fd,
+ int flag,
int arg)
{
#ifdef HAVE_FCNTL
diff --git a/newlib/libc/syscalls/sysfstat.c b/newlib/libc/syscalls/sysfstat.c
index 7ce2c9dfe..1ab7d62fa 100644
--- a/newlib/libc/syscalls/sysfstat.c
+++ b/newlib/libc/syscalls/sysfstat.c
@@ -6,7 +6,7 @@
int
_DEFUN (fstat, (fd, pstat),
- int fd _AND
+ int fd,
struct stat *pstat)
{
return _fstat_r (_REENT, fd, pstat);
diff --git a/newlib/libc/syscalls/sysgettod.c b/newlib/libc/syscalls/sysgettod.c
index af6d8ab3f..f52f0045f 100644
--- a/newlib/libc/syscalls/sysgettod.c
+++ b/newlib/libc/syscalls/sysgettod.c
@@ -6,7 +6,7 @@
int
_DEFUN (gettimeofday, (ptimeval, ptimezone),
- struct timeval *ptimeval _AND
+ struct timeval *ptimeval,
void *ptimezone)
{
return _gettimeofday_r (_REENT, ptimeval, ptimezone);
diff --git a/newlib/libc/syscalls/syskill.c b/newlib/libc/syscalls/syskill.c
index 27f16be97..03e06c07a 100644
--- a/newlib/libc/syscalls/syskill.c
+++ b/newlib/libc/syscalls/syskill.c
@@ -5,7 +5,7 @@
int
_DEFUN (kill, (pid, sig),
- int pid _AND
+ int pid,
int sig)
{
return _kill_r (_REENT, pid, sig);
diff --git a/newlib/libc/syscalls/syslink.c b/newlib/libc/syscalls/syslink.c
index 327870769..afcf3559e 100644
--- a/newlib/libc/syscalls/syslink.c
+++ b/newlib/libc/syscalls/syslink.c
@@ -5,7 +5,7 @@
int
_DEFUN (link, (old, new),
- _CONST char *old _AND
+ _CONST char *old,
_CONST char *new)
{
return _link_r (_REENT, old, new);
diff --git a/newlib/libc/syscalls/syslseek.c b/newlib/libc/syscalls/syslseek.c
index 275d67ce4..41cfbf745 100644
--- a/newlib/libc/syscalls/syslseek.c
+++ b/newlib/libc/syscalls/syslseek.c
@@ -5,8 +5,8 @@
off_t
_DEFUN (lseek, (fd, pos, whence),
- int fd _AND
- off_t pos _AND
+ int fd,
+ off_t pos,
int whence)
{
return _lseek_r (_REENT, fd, pos, whence);
diff --git a/newlib/libc/syscalls/sysopen.c b/newlib/libc/syscalls/sysopen.c
index ed0cb604a..3909564cf 100644
--- a/newlib/libc/syscalls/sysopen.c
+++ b/newlib/libc/syscalls/sysopen.c
@@ -11,7 +11,7 @@
int
_DEFUN (open, (file, flags, ...),
- const char *file _AND
+ const char *file,
int flags _DOTS)
{
va_list ap;
diff --git a/newlib/libc/syscalls/sysread.c b/newlib/libc/syscalls/sysread.c
index bcf002d9d..e45b76336 100644
--- a/newlib/libc/syscalls/sysread.c
+++ b/newlib/libc/syscalls/sysread.c
@@ -5,8 +5,8 @@
_READ_WRITE_RETURN_TYPE
_DEFUN (read, (fd, buf, cnt),
- int fd _AND
- void *buf _AND
+ int fd,
+ void *buf,
size_t cnt)
{
return _read_r (_REENT, fd, buf, cnt);
diff --git a/newlib/libc/syscalls/sysstat.c b/newlib/libc/syscalls/sysstat.c
index fdf029cef..4f4cd8a78 100644
--- a/newlib/libc/syscalls/sysstat.c
+++ b/newlib/libc/syscalls/sysstat.c
@@ -6,7 +6,7 @@
int
_DEFUN (stat, (file, pstat),
- _CONST char *file _AND
+ _CONST char *file,
struct stat *pstat)
{
return _stat_r (_REENT, file, pstat);
diff --git a/newlib/libc/syscalls/syswrite.c b/newlib/libc/syscalls/syswrite.c
index 0f080fb4d..35a1e8430 100644
--- a/newlib/libc/syscalls/syswrite.c
+++ b/newlib/libc/syscalls/syswrite.c
@@ -5,8 +5,8 @@
_READ_WRITE_RETURN_TYPE
_DEFUN (write, (fd, buf, cnt),
- int fd _AND
- const void *buf _AND
+ int fd,
+ const void *buf,
size_t cnt)
{
return _write_r (_REENT, fd, buf, cnt);
diff --git a/newlib/libc/time/asctime_r.c b/newlib/libc/time/asctime_r.c
index 2ec53698e..c38e32f41 100644
--- a/newlib/libc/time/asctime_r.c
+++ b/newlib/libc/time/asctime_r.c
@@ -7,7 +7,7 @@
char *
_DEFUN (asctime_r, (tim_p, result),
- _CONST struct tm *__restrict tim_p _AND
+ _CONST struct tm *__restrict tim_p,
char *__restrict result)
{
static _CONST char day_name[7][3] = {
diff --git a/newlib/libc/time/ctime_r.c b/newlib/libc/time/ctime_r.c
index fda8cac1e..3546142dd 100644
--- a/newlib/libc/time/ctime_r.c
+++ b/newlib/libc/time/ctime_r.c
@@ -6,7 +6,7 @@
char *
_DEFUN (ctime_r, (tim_p, result),
- _CONST time_t * tim_p _AND
+ _CONST time_t * tim_p,
char * result)
{
diff --git a/newlib/libc/time/difftime.c b/newlib/libc/time/difftime.c
index 893fa4700..363eb6482 100644
--- a/newlib/libc/time/difftime.c
+++ b/newlib/libc/time/difftime.c
@@ -31,7 +31,7 @@ in all implementations.
double
_DEFUN (difftime, (tim1, tim2),
- time_t tim1 _AND
+ time_t tim1,
time_t tim2)
{
return (double)(tim1 - tim2);
diff --git a/newlib/libc/time/gmtime_r.c b/newlib/libc/time/gmtime_r.c
index 6475df3ba..01f95ebf7 100644
--- a/newlib/libc/time/gmtime_r.c
+++ b/newlib/libc/time/gmtime_r.c
@@ -47,7 +47,7 @@
struct tm *
_DEFUN (gmtime_r, (tim_p, res),
- _CONST time_t *__restrict tim_p _AND
+ _CONST time_t *__restrict tim_p,
struct tm *__restrict res)
{
long days, rem;
diff --git a/newlib/libc/time/lcltime_r.c b/newlib/libc/time/lcltime_r.c
index 3342e9906..9abf683a7 100644
--- a/newlib/libc/time/lcltime_r.c
+++ b/newlib/libc/time/lcltime_r.c
@@ -17,7 +17,7 @@
struct tm *
_DEFUN (localtime_r, (tim_p, res),
- _CONST time_t *__restrict tim_p _AND
+ _CONST time_t *__restrict tim_p,
struct tm *__restrict res)
{
long offset;
diff --git a/newlib/libc/time/strftime.c b/newlib/libc/time/strftime.c
index cf426d673..54df9b2e1 100644
--- a/newlib/libc/time/strftime.c
+++ b/newlib/libc/time/strftime.c
@@ -1432,9 +1432,9 @@ recurse:
size_t
_DEFUN (strftime, (s, maxsize, format, tim_p),
- CHAR *__restrict s _AND
- size_t maxsize _AND
- _CONST CHAR *__restrict format _AND
+ CHAR *__restrict s,
+ size_t maxsize,
+ _CONST CHAR *__restrict format,
_CONST struct tm *__restrict tim_p)
{
#ifdef _WANT_C99_TIME_FORMATS
diff --git a/newlib/libc/unix/pread.c b/newlib/libc/unix/pread.c
index 7d351d9d1..236044465 100644
--- a/newlib/libc/unix/pread.c
+++ b/newlib/libc/unix/pread.c
@@ -39,10 +39,10 @@ Supporting OS subroutine required: <<read>>, <<lseek>>.
ssize_t
_DEFUN (_pread_r, (rptr, fd, buf, n, off),
- struct _reent *rptr _AND
- int fd _AND
- _PTR buf _AND
- size_t n _AND
+ struct _reent *rptr,
+ int fd,
+ _PTR buf,
+ size_t n,
off_t off)
{
off_t cur_pos;
@@ -66,9 +66,9 @@ _DEFUN (_pread_r, (rptr, fd, buf, n, off),
ssize_t
_DEFUN (pread, (fd, buf, n, off),
- int fd _AND
- _PTR buf _AND
- size_t n _AND
+ int fd,
+ _PTR buf,
+ size_t n,
off_t off)
{
return _pread_r (_REENT, fd, buf, n, off);
diff --git a/newlib/libc/unix/pwrite.c b/newlib/libc/unix/pwrite.c
index dad841243..2256a30ca 100644
--- a/newlib/libc/unix/pwrite.c
+++ b/newlib/libc/unix/pwrite.c
@@ -40,10 +40,10 @@ Supporting OS subroutine required: <<write>>, <<lseek>>.
ssize_t
_DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
- struct _reent *rptr _AND
- int fd _AND
- _CONST _PTR buf _AND
- size_t n _AND
+ struct _reent *rptr,
+ int fd,
+ _CONST _PTR buf,
+ size_t n,
off_t off)
{
off_t cur_pos;
@@ -67,9 +67,9 @@ _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
ssize_t
_DEFUN (pwrite, (fd, buf, n, off),
- int fd _AND
- _CONST _PTR buf _AND
- size_t n _AND
+ int fd,
+ _CONST _PTR buf,
+ size_t n,
off_t off)
{
return _pwrite_r (_REENT, fd, buf, n, off);
diff --git a/newlib/libc/unix/ttyname_r.c b/newlib/libc/unix/ttyname_r.c
index 32bbd67af..673e7f543 100644
--- a/newlib/libc/unix/ttyname_r.c
+++ b/newlib/libc/unix/ttyname_r.c
@@ -45,8 +45,8 @@
*/
int
_DEFUN( ttyname_r,(fd, name, namesize),
- int fd _AND
- char *name _AND
+ int fd,
+ char *name,
size_t namesize)
{
struct stat sb;
diff --git a/newlib/libc/xdr/xdr.c b/newlib/libc/xdr/xdr.c
index 646f9dbe0..8c637fcbf 100644
--- a/newlib/libc/xdr/xdr.c
+++ b/newlib/libc/xdr/xdr.c
@@ -63,7 +63,7 @@ static const char xdr_zero[BYTES_PER_XDR_UNIT] = { 0, 0, 0, 0 };
*/
void
_DEFUN (xdr_free, (proc, objp),
- xdrproc_t proc _AND
+ xdrproc_t proc,
void * objp)
{
XDR x;
@@ -87,7 +87,7 @@ _DEFUN_VOID (xdr_void)
*/
bool_t
_DEFUN (xdr_int, (xdrs, ip),
- XDR * xdrs _AND
+ XDR * xdrs,
int * ip)
{
#if INT_MAX < LONG_MAX
@@ -122,7 +122,7 @@ _DEFUN (xdr_int, (xdrs, ip),
*/
bool_t
_DEFUN (xdr_u_int, (xdrs, up),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int * up)
{
#if UINT_MAX < ULONG_MAX
@@ -157,7 +157,7 @@ _DEFUN (xdr_u_int, (xdrs, up),
*/
bool_t
_DEFUN (xdr_long, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
long * lp)
{
if ((xdrs->x_op == XDR_ENCODE)
@@ -178,7 +178,7 @@ _DEFUN (xdr_long, (xdrs, lp),
*/
bool_t
_DEFUN (xdr_u_long, (xdrs, ulp),
- XDR * xdrs _AND
+ XDR * xdrs,
u_long * ulp)
{
switch (xdrs->x_op)
@@ -209,7 +209,7 @@ _DEFUN (xdr_u_long, (xdrs, ulp),
*/
bool_t
_DEFUN (xdr_int32_t, (xdrs, int32_p),
- XDR * xdrs _AND
+ XDR * xdrs,
int32_t * int32_p)
{
switch (xdrs->x_op)
@@ -231,7 +231,7 @@ _DEFUN (xdr_int32_t, (xdrs, int32_p),
*/
bool_t
_DEFUN (xdr_u_int32_t, (xdrs, u_int32_p),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int32_t * u_int32_p)
{
switch (xdrs->x_op)
@@ -253,7 +253,7 @@ _DEFUN (xdr_u_int32_t, (xdrs, u_int32_p),
*/
bool_t
_DEFUN (xdr_uint32_t, (xdrs, uint32_p),
- XDR * xdrs _AND
+ XDR * xdrs,
uint32_t * uint32_p)
{
switch (xdrs->x_op)
@@ -275,7 +275,7 @@ _DEFUN (xdr_uint32_t, (xdrs, uint32_p),
*/
bool_t
_DEFUN (xdr_short, (xdrs, sp),
- XDR * xdrs _AND
+ XDR * xdrs,
short * sp)
{
long l;
@@ -303,7 +303,7 @@ _DEFUN (xdr_short, (xdrs, sp),
*/
bool_t
_DEFUN (xdr_u_short, (xdrs, usp),
- XDR * xdrs _AND
+ XDR * xdrs,
u_short * usp)
{
long l;
@@ -332,7 +332,7 @@ _DEFUN (xdr_u_short, (xdrs, usp),
*/
bool_t
_DEFUN (xdr_int16_t, (xdrs, int16_p),
- XDR * xdrs _AND
+ XDR * xdrs,
int16_t * int16_p)
{
int32_t t;
@@ -360,7 +360,7 @@ _DEFUN (xdr_int16_t, (xdrs, int16_p),
*/
bool_t
_DEFUN (xdr_u_int16_t, (xdrs, u_int16_p),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int16_t * u_int16_p)
{
uint32_t ut;
@@ -388,7 +388,7 @@ _DEFUN (xdr_u_int16_t, (xdrs, u_int16_p),
*/
bool_t
_DEFUN (xdr_uint16_t, (xdrs, uint16_p),
- XDR * xdrs _AND
+ XDR * xdrs,
uint16_t * uint16_p)
{
uint32_t ut;
@@ -416,7 +416,7 @@ _DEFUN (xdr_uint16_t, (xdrs, uint16_p),
*/
bool_t
_DEFUN (xdr_int8_t, (xdrs, int8_p),
- XDR * xdrs _AND
+ XDR * xdrs,
int8_t * int8_p)
{
int32_t t;
@@ -444,7 +444,7 @@ _DEFUN (xdr_int8_t, (xdrs, int8_p),
*/
bool_t
_DEFUN (xdr_u_int8_t, (xdrs, u_int8_p),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int8_t * u_int8_p)
{
uint32_t ut;
@@ -472,7 +472,7 @@ _DEFUN (xdr_u_int8_t, (xdrs, u_int8_p),
*/
bool_t
_DEFUN (xdr_uint8_t, (xdrs, uint8_p),
- XDR * xdrs _AND
+ XDR * xdrs,
uint8_t * uint8_p)
{
uint32_t ut;
@@ -502,7 +502,7 @@ _DEFUN (xdr_uint8_t, (xdrs, uint8_p),
*/
bool_t
_DEFUN (xdr_char, (xdrs, cp),
- XDR * xdrs _AND
+ XDR * xdrs,
char * cp)
{
int i;
@@ -519,7 +519,7 @@ _DEFUN (xdr_char, (xdrs, cp),
*/
bool_t
_DEFUN (xdr_u_char, (xdrs, ucp),
- XDR * xdrs _AND
+ XDR * xdrs,
u_char * ucp)
{
u_int u;
@@ -536,7 +536,7 @@ _DEFUN (xdr_u_char, (xdrs, ucp),
*/
bool_t
_DEFUN (xdr_bool, (xdrs, bp),
- XDR * xdrs _AND
+ XDR * xdrs,
bool_t * bp)
{
long lb;
@@ -564,7 +564,7 @@ _DEFUN (xdr_bool, (xdrs, bp),
*/
bool_t
_DEFUN (xdr_enum, (xdrs, ep),
- XDR * xdrs _AND
+ XDR * xdrs,
enum_t * ep)
{
enum sizecheck
@@ -608,8 +608,8 @@ _DEFUN (xdr_enum, (xdrs, ep),
*/
bool_t
_DEFUN (xdr_opaque, (xdrs, cp, cnt),
- XDR * xdrs _AND
- caddr_t cp _AND
+ XDR * xdrs,
+ caddr_t cp,
u_int cnt)
{
u_int rndup;
@@ -657,9 +657,9 @@ _DEFUN (xdr_opaque, (xdrs, cp, cnt),
*/
bool_t
_DEFUN (xdr_bytes, (xdrs, cpp, sizep, maxsize),
- XDR * xdrs _AND
- char ** cpp _AND
- u_int * sizep _AND
+ XDR * xdrs,
+ char ** cpp,
+ u_int * sizep,
u_int maxsize)
{
char *sp = *cpp; /* sp is the actual string pointer */
@@ -712,7 +712,7 @@ _DEFUN (xdr_bytes, (xdrs, cpp, sizep, maxsize),
*/
bool_t
_DEFUN (xdr_netobj, (xdrs, np),
- XDR * xdrs _AND
+ XDR * xdrs,
struct netobj * np)
{
return (xdr_bytes (xdrs, &np->n_bytes, &np->n_len, MAX_NETOBJ_SZ));
@@ -735,10 +735,10 @@ _DEFUN (xdr_netobj, (xdrs, np),
*/
bool_t
_DEFUN (xdr_union, (xdrs, dscmp, unp, choices, dfault),
- XDR * xdrs _AND
- enum_t * dscmp _AND
- char * unp _AND
- const struct xdr_discrim * choices _AND
+ XDR * xdrs,
+ enum_t * dscmp,
+ char * unp,
+ const struct xdr_discrim * choices,
xdrproc_t dfault)
{
enum_t dscm;
@@ -784,8 +784,8 @@ _DEFUN (xdr_union, (xdrs, dscmp, unp, choices, dfault),
*/
bool_t
_DEFUN (xdr_string, (xdrs, cpp, maxsize),
- XDR * xdrs _AND
- char ** cpp _AND
+ XDR * xdrs,
+ char ** cpp,
u_int maxsize)
{
char *sp = *cpp; /* sp is the actual string pointer */
@@ -862,7 +862,7 @@ _DEFUN (xdr_string, (xdrs, cpp, maxsize),
*/
bool_t
_DEFUN (xdr_wrapstring, (xdrs, cpp),
- XDR * xdrs _AND
+ XDR * xdrs,
char ** cpp)
{
return xdr_string (xdrs, cpp, LASTUNSIGNED);
@@ -883,7 +883,7 @@ _DEFUN (xdr_wrapstring, (xdrs, cpp),
*/
bool_t
_DEFUN (xdr_int64_t, (xdrs, llp),
- XDR * xdrs _AND
+ XDR * xdrs,
int64_t * llp)
{
int32_t t1, t2;
@@ -914,7 +914,7 @@ _DEFUN (xdr_int64_t, (xdrs, llp),
*/
bool_t
_DEFUN (xdr_u_int64_t, (xdrs, ullp),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int64_t * ullp)
{
uint32_t t1, t2;
@@ -946,7 +946,7 @@ _DEFUN (xdr_u_int64_t, (xdrs, ullp),
*/
bool_t
_DEFUN (xdr_uint64_t, (xdrs, ullp),
- XDR * xdrs _AND
+ XDR * xdrs,
uint64_t * ullp)
{
uint32_t t1, t2;
@@ -979,7 +979,7 @@ _DEFUN (xdr_uint64_t, (xdrs, ullp),
*/
bool_t
_DEFUN (xdr_hyper, (xdrs, llp),
- XDR * xdrs _AND
+ XDR * xdrs,
quad_t * llp)
{
/*
@@ -995,7 +995,7 @@ _DEFUN (xdr_hyper, (xdrs, llp),
*/
bool_t
_DEFUN (xdr_u_hyper, (xdrs, ullp),
- XDR * xdrs _AND
+ XDR * xdrs,
u_quad_t * ullp)
{
/*
@@ -1011,7 +1011,7 @@ _DEFUN (xdr_u_hyper, (xdrs, ullp),
*/
bool_t
_DEFUN (xdr_longlong_t, (xdrs, llp),
- XDR * xdrs _AND
+ XDR * xdrs,
quad_t * llp)
{
/*
@@ -1027,7 +1027,7 @@ _DEFUN (xdr_longlong_t, (xdrs, llp),
*/
bool_t
_DEFUN (xdr_u_longlong_t, (xdrs, ullp),
- XDR * xdrs _AND
+ XDR * xdrs,
u_quad_t *ullp)
{
/*
diff --git a/newlib/libc/xdr/xdr_array.c b/newlib/libc/xdr/xdr_array.c
index 98549acbb..9c9748725 100644
--- a/newlib/libc/xdr/xdr_array.c
+++ b/newlib/libc/xdr/xdr_array.c
@@ -55,11 +55,11 @@
*/
bool_t
_DEFUN (xdr_array, (xdrs, addrp, sizep, maxsize, elsize, elproc),
- XDR * xdrs _AND
- caddr_t * addrp _AND
- u_int * sizep _AND
- u_int maxsize _AND
- u_int elsize _AND
+ XDR * xdrs,
+ caddr_t * addrp,
+ u_int * sizep,
+ u_int maxsize,
+ u_int elsize,
xdrproc_t elproc)
{
u_int i;
@@ -139,10 +139,10 @@ _DEFUN (xdr_array, (xdrs, addrp, sizep, maxsize, elsize, elproc),
*/
bool_t
_DEFUN (xdr_vector, (xdrs, basep, nelem, elemsize, xdr_elem),
- XDR * xdrs _AND
- char *basep _AND
- u_int nelem _AND
- u_int elemsize _AND
+ XDR * xdrs,
+ char *basep,
+ u_int nelem,
+ u_int elemsize,
xdrproc_t xdr_elem)
{
u_int i;
diff --git a/newlib/libc/xdr/xdr_float.c b/newlib/libc/xdr/xdr_float.c
index 00726bb43..691e92965 100644
--- a/newlib/libc/xdr/xdr_float.c
+++ b/newlib/libc/xdr/xdr_float.c
@@ -60,7 +60,7 @@
bool_t
_DEFUN (xdr_float, (xdrs, fp),
- XDR * xdrs _AND
+ XDR * xdrs,
float *fp)
{
switch (xdrs->x_op)
@@ -81,7 +81,7 @@ _DEFUN (xdr_float, (xdrs, fp),
#if !defined(_DOUBLE_IS_32BITS)
bool_t
_DEFUN (xdr_double, (xdrs, dp),
- XDR * xdrs _AND
+ XDR * xdrs,
double *dp)
{
int32_t *i32p;
diff --git a/newlib/libc/xdr/xdr_float_vax.c b/newlib/libc/xdr/xdr_float_vax.c
index 323e43ed8..ed943480f 100644
--- a/newlib/libc/xdr/xdr_float_vax.c
+++ b/newlib/libc/xdr/xdr_float_vax.c
@@ -82,7 +82,7 @@ static struct sgl_limits
bool_t
_DEFUN (xdr_float, (xdrs, fp),
- XDR * xdrs _AND
+ XDR * xdrs,
float *fp)
{
struct ieee_single is;
@@ -185,7 +185,7 @@ static struct dbl_limits
bool_t
_DEFUN (xdr_double, (xdrs, dp),
- XDR * xdrs _AND
+ XDR * xdrs,
double *dp)
{
int32_t *lp;
diff --git a/newlib/libc/xdr/xdr_mem.c b/newlib/libc/xdr/xdr_mem.c
index 497342d5e..b49dc3b8f 100644
--- a/newlib/libc/xdr/xdr_mem.c
+++ b/newlib/libc/xdr/xdr_mem.c
@@ -102,9 +102,9 @@ static _CONST struct xdr_ops xdrmem_ops_unaligned = {
*/
void
_DEFUN (xdrmem_create, (xdrs, addr, size, op),
- XDR * xdrs _AND
- caddr_t addr _AND
- u_int size _AND
+ XDR * xdrs,
+ caddr_t addr,
+ u_int size,
enum xdr_op op)
{
xdrs->x_op = op;
@@ -123,7 +123,7 @@ _DEFUN (xdrmem_destroy, (xdrs),
static bool_t
_DEFUN (xdrmem_getlong_aligned, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
long *lp)
{
if (xdrs->x_handy < sizeof (int32_t))
@@ -136,7 +136,7 @@ _DEFUN (xdrmem_getlong_aligned, (xdrs, lp),
static bool_t
_DEFUN (xdrmem_putlong_aligned, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
_CONST long *lp)
{
if (xdrs->x_handy < sizeof (int32_t))
@@ -149,7 +149,7 @@ _DEFUN (xdrmem_putlong_aligned, (xdrs, lp),
static bool_t
_DEFUN (xdrmem_getlong_unaligned, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
long *lp)
{
u_int32_t l;
@@ -165,7 +165,7 @@ _DEFUN (xdrmem_getlong_unaligned, (xdrs, lp),
static bool_t
_DEFUN (xdrmem_putlong_unaligned, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
_CONST long *lp)
{
u_int32_t l;
@@ -181,8 +181,8 @@ _DEFUN (xdrmem_putlong_unaligned, (xdrs, lp),
static bool_t
_DEFUN (xdrmem_getbytes, (xdrs, addr, len),
- XDR * xdrs _AND
- char *addr _AND
+ XDR * xdrs,
+ char *addr,
u_int len)
{
if (xdrs->x_handy < len)
@@ -195,8 +195,8 @@ _DEFUN (xdrmem_getbytes, (xdrs, addr, len),
static bool_t
_DEFUN (xdrmem_putbytes, (xdrs, addr, len),
- XDR * xdrs _AND
- _CONST char *addr _AND
+ XDR * xdrs,
+ _CONST char *addr,
u_int len)
{
if (xdrs->x_handy < len)
@@ -217,7 +217,7 @@ _DEFUN (xdrmem_getpos, (xdrs),
static bool_t
_DEFUN (xdrmem_setpos, (xdrs, pos),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int pos)
{
caddr_t newaddr = xdrs->x_base + pos;
@@ -237,7 +237,7 @@ _DEFUN (xdrmem_setpos, (xdrs, pos),
static int32_t *
_DEFUN (xdrmem_inline_aligned, (xdrs, len),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int len)
{
int32_t *buf = 0;
@@ -253,7 +253,7 @@ _DEFUN (xdrmem_inline_aligned, (xdrs, len),
static int32_t *
_DEFUN (xdrmem_inline_unaligned, (xdrs, len),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int len)
{
return (0);
@@ -261,7 +261,7 @@ _DEFUN (xdrmem_inline_unaligned, (xdrs, len),
static bool_t
_DEFUN (xdrmem_getint32_aligned, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
int32_t *ip)
{
if (xdrs->x_handy < sizeof(int32_t))
@@ -274,7 +274,7 @@ _DEFUN (xdrmem_getint32_aligned, (xdrs, ip),
static bool_t
_DEFUN (xdrmem_putint32_aligned, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
_CONST int32_t *ip)
{
if (xdrs->x_handy < sizeof(int32_t))
@@ -287,7 +287,7 @@ _DEFUN (xdrmem_putint32_aligned, (xdrs, ip),
static bool_t
_DEFUN (xdrmem_getint32_unaligned, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
int32_t *ip)
{
u_int32_t l;
@@ -303,7 +303,7 @@ _DEFUN (xdrmem_getint32_unaligned, (xdrs, ip),
static bool_t
_DEFUN (xdrmem_putint32_unaligned, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
_CONST int32_t *ip)
{
u_int32_t l;
diff --git a/newlib/libc/xdr/xdr_private.c b/newlib/libc/xdr/xdr_private.c
index 16b37a249..ea557fa03 100644
--- a/newlib/libc/xdr/xdr_private.c
+++ b/newlib/libc/xdr/xdr_private.c
@@ -36,7 +36,7 @@ _DEFUN (xdr_set_vprintf, (fnptr),
void
_DEFUN (xdr_vwarnx, (format, ap),
- _CONST char *format _AND
+ _CONST char *format,
va_list ap)
{
if (xdr_vprintf)
diff --git a/newlib/libc/xdr/xdr_rec.c b/newlib/libc/xdr/xdr_rec.c
index eef4c4871..0caadd6d5 100644
--- a/newlib/libc/xdr/xdr_rec.c
+++ b/newlib/libc/xdr/xdr_rec.c
@@ -170,11 +170,11 @@ bool_t _EXFUN (__xdrrec_setnonblock, (XDR *, int));
*/
void
_DEFUN (xdrrec_create, (xdrs, sendsize, recvsize, tcp_handle, readit, writeit),
- XDR * xdrs _AND
- u_int sendsize _AND
- u_int recvsize _AND
- void *tcp_handle _AND
- int _EXPARM (readit, (void *, void *, int)) _AND
+ XDR * xdrs,
+ u_int sendsize,
+ u_int recvsize,
+ void *tcp_handle,
+ int _EXPARM (readit, (void *, void *, int)),
int _EXPARM (writeit, (void *, void *, int)))
{
RECSTREAM *rstrm;
@@ -262,7 +262,7 @@ _DEFUN (xdrrec_create, (xdrs, sendsize, recvsize, tcp_handle, readit, writeit),
static bool_t
_DEFUN (xdrrec_getlong, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
long *lp)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -289,7 +289,7 @@ _DEFUN (xdrrec_getlong, (xdrs, lp),
static bool_t
_DEFUN (xdrrec_putlong, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
_CONST long *lp)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -314,8 +314,8 @@ _DEFUN (xdrrec_putlong, (xdrs, lp),
static bool_t /* must manage buffers, fragments, and records */
_DEFUN (xdrrec_getbytes, (xdrs, addr, len),
- XDR * xdrs _AND
- char *addr _AND
+ XDR * xdrs,
+ char *addr,
u_int len)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -344,8 +344,8 @@ _DEFUN (xdrrec_getbytes, (xdrs, addr, len),
static bool_t
_DEFUN (xdrrec_putbytes, (xdrs, addr, len),
- XDR * xdrs _AND
- _CONST char *addr _AND
+ XDR * xdrs,
+ _CONST char *addr,
u_int len)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -399,7 +399,7 @@ _DEFUN (xdrrec_getpos, (xdrs),
static bool_t
_DEFUN (xdrrec_setpos, (xdrs, pos),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int pos)
{
RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
@@ -440,7 +440,7 @@ _DEFUN (xdrrec_setpos, (xdrs, pos),
static int32_t *
_DEFUN (xdrrec_inline, (xdrs, len),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int len)
{
RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
@@ -494,7 +494,7 @@ _DEFUN (xdrrec_destroy, (xdrs),
static bool_t
_DEFUN (xdrrec_getint32, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
int32_t *ip)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -521,7 +521,7 @@ _DEFUN (xdrrec_getint32, (xdrs, ip),
static bool_t
_DEFUN (xdrrec_putint32, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
_CONST int32_t *ip)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -618,7 +618,7 @@ _DEFUN (xdrrec_eof, (xdrs),
*/
bool_t
_DEFUN (xdrrec_endofrecord, (xdrs, sendnow),
- XDR * xdrs _AND
+ XDR * xdrs,
bool_t sendnow)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -645,8 +645,8 @@ _DEFUN (xdrrec_endofrecord, (xdrs, sendnow),
*/
bool_t
_DEFUN (__xdrrec_getrec, (xdrs, statp, expectdata),
- XDR * xdrs _AND
- enum xprt_stat * statp _AND
+ XDR * xdrs,
+ enum xprt_stat * statp,
bool_t expectdata)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -738,7 +738,7 @@ _DEFUN (__xdrrec_getrec, (xdrs, statp, expectdata),
bool_t
_DEFUN (__xdrrec_setnonblock, (xdrs, maxrec),
- XDR * xdrs _AND
+ XDR * xdrs,
int maxrec)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -755,7 +755,7 @@ _DEFUN (__xdrrec_setnonblock, (xdrs, maxrec),
*/
static bool_t
_DEFUN (flush_out, (rstrm, eor),
- RECSTREAM * rstrm _AND
+ RECSTREAM * rstrm,
bool_t eor)
{
u_int32_t eormask = (eor == TRUE) ? LAST_FRAG : 0;
@@ -799,8 +799,8 @@ _DEFUN (fill_input_buf, (rstrm),
static bool_t /* knows nothing about records! Only about input buffers */
_DEFUN (get_input_bytes, (rstrm, addr, len),
- RECSTREAM * rstrm _AND
- char *addr _AND
+ RECSTREAM * rstrm,
+ char *addr,
size_t len)
{
size_t current;
@@ -861,7 +861,7 @@ _DEFUN (set_input_fragment, (rstrm),
static bool_t /* consumes input bytes; knows nothing about records! */
_DEFUN (skip_input_bytes, (rstrm, cnt),
- RECSTREAM * rstrm _AND
+ RECSTREAM * rstrm,
long cnt)
{
size_t current;
@@ -898,7 +898,7 @@ _DEFUN (fix_buf_size, (s),
*/
static bool_t
_DEFUN (realloc_stream, (rstrm, size),
- RECSTREAM * rstrm _AND
+ RECSTREAM * rstrm,
int size)
{
ptrdiff_t diff;
diff --git a/newlib/libc/xdr/xdr_reference.c b/newlib/libc/xdr/xdr_reference.c
index 010a7e719..7a5f1d851 100644
--- a/newlib/libc/xdr/xdr_reference.c
+++ b/newlib/libc/xdr/xdr_reference.c
@@ -57,9 +57,9 @@
*/
bool_t
_DEFUN (xdr_reference, (xdrs, pp, size, proc),
- XDR * xdrs _AND
- caddr_t * pp _AND
- u_int size _AND
+ XDR * xdrs,
+ caddr_t * pp,
+ u_int size,
xdrproc_t proc)
{
caddr_t loc = *pp;
@@ -118,9 +118,9 @@ _DEFUN (xdr_reference, (xdrs, pp, size, proc),
*/
bool_t
_DEFUN (xdr_pointer, (xdrs, objpp, obj_size, xdr_obj),
- XDR * xdrs _AND
- char **objpp _AND
- u_int obj_size _AND
+ XDR * xdrs,
+ char **objpp,
+ u_int obj_size,
xdrproc_t xdr_obj)
{
bool_t more_data;
diff --git a/newlib/libc/xdr/xdr_sizeof.c b/newlib/libc/xdr/xdr_sizeof.c
index 156a2e17b..34d1e6036 100644
--- a/newlib/libc/xdr/xdr_sizeof.c
+++ b/newlib/libc/xdr/xdr_sizeof.c
@@ -44,7 +44,7 @@
/* ARGSUSED */
static bool_t
_DEFUN (x_putlong, (xdrs, longp),
- XDR * xdrs _AND
+ XDR * xdrs,
_CONST long *longp)
{
xdrs->x_handy += BYTES_PER_XDR_UNIT;
@@ -54,8 +54,8 @@ _DEFUN (x_putlong, (xdrs, longp),
/* ARGSUSED */
static bool_t
_DEFUN (x_putbytes, (xdrs, bp, len),
- XDR * xdrs _AND
- const char *bp _AND
+ XDR * xdrs,
+ const char *bp,
u_int len)
{
xdrs->x_handy += len;
@@ -72,7 +72,7 @@ _DEFUN (x_getpostn, (xdrs),
/* ARGSUSED */
static bool_t
_DEFUN (x_setpostn, (xdrs, pos),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int pos)
{
/* This is not allowed */
@@ -81,7 +81,7 @@ _DEFUN (x_setpostn, (xdrs, pos),
static int32_t *
_DEFUN (x_inline, (xdrs, len),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int len)
{
if (len == 0)
@@ -133,7 +133,7 @@ _DEFUN (x_destroy, (xdrs),
static bool_t
_DEFUN (x_putint32, (xdrs, int32p),
- XDR *xdrs _AND
+ XDR *xdrs,
_CONST int32_t *int32p)
{
xdrs->x_handy += BYTES_PER_XDR_UNIT;
@@ -143,7 +143,7 @@ _DEFUN (x_putint32, (xdrs, int32p),
unsigned long
_DEFUN (xdr_sizeof, (func, data),
- xdrproc_t func _AND
+ xdrproc_t func,
_PTR data)
{
XDR x;
diff --git a/newlib/libc/xdr/xdr_stdio.c b/newlib/libc/xdr/xdr_stdio.c
index c933c68cd..5bb4b13f1 100644
--- a/newlib/libc/xdr/xdr_stdio.c
+++ b/newlib/libc/xdr/xdr_stdio.c
@@ -84,8 +84,8 @@ static _CONST struct xdr_ops xdrstdio_ops = {
*/
void
_DEFUN (xdrstdio_create, (xdrs, file, op),
- XDR * xdrs _AND
- FILE * file _AND
+ XDR * xdrs,
+ FILE * file,
enum xdr_op op)
{
xdrs->x_op = op;
@@ -109,7 +109,7 @@ _DEFUN (xdrstdio_destroy, (xdrs),
static bool_t
_DEFUN (xdrstdio_getlong, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
long *lp)
{
u_int32_t temp;
@@ -122,7 +122,7 @@ _DEFUN (xdrstdio_getlong, (xdrs, lp),
static bool_t
_DEFUN (xdrstdio_putlong, (xdrs, lp),
- XDR * xdrs _AND
+ XDR * xdrs,
_CONST long *lp)
{
u_int32_t temp = htonl ((u_int32_t) * lp);
@@ -134,8 +134,8 @@ _DEFUN (xdrstdio_putlong, (xdrs, lp),
static bool_t
_DEFUN (xdrstdio_getbytes, (xdrs, addr, len),
- XDR * xdrs _AND
- char *addr _AND
+ XDR * xdrs,
+ char *addr,
u_int len)
{
if ((len != 0) && (fread (addr, (size_t) len, 1,
@@ -146,8 +146,8 @@ _DEFUN (xdrstdio_getbytes, (xdrs, addr, len),
static bool_t
_DEFUN (xdrstdio_putbytes, (xdrs, addr, len),
- XDR * xdrs _AND
- _CONST char *addr _AND
+ XDR * xdrs,
+ _CONST char *addr,
u_int len)
{
if ((len != 0) && (fwrite (addr, (size_t) len, 1,
@@ -165,7 +165,7 @@ _DEFUN (xdrstdio_getpos, (xdrs),
static bool_t
_DEFUN (xdrstdio_setpos, (xdrs, pos),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int pos)
{
return ((fseek ((FILE *) xdrs->x_private, (long) pos, 0) < 0) ?
@@ -175,7 +175,7 @@ _DEFUN (xdrstdio_setpos, (xdrs, pos),
/* ARGSUSED */
static int32_t *
_DEFUN (xdrstdio_inline, (xdrs, len),
- XDR * xdrs _AND
+ XDR * xdrs,
u_int len)
{
/*
@@ -192,7 +192,7 @@ _DEFUN (xdrstdio_inline, (xdrs, len),
static bool_t
_DEFUN (xdrstdio_getint32, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
int32_t *ip)
{
int32_t temp;
@@ -205,7 +205,7 @@ _DEFUN (xdrstdio_getint32, (xdrs, ip),
static bool_t
_DEFUN (xdrstdio_putint32, (xdrs, ip),
- XDR *xdrs _AND
+ XDR *xdrs,
_CONST int32_t *ip)
{
int32_t temp = htonl (*ip);
diff --git a/newlib/libm/mathfp/s_asine.c b/newlib/libm/mathfp/s_asine.c
index 3212862b8..28cfaf7a6 100644
--- a/newlib/libm/mathfp/s_asine.c
+++ b/newlib/libm/mathfp/s_asine.c
@@ -90,7 +90,7 @@ static const double b[] = { 1.57079632679489661923, 0.78539816339744830962 };
double
_DEFUN (asine, (double, int),
- double x _AND
+ double x,
int acosine)
{
int flag, i;
diff --git a/newlib/libm/mathfp/s_atan2.c b/newlib/libm/mathfp/s_atan2.c
index 00121db4b..9f71ed9c8 100644
--- a/newlib/libm/mathfp/s_atan2.c
+++ b/newlib/libm/mathfp/s_atan2.c
@@ -70,7 +70,7 @@ PORTABILITY
double
_DEFUN (atan2, (double, double),
- double v _AND
+ double v,
double u)
{
return (atangent (0.0, v, u, 1));
diff --git a/newlib/libm/mathfp/s_atangent.c b/newlib/libm/mathfp/s_atangent.c
index cd9db2dcd..1df39ac50 100644
--- a/newlib/libm/mathfp/s_atangent.c
+++ b/newlib/libm/mathfp/s_atangent.c
@@ -86,9 +86,9 @@ static const double p[] = { -0.13688768894191926929e+2,
double
_DEFUN (atangent, (double, double, double, int),
- double x _AND
- double v _AND
- double u _AND
+ double x,
+ double v,
+ double u,
int arctan2)
{
double f, g, R, P, Q, A, res;
diff --git a/newlib/libm/mathfp/s_ldexp.c b/newlib/libm/mathfp/s_ldexp.c
index 6971af697..472093071 100644
--- a/newlib/libm/mathfp/s_ldexp.c
+++ b/newlib/libm/mathfp/s_ldexp.c
@@ -64,7 +64,7 @@ PORTABILITY
double
_DEFUN (ldexp, (double, int),
- double d _AND
+ double d,
int e)
{
int exp;
diff --git a/newlib/libm/mathfp/s_logarithm.c b/newlib/libm/mathfp/s_logarithm.c
index 977a6406d..d14bf2eb4 100644
--- a/newlib/libm/mathfp/s_logarithm.c
+++ b/newlib/libm/mathfp/s_logarithm.c
@@ -80,7 +80,7 @@ static const double C3 = 0.43429448190325182765;
double
_DEFUN (logarithm, (double, int),
- double x _AND
+ double x,
int ten)
{
int N;
diff --git a/newlib/libm/mathfp/s_sincos.c b/newlib/libm/mathfp/s_sincos.c
index e313e6f1d..8fc65ac20 100644
--- a/newlib/libm/mathfp/s_sincos.c
+++ b/newlib/libm/mathfp/s_sincos.c
@@ -21,8 +21,8 @@
void
_DEFUN (sincos, (x, sinx, cosx),
- double x _AND
- double *sinx _AND
+ double x,
+ double *sinx,
double *cosx)
{
*sinx = sin (x);
diff --git a/newlib/libm/mathfp/s_sine.c b/newlib/libm/mathfp/s_sine.c
index f8bf52952..d5e4469a0 100644
--- a/newlib/libm/mathfp/s_sine.c
+++ b/newlib/libm/mathfp/s_sine.c
@@ -73,7 +73,7 @@ static const double r[] = { -0.16666666666666665052,
double
_DEFUN (sine, (double, int),
- double x _AND
+ double x,
int cosine)
{
int sgn, N;
diff --git a/newlib/libm/mathfp/s_sineh.c b/newlib/libm/mathfp/s_sineh.c
index 581484ac1..457003ff8 100644
--- a/newlib/libm/mathfp/s_sineh.c
+++ b/newlib/libm/mathfp/s_sineh.c
@@ -95,7 +95,7 @@ static const double V_OVER2_MINUS1 = 0.13830277879601902638e-4;
double
_DEFUN (sineh, (double, int),
- double x _AND
+ double x,
int cosineh)
{
double y, f, P, Q, R, res, z, w;
diff --git a/newlib/libm/mathfp/sf_asine.c b/newlib/libm/mathfp/sf_asine.c
index 12ba28927..a74778034 100644
--- a/newlib/libm/mathfp/sf_asine.c
+++ b/newlib/libm/mathfp/sf_asine.c
@@ -31,7 +31,7 @@ static const float b[] = { 1.570796326, 0.785398163 };
float
_DEFUN (asinef, (float, int),
- float x _AND
+ float x,
int acosine)
{
int flag, i;
diff --git a/newlib/libm/mathfp/sf_atan2.c b/newlib/libm/mathfp/sf_atan2.c
index 69c612354..e866ecbb8 100644
--- a/newlib/libm/mathfp/sf_atan2.c
+++ b/newlib/libm/mathfp/sf_atan2.c
@@ -19,7 +19,7 @@
float
_DEFUN (atan2f, (float, float),
- float v _AND
+ float v,
float u)
{
return (atangentf (0.0, v, u, 1));
diff --git a/newlib/libm/mathfp/sf_atangent.c b/newlib/libm/mathfp/sf_atangent.c
index 7a8f0cebe..1865cde74 100644
--- a/newlib/libm/mathfp/sf_atangent.c
+++ b/newlib/libm/mathfp/sf_atangent.c
@@ -32,9 +32,9 @@ static const float p[] = { -0.4708325141, -0.5090958253e-1 };
float
_DEFUN (atangentf, (float, float, float, int),
- float x _AND
- float v _AND
- float u _AND
+ float x,
+ float v,
+ float u,
int arctan2)
{
float f, g, R, P, Q, A, res;
diff --git a/newlib/libm/mathfp/sf_fmod.c b/newlib/libm/mathfp/sf_fmod.c
index 0ac86bbef..611725409 100644
--- a/newlib/libm/mathfp/sf_fmod.c
+++ b/newlib/libm/mathfp/sf_fmod.c
@@ -26,7 +26,7 @@ static const float one = 1.0, Zero[] = {0.0, -0.0,};
float
_DEFUN (fmodf, (float, float),
- float x _AND
+ float x,
float y)
{
__int32_t n,hx,hy,hz,ix,iy,sx,i;
diff --git a/newlib/libm/mathfp/sf_ldexp.c b/newlib/libm/mathfp/sf_ldexp.c
index 6b6c2c00b..3a0d7a41a 100644
--- a/newlib/libm/mathfp/sf_ldexp.c
+++ b/newlib/libm/mathfp/sf_ldexp.c
@@ -24,7 +24,7 @@
float
_DEFUN (ldexpf, (float, int),
- float d _AND
+ float d,
int e)
{
int exp;
diff --git a/newlib/libm/mathfp/sf_logarithm.c b/newlib/libm/mathfp/sf_logarithm.c
index c22ba862a..855ee0744 100644
--- a/newlib/libm/mathfp/sf_logarithm.c
+++ b/newlib/libm/mathfp/sf_logarithm.c
@@ -32,7 +32,7 @@ static const float C3 = 0.4342944819;
float
_DEFUN (logarithmf, (float, int),
- float x _AND
+ float x,
int ten)
{
int N;
diff --git a/newlib/libm/mathfp/sf_sincos.c b/newlib/libm/mathfp/sf_sincos.c
index e192b4b44..85b393dce 100644
--- a/newlib/libm/mathfp/sf_sincos.c
+++ b/newlib/libm/mathfp/sf_sincos.c
@@ -19,8 +19,8 @@
void
_DEFUN (sincosf, (x, sinx, cosx),
- float x _AND
- float *sinx _AND
+ float x,
+ float *sinx,
float *cosx)
{
*sinx = sin (x);
diff --git a/newlib/libm/mathfp/sf_sine.c b/newlib/libm/mathfp/sf_sine.c
index 6932de26c..24725bde1 100644
--- a/newlib/libm/mathfp/sf_sine.c
+++ b/newlib/libm/mathfp/sf_sine.c
@@ -33,7 +33,7 @@ static const float r[] = { -0.1666665668,
float
_DEFUN (sinef, (float, int),
- float x _AND
+ float x,
int cosine)
{
int sgn, N;
diff --git a/newlib/libm/mathfp/sf_sineh.c b/newlib/libm/mathfp/sf_sineh.c
index 4eee2c927..966e91362 100644
--- a/newlib/libm/mathfp/sf_sineh.c
+++ b/newlib/libm/mathfp/sf_sineh.c
@@ -33,7 +33,7 @@ static const float V_OVER2_MINUS1 = 0.1383027787e-4;
float
_DEFUN (sinehf, (float, int),
- float x _AND
+ float x,
int cosineh)
{
float y, f, P, Q, R, res, z, w;
diff --git a/newlib/libm/test/convert.c b/newlib/libm/test/convert.c
index a74828027..8420cdec7 100644
--- a/newlib/libm/test/convert.c
+++ b/newlib/libm/test/convert.c
@@ -50,7 +50,7 @@ _DEFUN_VOID(test_atoff)
static
void
_DEFUN(iterate,(func, name),
- void _EXFUN((*func),(void)) _AND
+ void _EXFUN((*func),(void)),
char *name)
{
@@ -71,7 +71,7 @@ int_type *p = ints;
static void
_DEFUN(int_iterate,(func, name),
- void (*func)() _AND
+ void (*func)(),
char *name)
{
newfunc(name);
@@ -87,8 +87,8 @@ _DEFUN(int_iterate,(func, name),
void
_DEFUN(test_strtol_base,(base, pi, string),
- int base _AND
- int_scan_type *pi _AND
+ int base,
+ int_scan_type *pi,
char *string)
{
long r;
@@ -207,7 +207,7 @@ _DEFUN_VOID(test_fcvt)
static void
_DEFUN(diterate,(func, name),
- void (*func)() _AND
+ void (*func)(),
char *name)
{
newfunc(name);
diff --git a/newlib/libm/test/dcvt.c b/newlib/libm/test/dcvt.c
index 2aaa1af28..922652e9f 100644
--- a/newlib/libm/test/dcvt.c
+++ b/newlib/libm/test/dcvt.c
@@ -40,8 +40,8 @@ double *value)
static char *
_DEFUN(print_nan,(buffer, value, precision),
- char *buffer _AND
- double value _AND
+ char *buffer,
+ double value,
int precision)
{
size_t i;
@@ -134,7 +134,7 @@ _DEFUN(renormalize,(in),
static void
_DEFUN(normalize,(value, in),
- double value _AND
+ double value,
cvt_info_type *in)
{
int j;
@@ -196,9 +196,9 @@ _DEFUN(normalize,(value, in),
}
int
_DEFUN(round,(in, start, now, ch),
- cvt_info_type *in _AND
- char *start _AND
- char *now _AND
+ cvt_info_type *in,
+ char *start,
+ char *now,
char ch)
{
double rounder = 5.0;
@@ -435,11 +435,11 @@ _DEFUN(_cvtf,(in),
char *
_DEFUN(_dcvt,(buffer, invalue, precision, width, type, dot),
- char *buffer _AND
- double invalue _AND
- int precision _AND
- int width _AND
- char type _AND
+ char *buffer,
+ double invalue,
+ int precision,
+ int width,
+ char type,
int dot)
{
cvt_info_type in;
@@ -534,10 +534,10 @@ _DEFUN(_dcvt,(buffer, invalue, precision, 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)
{
cvt_info_type in;
@@ -564,10 +564,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)
{
cvt_info_type in;
@@ -597,8 +597,8 @@ _DEFUN(ecvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
char *
_DEFUN(gcvt,(d,ndigit,buf),
- double d _AND
- int ndigit _AND
+ double d,
+ int ndigit,
char *buf)
{
return _dcvt(buf, d, ndigit, 0, 'g', 1);
diff --git a/newlib/libm/test/math.c b/newlib/libm/test/math.c
index df63c2df2..50b22223a 100644
--- a/newlib/libm/test/math.c
+++ b/newlib/libm/test/math.c
@@ -51,7 +51,7 @@ _DEFUN(matherr,(e),
void _DEFUN(translate_to,(file,r),
- FILE *file _AND
+ FILE *file,
double r)
{
__ieee_double_shape_type bits;
@@ -61,10 +61,10 @@ void _DEFUN(translate_to,(file,r),
int
_DEFUN(ffcheck,( is, p, name, serrno, merror),
- double is _AND
- one_line_type *p _AND
- char *name _AND
- int serrno _AND
+ double is,
+ one_line_type *p,
+ char *name,
+ int serrno,
int merror)
{
/* Make sure the answer isn't to far wrong from the correct value */
@@ -109,7 +109,7 @@ _DEFUN(ffcheck,( is, p, name, serrno, merror),
double
_DEFUN(thedouble, (msw, lsw),
- long msw _AND
+ long msw,
long lsw)
{
__ieee_double_shape_type x;
@@ -124,13 +124,13 @@ int reduce;
_DEFUN(frontline,(f, mag, p, result, merror, errno, args, name),
- FILE *f _AND
- int mag _AND
- one_line_type *p _AND
- double result _AND
- int merror _AND
- int errno _AND
- char *args _AND
+ FILE *f,
+ int mag,
+ one_line_type *p,
+ double result,
+ int merror,
+ int errno,
+ char *args,
char *name)
{
if (reduce && p->error_bit < mag)
@@ -177,11 +177,11 @@ _DEFUN(frontline,(f, mag, p, result, merror, errno, args, name),
}
_DEFUN(finish,(f, vector, result , p, args, name),
- FILE *f _AND
- int vector _AND
- double result _AND
- one_line_type *p _AND
- char *args _AND
+ FILE *f,
+ int vector,
+ double result,
+ one_line_type *p,
+ char *args,
char *name)
{
int mag;
@@ -195,10 +195,10 @@ _DEFUN(finish,(f, vector, result , p, args, name),
int redo;
_DEFUN(run_vector_1,(vector, p, func, name, args),
- int vector _AND
- one_line_type *p _AND
- char *func _AND
- char *name _AND
+ int vector,
+ one_line_type *p,
+ char *func,
+ char *name,
char *args)
{
FILE *f;
diff --git a/newlib/libm/test/string.c b/newlib/libm/test/string.c
index c47047212..e97dfcc62 100644
--- a/newlib/libm/test/string.c
+++ b/newlib/libm/test/string.c
@@ -11,7 +11,7 @@ int errors = 0;
void
_DEFUN(checkit,(ok,l),
- int ok _AND
+ int ok,
int l )
{
@@ -32,8 +32,8 @@ _DEFUN(checkit,(ok,l),
void
_DEFUN(funcqual,(a,b,l),
- char *a _AND
- char *b _AND
+ char *a,
+ char *b,
int l)
{
newfunc(it);
@@ -145,7 +145,7 @@ void test_string()
equal(one, "abcd"); /* Zero count. */
(void) strncat(one, "gh", 2);
- equal(one, "abcdgh"); /* Count _AND length equal. */
+ equal(one, "abcdgh"); /* Count, length equal. */
it = "strncmp";
/* strncmp - first test as strcmp with big counts";*/
check(strncmp("", "", 99) == 0); /* Trivial case. */
@@ -494,7 +494,7 @@ void test_string()
(void) memset(one+5, 0, 1);
equal(one, "axxxe"); /* Zero fill. */
- equal(one+6, "gh"); /* _AND the leftover. */
+ equal(one+6, "gh"); /*, the leftover. */
(void) memset(one+2, 010045, 1);
equal(one, "ax\045xe"); /* Unsigned char convert. */
diff --git a/newlib/libm/test/test.c b/newlib/libm/test/test.c
index 615c54aa5..b25e4b963 100644
--- a/newlib/libm/test/test.c
+++ b/newlib/libm/test/test.c
@@ -10,7 +10,7 @@ int inacc;
int
_DEFUN(main,(ac, av),
- int ac _AND
+ int ac,
char **av)
{
int i;
@@ -93,7 +93,7 @@ int strtod_vector = 0;
int
_DEFUN(bigger,(a,b),
- __ieee_double_shape_type *a _AND
+ __ieee_double_shape_type *a,
__ieee_double_shape_type *b)
{
@@ -117,7 +117,7 @@ _DEFUN(bigger,(a,b),
/* Return the first bit different between two double numbers */
int
_DEFUN(mag_of_error,(is, shouldbe),
- double is _AND
+ double is,
double shouldbe)
{
__ieee_double_shape_type a,b;
@@ -184,7 +184,7 @@ _DEFUN(mag_of_error,(is, shouldbe),
void
_DEFUN(test_sok,(is, shouldbe),
- char *is _AND
+ char *is,
char *shouldbe)
{
if (strcmp(is,shouldbe))
@@ -198,7 +198,7 @@ _DEFUN(test_sok,(is, shouldbe),
}
void
_DEFUN(test_iok,(is, shouldbe),
- int is _AND
+ int is,
int shouldbe)
{
if (is != shouldbe){
@@ -216,8 +216,8 @@ _DEFUN(test_iok,(is, shouldbe),
*/
void
_DEFUN(test_scok,(is, shouldbe, count),
- char *is _AND
- char *shouldbe _AND
+ char *is,
+ char *shouldbe,
int count)
{
if (strncmp(is,shouldbe, count))
@@ -232,7 +232,7 @@ _DEFUN(test_scok,(is, shouldbe, count),
void
_DEFUN(test_eok,(is, shouldbe),
- int is _AND
+ int is,
int shouldbe)
{
if (is != shouldbe){
@@ -246,8 +246,8 @@ _DEFUN(test_eok,(is, shouldbe),
void
_DEFUN(test_mok,(value, shouldbe, okmag),
- double value _AND
- double shouldbe _AND
+ double value,
+ double shouldbe,
int okmag)
{
__ieee_double_shape_type a,b;
diff --git a/newlib/libm/test/test_ieee.c b/newlib/libm/test/test_ieee.c
index a126d01e6..07c49418d 100644
--- a/newlib/libm/test/test_ieee.c
+++ b/newlib/libm/test/test_ieee.c
@@ -83,7 +83,7 @@ _DEFUN_VOID(test_getroundtoi)
double
_DEFUN(dnumber,(msw, lsw),
- int msw _AND
+ int msw,
int lsw)
{
diff --git a/newlib/libm/test/test_is.c b/newlib/libm/test/test_is.c
index 2e99becbf..39c15c10e 100644
--- a/newlib/libm/test/test_is.c
+++ b/newlib/libm/test/test_is.c
@@ -1934,8 +1934,8 @@ int _DEFUN(def__toupper,(i), int i) { return _toupper(i); }
extern int inacc;
void
_DEFUN(test_is_set,(func, name, p),
- int (*func)() _AND
- char *name _AND
+ int (*func)(),
+ char *name,
int *p)
{
int i;
@@ -1953,10 +1953,10 @@ _DEFUN(test_is_set,(func, name, p),
}
void
_DEFUN(test_to_set,(func, name, p, low, high),
- int (*func)() _AND
- char *name _AND
- int *p _AND
- int low _AND
+ int (*func)(),
+ char *name,
+ int *p,
+ int low,
int high)
{
int i;
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 12/17] ansification: remove _DEFUN
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
` (8 preceding siblings ...)
2017-12-07 18:26 ` [PATCH v2 09/17] ansification: remove _DEFUN_VOID Yaakov Selkowitz
@ 2017-12-07 18:26 ` Yaakov Selkowitz
2017-12-07 18:26 ` [PATCH v2 11/17] ansification: remove _VOLATILE, _SIGNED Yaakov Selkowitz
` (7 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:26 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
libgloss/bfin/_exit.c | 3 +-
libgloss/close.c | 3 +-
libgloss/cr16/fstat.c | 3 +-
libgloss/cr16/getpid.c | 3 +-
libgloss/cr16/isatty.c | 3 +-
libgloss/cr16/kill.c | 3 +-
libgloss/cr16/putnum.c | 3 +-
libgloss/cr16/stat.c | 3 +-
libgloss/crx/fstat.c | 3 +-
libgloss/crx/getpid.c | 3 +-
libgloss/crx/isatty.c | 3 +-
libgloss/crx/kill.c | 3 +-
libgloss/crx/putnum.c | 3 +-
libgloss/crx/stat.c | 3 +-
libgloss/epiphany/_isatty.c | 2 +-
libgloss/frv/fstat.c | 3 +-
libgloss/frv/getpid.c | 3 +-
libgloss/frv/isatty.c | 3 +-
libgloss/frv/kill.c | 3 +-
libgloss/frv/print.c | 3 +-
libgloss/frv/putnum.c | 3 +-
libgloss/frv/sim-time.c | 9 +--
libgloss/frv/stat.c | 3 +-
libgloss/fstat.c | 3 +-
libgloss/ft32/fstat.c | 3 +-
libgloss/ft32/getpid.c | 3 +-
libgloss/ft32/isatty.c | 3 +-
libgloss/ft32/kill.c | 3 +-
libgloss/ft32/sim-lseek.S | 3 +-
libgloss/ft32/sim-lseek.c | 3 +-
libgloss/ft32/sim-time.c | 6 +-
libgloss/ft32/stat.c | 3 +-
libgloss/getpid.c | 3 +-
libgloss/isatty.c | 3 +-
libgloss/kill.c | 3 +-
libgloss/libnosys/_exit.c | 3 +-
libgloss/libnosys/chown.c | 3 +-
libgloss/libnosys/close.c | 3 +-
libgloss/libnosys/execve.c | 3 +-
libgloss/libnosys/fork.c | 3 +-
libgloss/libnosys/fstat.c | 3 +-
libgloss/libnosys/getpid.c | 3 +-
libgloss/libnosys/gettod.c | 3 +-
libgloss/libnosys/isatty.c | 3 +-
libgloss/libnosys/kill.c | 3 +-
libgloss/libnosys/link.c | 3 +-
libgloss/libnosys/lseek.c | 3 +-
libgloss/libnosys/open.c | 3 +-
libgloss/libnosys/read.c | 3 +-
libgloss/libnosys/readlink.c | 3 +-
libgloss/libnosys/stat.c | 3 +-
libgloss/libnosys/symlink.c | 3 +-
libgloss/libnosys/times.c | 3 +-
libgloss/libnosys/unlink.c | 3 +-
libgloss/libnosys/wait.c | 3 +-
libgloss/libnosys/write.c | 3 +-
libgloss/lm32/isatty.c | 3 +-
libgloss/lseek.c | 3 +-
libgloss/m68k/idp-outbyte.c | 6 +-
libgloss/m68k/mc68ec.c | 6 +-
libgloss/mcore/close.c | 3 +-
libgloss/mcore/cmb-exit.c | 3 +-
libgloss/mcore/cmb-inbyte.c | 3 +-
libgloss/mcore/cmb-outbyte.c | 3 +-
libgloss/mcore/fstat.c | 3 +-
libgloss/mcore/getpid.c | 3 +-
libgloss/mcore/kill.c | 3 +-
libgloss/mcore/lseek.c | 3 +-
libgloss/mcore/open.c | 3 +-
libgloss/mcore/print.c | 3 +-
libgloss/mcore/putnum.c | 3 +-
libgloss/mcore/raise.c | 3 +-
libgloss/mcore/read.c | 3 +-
libgloss/mcore/stat.c | 3 +-
libgloss/mcore/unlink.c | 3 +-
libgloss/mcore/write.c | 3 +-
libgloss/moxie/fstat.c | 3 +-
libgloss/moxie/getpid.c | 3 +-
libgloss/moxie/isatty.c | 3 +-
libgloss/moxie/kill.c | 3 +-
libgloss/moxie/print.c | 3 +-
libgloss/moxie/putnum.c | 3 +-
libgloss/moxie/qemu-time.c | 9 +--
libgloss/moxie/sim-lseek.S | 3 +-
libgloss/moxie/sim-lseek.c | 3 +-
libgloss/moxie/sim-time.c | 9 +--
libgloss/moxie/stat.c | 3 +-
libgloss/open.c | 3 +-
libgloss/print.c | 3 +-
libgloss/putnum.c | 3 +-
libgloss/read.c | 3 +-
libgloss/spu/getpid.c | 2 +-
libgloss/stat.c | 3 +-
libgloss/tic6x/getpid.c | 3 +-
libgloss/tic6x/kill.c | 3 +-
libgloss/unlink.c | 3 +-
libgloss/write.c | 3 +-
libgloss/xc16x/misc.c | 8 +--
libgloss/xstormy16/close.c | 3 +-
libgloss/xstormy16/fstat.c | 3 +-
libgloss/xstormy16/getpid.c | 3 +-
libgloss/xstormy16/isatty.c | 3 +-
libgloss/xstormy16/kill.c | 3 +-
libgloss/xstormy16/lseek.c | 3 +-
libgloss/xstormy16/open.c | 3 +-
libgloss/xstormy16/stat.c | 3 +-
libgloss/xstormy16/unlink.c | 3 +-
newlib/libc/argz/argz_add.c | 3 +-
newlib/libc/argz/argz_add_sep.c | 3 +-
newlib/libc/argz/argz_append.c | 3 +-
newlib/libc/argz/argz_count.c | 3 +-
newlib/libc/argz/argz_create.c | 3 +-
newlib/libc/argz/argz_create_sep.c | 3 +-
newlib/libc/argz/argz_delete.c | 3 +-
| 3 +-
newlib/libc/argz/argz_insert.c | 3 +-
newlib/libc/argz/argz_next.c | 3 +-
newlib/libc/argz/argz_replace.c | 3 +-
newlib/libc/argz/argz_stringify.c | 3 +-
newlib/libc/argz/envz_add.c | 3 +-
newlib/libc/argz/envz_entry.c | 3 +-
newlib/libc/argz/envz_get.c | 3 +-
newlib/libc/argz/envz_merge.c | 3 +-
newlib/libc/argz/envz_remove.c | 3 +-
newlib/libc/argz/envz_strip.c | 3 +-
newlib/libc/ctype/isalnum.c | 2 +-
newlib/libc/ctype/isalpha.c | 2 +-
newlib/libc/ctype/isascii.c | 2 +-
newlib/libc/ctype/isblank.c | 2 +-
newlib/libc/ctype/iscntrl.c | 2 +-
newlib/libc/ctype/isdigit.c | 2 +-
newlib/libc/ctype/islower.c | 2 +-
newlib/libc/ctype/isprint.c | 4 +-
newlib/libc/ctype/ispunct.c | 2 +-
newlib/libc/ctype/isspace.c | 2 +-
newlib/libc/ctype/isupper.c | 2 +-
newlib/libc/ctype/iswalnum.c | 2 +-
newlib/libc/ctype/iswalpha.c | 2 +-
newlib/libc/ctype/iswblank.c | 2 +-
newlib/libc/ctype/iswcntrl.c | 2 +-
newlib/libc/ctype/iswctype.c | 2 +-
newlib/libc/ctype/iswdigit.c | 2 +-
newlib/libc/ctype/iswgraph.c | 2 +-
newlib/libc/ctype/iswlower.c | 2 +-
newlib/libc/ctype/iswprint.c | 2 +-
newlib/libc/ctype/iswpunct.c | 2 +-
newlib/libc/ctype/iswspace.c | 2 +-
newlib/libc/ctype/iswupper.c | 2 +-
newlib/libc/ctype/iswxdigit.c | 2 +-
newlib/libc/ctype/isxdigit.c | 2 +-
newlib/libc/ctype/jp2uc.c | 4 +-
newlib/libc/ctype/toascii.c | 2 +-
newlib/libc/ctype/tolower.c | 2 +-
newlib/libc/ctype/toupper.c | 2 +-
newlib/libc/ctype/towctrans.c | 6 +-
newlib/libc/ctype/towlower.c | 2 +-
newlib/libc/ctype/towupper.c | 2 +-
newlib/libc/ctype/wctrans.c | 6 +-
newlib/libc/ctype/wctype.c | 6 +-
newlib/libc/iconv/ces/euc.c | 21 +++----
newlib/libc/iconv/ces/table-pcs.c | 24 +++-----
newlib/libc/iconv/ces/table.c | 30 ++++------
newlib/libc/iconv/ces/ucs-2-internal.c | 9 +--
newlib/libc/iconv/ces/ucs-2.c | 15 ++---
newlib/libc/iconv/ces/ucs-4-internal.c | 9 +--
newlib/libc/iconv/ces/ucs-4.c | 15 ++---
newlib/libc/iconv/ces/us-ascii.c | 9 +--
newlib/libc/iconv/ces/utf-16.c | 18 ++----
newlib/libc/iconv/ces/utf-8.c | 9 +--
newlib/libc/iconv/lib/aliasesi.c | 9 +--
newlib/libc/iconv/lib/iconv.c | 17 ++----
newlib/libc/iconv/lib/iconvnls.c | 24 +++-----
newlib/libc/iconv/lib/nullconv.c | 22 +++----
newlib/libc/iconv/lib/ucsconv.c | 25 +++-----
newlib/libc/include/_ansi.h | 2 -
newlib/libc/locale/locale.c | 6 +-
newlib/libc/locale/localeconv.c | 3 +-
newlib/libc/machine/microblaze/strcmp.c | 3 +-
newlib/libc/machine/microblaze/strcpy.c | 3 +-
newlib/libc/machine/microblaze/strlen.c | 3 +-
newlib/libc/machine/powerpc/atosfix16.c | 6 +-
newlib/libc/machine/powerpc/atosfix32.c | 6 +-
newlib/libc/machine/powerpc/atosfix64.c | 6 +-
newlib/libc/machine/powerpc/atoufix16.c | 6 +-
newlib/libc/machine/powerpc/atoufix32.c | 6 +-
newlib/libc/machine/powerpc/atoufix64.c | 6 +-
newlib/libc/machine/powerpc/strtosfix16.c | 6 +-
newlib/libc/machine/powerpc/strtosfix32.c | 6 +-
newlib/libc/machine/powerpc/strtosfix64.c | 6 +-
newlib/libc/machine/powerpc/strtoufix16.c | 6 +-
newlib/libc/machine/powerpc/strtoufix32.c | 6 +-
newlib/libc/machine/powerpc/strtoufix64.c | 6 +-
newlib/libc/machine/powerpc/ufix64toa.c | 3 +-
newlib/libc/machine/powerpc/vec_calloc.c | 3 +-
newlib/libc/machine/powerpc/vec_free.c | 3 +-
newlib/libc/machine/powerpc/vec_malloc.c | 3 +-
newlib/libc/machine/powerpc/vec_realloc.c | 3 +-
newlib/libc/machine/powerpc/vfprintf.c | 6 +-
newlib/libc/machine/powerpc/vfscanf.c | 6 +-
newlib/libc/machine/spu/assert.c | 6 +-
newlib/libc/machine/spu/clearerr.c | 3 +-
newlib/libc/machine/spu/creat.c | 3 +-
newlib/libc/machine/spu/fclose.c | 3 +-
newlib/libc/machine/spu/fdopen.c | 3 +-
newlib/libc/machine/spu/feof.c | 3 +-
newlib/libc/machine/spu/ferror.c | 3 +-
newlib/libc/machine/spu/fflush.c | 3 +-
newlib/libc/machine/spu/fgetc.c | 3 +-
newlib/libc/machine/spu/fgetpos.c | 3 +-
newlib/libc/machine/spu/fgets.c | 3 +-
newlib/libc/machine/spu/fileno.c | 3 +-
newlib/libc/machine/spu/fopen.c | 3 +-
newlib/libc/machine/spu/fputs.c | 3 +-
newlib/libc/machine/spu/fread.c | 3 +-
newlib/libc/machine/spu/freopen.c | 3 +-
newlib/libc/machine/spu/fseek.c | 3 +-
newlib/libc/machine/spu/fsetpos.c | 3 +-
newlib/libc/machine/spu/ftell.c | 3 +-
newlib/libc/machine/spu/fwrite.c | 3 +-
newlib/libc/machine/spu/perror.c | 3 +-
newlib/libc/machine/spu/puts.c | 3 +-
newlib/libc/machine/spu/rewind.c | 3 +-
newlib/libc/machine/spu/setbuf.c | 3 +-
newlib/libc/machine/spu/setvbuf.c | 3 +-
newlib/libc/machine/spu/stdio.c | 9 +--
newlib/libc/machine/spu/tmpnam.c | 3 +-
newlib/libc/machine/spu/vfprintf.c | 3 +-
newlib/libc/machine/spu/vfscanf.c | 3 +-
newlib/libc/machine/spu/vprintf.c | 3 +-
newlib/libc/machine/spu/vscanf.c | 3 +-
newlib/libc/machine/spu/vsnprintf.c | 3 +-
newlib/libc/machine/spu/vsprintf.c | 3 +-
newlib/libc/machine/spu/vsscanf.c | 3 +-
newlib/libc/misc/__dprintf.c | 12 ++--
newlib/libc/posix/_isatty.c | 2 +-
newlib/libc/posix/closedir.c | 3 +-
newlib/libc/posix/creat.c | 3 +-
newlib/libc/posix/execl.c | 6 +-
newlib/libc/posix/execle.c | 6 +-
newlib/libc/posix/execlp.c | 6 +-
newlib/libc/posix/execv.c | 3 +-
newlib/libc/posix/execve.c | 3 +-
newlib/libc/posix/execvp.c | 6 +-
newlib/libc/posix/isatty.c | 2 +-
newlib/libc/posix/opendir.c | 3 +-
newlib/libc/posix/popen.c | 6 +-
newlib/libc/posix/posix_spawn.c | 63 +++++++-------------
newlib/libc/posix/readdir.c | 3 +-
newlib/libc/posix/readdir_r.c | 3 +-
newlib/libc/posix/rewinddir.c | 3 +-
newlib/libc/posix/scandir.c | 6 +-
newlib/libc/posix/seekdir.c | 3 +-
newlib/libc/posix/telldir.c | 9 +--
newlib/libc/reent/execr.c | 9 +--
newlib/libc/reent/fcntlr.c | 3 +-
newlib/libc/reent/fstat64r.c | 3 +-
newlib/libc/reent/gettimeofdayr.c | 3 +-
newlib/libc/reent/linkr.c | 3 +-
newlib/libc/reent/lseek64r.c | 3 +-
newlib/libc/reent/lseekr.c | 3 +-
newlib/libc/reent/mkdirr.c | 3 +-
newlib/libc/reent/openr.c | 3 +-
newlib/libc/reent/readr.c | 3 +-
newlib/libc/reent/reent.c | 6 +-
newlib/libc/reent/renamer.c | 3 +-
newlib/libc/reent/sbrkr.c | 3 +-
newlib/libc/reent/signalr.c | 6 +-
newlib/libc/reent/stat64r.c | 3 +-
newlib/libc/reent/statr.c | 3 +-
newlib/libc/reent/timesr.c | 3 +-
newlib/libc/reent/unlinkr.c | 3 +-
newlib/libc/reent/writer.c | 3 +-
newlib/libc/search/bsearch.c | 3 +-
newlib/libc/search/hash.c | 3 +-
newlib/libc/search/hcreate.c | 5 +-
newlib/libc/search/qsort.c | 15 ++---
newlib/libc/search/tdelete.c | 3 +-
newlib/libc/search/tdestroy.c | 3 +-
newlib/libc/search/tfind.c | 3 +-
newlib/libc/search/tsearch.c | 3 +-
newlib/libc/search/twalk.c | 3 +-
newlib/libc/signal/psignal.c | 3 +-
newlib/libc/signal/raise.c | 6 +-
newlib/libc/signal/signal.c | 20 +++----
newlib/libc/stdio/asiprintf.c | 6 +-
newlib/libc/stdio/asniprintf.c | 6 +-
newlib/libc/stdio/asnprintf.c | 6 +-
newlib/libc/stdio/asprintf.c | 6 +-
newlib/libc/stdio/clearerr.c | 3 +-
newlib/libc/stdio/clearerr_u.c | 3 +-
newlib/libc/stdio/diprintf.c | 6 +-
newlib/libc/stdio/dprintf.c | 6 +-
newlib/libc/stdio/fclose.c | 6 +-
newlib/libc/stdio/fcloseall.c | 3 +-
newlib/libc/stdio/fdopen.c | 6 +-
newlib/libc/stdio/feof.c | 3 +-
newlib/libc/stdio/feof_u.c | 3 +-
newlib/libc/stdio/ferror.c | 3 +-
newlib/libc/stdio/ferror_u.c | 3 +-
newlib/libc/stdio/fflush.c | 12 ++--
newlib/libc/stdio/fgetc.c | 6 +-
newlib/libc/stdio/fgetc_u.c | 6 +-
newlib/libc/stdio/fgetpos.c | 6 +-
newlib/libc/stdio/fgets.c | 6 +-
newlib/libc/stdio/fgetwc.c | 9 +--
newlib/libc/stdio/fgetwc_u.c | 6 +-
newlib/libc/stdio/fgetws.c | 6 +-
newlib/libc/stdio/fileno.c | 3 +-
newlib/libc/stdio/fileno_u.c | 3 +-
newlib/libc/stdio/findfp.c | 21 +++----
newlib/libc/stdio/fiprintf.c | 6 +-
newlib/libc/stdio/flags.c | 3 +-
newlib/libc/stdio/fmemopen.c | 21 +++----
newlib/libc/stdio/fopen.c | 6 +-
newlib/libc/stdio/fopencookie.c | 21 +++----
newlib/libc/stdio/fprintf.c | 6 +-
newlib/libc/stdio/fpurge.c | 9 +--
newlib/libc/stdio/fputc.c | 6 +-
newlib/libc/stdio/fputc_u.c | 6 +-
newlib/libc/stdio/fputs.c | 6 +-
newlib/libc/stdio/fputwc.c | 9 +--
newlib/libc/stdio/fputwc_u.c | 6 +-
newlib/libc/stdio/fputws.c | 6 +-
newlib/libc/stdio/fread.c | 9 +--
newlib/libc/stdio/freopen.c | 6 +-
newlib/libc/stdio/fseek.c | 6 +-
newlib/libc/stdio/fseeko.c | 6 +-
newlib/libc/stdio/fsetlocking.c | 3 +-
newlib/libc/stdio/fsetpos.c | 6 +-
newlib/libc/stdio/ftell.c | 6 +-
newlib/libc/stdio/ftello.c | 6 +-
newlib/libc/stdio/funopen.c | 21 +++----
newlib/libc/stdio/fvwrite.c | 3 +-
newlib/libc/stdio/fwalk.c | 6 +-
newlib/libc/stdio/fwide.c | 6 +-
newlib/libc/stdio/fwprintf.c | 6 +-
newlib/libc/stdio/fwrite.c | 6 +-
newlib/libc/stdio/getc.c | 6 +-
newlib/libc/stdio/getc_u.c | 6 +-
newlib/libc/stdio/getchar.c | 3 +-
newlib/libc/stdio/getchar_u.c | 3 +-
newlib/libc/stdio/getdelim.c | 3 +-
newlib/libc/stdio/getline.c | 3 +-
newlib/libc/stdio/gets.c | 6 +-
newlib/libc/stdio/getw.c | 3 +-
newlib/libc/stdio/getwc.c | 6 +-
newlib/libc/stdio/getwc_u.c | 6 +-
newlib/libc/stdio/getwchar.c | 3 +-
newlib/libc/stdio/getwchar_u.c | 3 +-
newlib/libc/stdio/iprintf.c | 6 +-
newlib/libc/stdio/makebuf.c | 6 +-
newlib/libc/stdio/mktemp.c | 39 ++++--------
newlib/libc/stdio/nano-vfprintf.c | 21 +++----
newlib/libc/stdio/nano-vfscanf.c | 18 ++----
newlib/libc/stdio/open_memstream.c | 27 +++------
newlib/libc/stdio/perror.c | 6 +-
newlib/libc/stdio/printf.c | 6 +-
newlib/libc/stdio/putc.c | 6 +-
newlib/libc/stdio/putc_u.c | 6 +-
newlib/libc/stdio/putchar.c | 6 +-
newlib/libc/stdio/putchar_u.c | 6 +-
newlib/libc/stdio/puts.c | 6 +-
newlib/libc/stdio/putw.c | 3 +-
newlib/libc/stdio/putwc.c | 6 +-
newlib/libc/stdio/putwc_u.c | 6 +-
newlib/libc/stdio/putwchar.c | 6 +-
newlib/libc/stdio/putwchar_u.c | 6 +-
newlib/libc/stdio/refill.c | 6 +-
newlib/libc/stdio/remove.c | 6 +-
newlib/libc/stdio/rename.c | 3 +-
newlib/libc/stdio/rewind.c | 6 +-
newlib/libc/stdio/rget.c | 6 +-
newlib/libc/stdio/sccl.c | 3 +-
newlib/libc/stdio/setbuf.c | 3 +-
newlib/libc/stdio/setbuffer.c | 3 +-
newlib/libc/stdio/setlinebuf.c | 3 +-
newlib/libc/stdio/setvbuf.c | 3 +-
newlib/libc/stdio/siprintf.c | 6 +-
newlib/libc/stdio/siscanf.c | 6 +-
newlib/libc/stdio/sniprintf.c | 6 +-
newlib/libc/stdio/snprintf.c | 6 +-
newlib/libc/stdio/sprintf.c | 6 +-
newlib/libc/stdio/sscanf.c | 6 +-
newlib/libc/stdio/stdio.c | 18 ++----
newlib/libc/stdio/stdio_ext.c | 21 +++----
newlib/libc/stdio/swprintf.c | 6 +-
newlib/libc/stdio/tmpfile.c | 3 +-
newlib/libc/stdio/tmpnam.c | 15 ++---
newlib/libc/stdio/ungetc.c | 9 +--
newlib/libc/stdio/ungetwc.c | 6 +-
newlib/libc/stdio/vasiprintf.c | 6 +-
newlib/libc/stdio/vasniprintf.c | 6 +-
newlib/libc/stdio/vasnprintf.c | 6 +-
newlib/libc/stdio/vasprintf.c | 6 +-
newlib/libc/stdio/vdiprintf.c | 6 +-
newlib/libc/stdio/vdprintf.c | 6 +-
newlib/libc/stdio/vfprintf.c | 24 +++-----
newlib/libc/stdio/vfscanf.c | 21 +++----
newlib/libc/stdio/vfwprintf.c | 12 ++--
newlib/libc/stdio/vfwscanf.c | 18 ++----
newlib/libc/stdio/viprintf.c | 6 +-
newlib/libc/stdio/viscanf.c | 6 +-
newlib/libc/stdio/vprintf.c | 6 +-
newlib/libc/stdio/vscanf.c | 6 +-
newlib/libc/stdio/vsiprintf.c | 6 +-
newlib/libc/stdio/vsiscanf.c | 6 +-
newlib/libc/stdio/vsniprintf.c | 6 +-
newlib/libc/stdio/vsnprintf.c | 6 +-
newlib/libc/stdio/vsprintf.c | 6 +-
newlib/libc/stdio/vsscanf.c | 6 +-
newlib/libc/stdio/vswprintf.c | 6 +-
newlib/libc/stdio/vwprintf.c | 6 +-
newlib/libc/stdio/wbuf.c | 6 +-
newlib/libc/stdio/wprintf.c | 6 +-
newlib/libc/stdio/wsetup.c | 3 +-
newlib/libc/stdio64/fdopen64.c | 6 +-
newlib/libc/stdio64/fgetpos64.c | 6 +-
newlib/libc/stdio64/fopen64.c | 6 +-
newlib/libc/stdio64/freopen64.c | 6 +-
newlib/libc/stdio64/fseeko64.c | 6 +-
newlib/libc/stdio64/fsetpos64.c | 6 +-
newlib/libc/stdio64/ftello64.c | 6 +-
newlib/libc/stdio64/stdio64.c | 6 +-
newlib/libc/stdio64/tmpfile64.c | 3 +-
newlib/libc/stdlib/_Exit.c | 3 +-
newlib/libc/stdlib/__adjust.c | 3 +-
newlib/libc/stdlib/__atexit.c | 4 +-
newlib/libc/stdlib/__call_atexit.c | 3 +-
newlib/libc/stdlib/__exp10.c | 3 +-
newlib/libc/stdlib/__ten_mu.c | 3 +-
newlib/libc/stdlib/a64l.c | 3 +-
newlib/libc/stdlib/abs.c | 2 +-
newlib/libc/stdlib/assert.c | 6 +-
newlib/libc/stdlib/atexit.c | 4 +-
newlib/libc/stdlib/atof.c | 3 +-
newlib/libc/stdlib/atoff.c | 3 +-
newlib/libc/stdlib/atoi.c | 6 +-
newlib/libc/stdlib/atol.c | 4 +-
newlib/libc/stdlib/atoll.c | 6 +-
newlib/libc/stdlib/calloc.c | 3 +-
newlib/libc/stdlib/cxa_atexit.c | 4 +-
newlib/libc/stdlib/cxa_finalize.c | 3 +-
newlib/libc/stdlib/div.c | 3 +-
newlib/libc/stdlib/drand48.c | 3 +-
newlib/libc/stdlib/dtoa.c | 8 +--
newlib/libc/stdlib/dtoastub.c | 4 +-
newlib/libc/stdlib/ecvtbuf.c | 18 ++----
newlib/libc/stdlib/efgcvt.c | 18 ++----
newlib/libc/stdlib/erand48.c | 6 +-
newlib/libc/stdlib/exit.c | 3 +-
newlib/libc/stdlib/gdtoa-gethex.c | 9 +--
newlib/libc/stdlib/gdtoa-hexnan.c | 9 +--
newlib/libc/stdlib/getenv.c | 6 +-
newlib/libc/stdlib/getenv_r.c | 6 +-
newlib/libc/stdlib/itoa.c | 6 +-
newlib/libc/stdlib/jrand48.c | 6 +-
newlib/libc/stdlib/l64a.c | 6 +-
newlib/libc/stdlib/labs.c | 3 +-
newlib/libc/stdlib/lcong48.c | 6 +-
newlib/libc/stdlib/ldiv.c | 3 +-
newlib/libc/stdlib/llabs.c | 3 +-
newlib/libc/stdlib/lldiv.c | 3 +-
newlib/libc/stdlib/lrand48.c | 3 +-
newlib/libc/stdlib/malign.c | 3 +-
newlib/libc/stdlib/malloc.c | 6 +-
newlib/libc/stdlib/mblen.c | 3 +-
newlib/libc/stdlib/mblen_r.c | 3 +-
newlib/libc/stdlib/mbrtowc.c | 6 +-
newlib/libc/stdlib/mbsnrtowcs.c | 6 +-
newlib/libc/stdlib/mbsrtowcs.c | 6 +-
newlib/libc/stdlib/mbstowcs.c | 3 +-
newlib/libc/stdlib/mbstowcs_r.c | 3 +-
newlib/libc/stdlib/mbtowc.c | 3 +-
newlib/libc/stdlib/mbtowc_r.c | 18 ++----
newlib/libc/stdlib/mprec.c | 48 ++++++---------
newlib/libc/stdlib/mrand48.c | 3 +-
newlib/libc/stdlib/msize.c | 3 +-
newlib/libc/stdlib/mstats.c | 9 +--
newlib/libc/stdlib/mtrim.c | 3 +-
newlib/libc/stdlib/nrand48.c | 6 +-
newlib/libc/stdlib/on_exit.c | 4 +-
newlib/libc/stdlib/putenv.c | 3 +-
newlib/libc/stdlib/putenv_r.c | 3 +-
newlib/libc/stdlib/rand.c | 2 +-
newlib/libc/stdlib/rand48.c | 3 +-
newlib/libc/stdlib/rand_r.c | 2 +-
newlib/libc/stdlib/random.c | 2 +-
newlib/libc/stdlib/realloc.c | 3 +-
newlib/libc/stdlib/reallocf.c | 6 +-
newlib/libc/stdlib/rpmatch.c | 3 +-
newlib/libc/stdlib/seed48.c | 6 +-
newlib/libc/stdlib/setenv.c | 6 +-
newlib/libc/stdlib/setenv_r.c | 6 +-
newlib/libc/stdlib/srand48.c | 6 +-
newlib/libc/stdlib/strtod.c | 15 ++---
newlib/libc/stdlib/strtol.c | 6 +-
newlib/libc/stdlib/strtoll.c | 6 +-
newlib/libc/stdlib/strtoul.c | 6 +-
newlib/libc/stdlib/strtoull.c | 6 +-
newlib/libc/stdlib/system.c | 12 ++--
newlib/libc/stdlib/utoa.c | 6 +-
newlib/libc/stdlib/valloc.c | 6 +-
newlib/libc/stdlib/wcrtomb.c | 6 +-
newlib/libc/stdlib/wcsnrtombs.c | 6 +-
newlib/libc/stdlib/wcsrtombs.c | 6 +-
newlib/libc/stdlib/wcstod.c | 12 ++--
newlib/libc/stdlib/wcstol.c | 6 +-
newlib/libc/stdlib/wcstoll.c | 6 +-
newlib/libc/stdlib/wcstombs.c | 3 +-
newlib/libc/stdlib/wcstombs_r.c | 3 +-
newlib/libc/stdlib/wcstoul.c | 6 +-
newlib/libc/stdlib/wcstoull.c | 6 +-
newlib/libc/stdlib/wctomb.c | 3 +-
newlib/libc/stdlib/wctomb_r.c | 18 ++----
newlib/libc/string/bcmp.c | 3 +-
newlib/libc/string/bcopy.c | 3 +-
newlib/libc/string/gnu_basename.c | 3 +-
newlib/libc/string/index.c | 3 +-
newlib/libc/string/memccpy.c | 3 +-
newlib/libc/string/memchr.c | 3 +-
newlib/libc/string/memcmp.c | 3 +-
newlib/libc/string/memcpy.c | 3 +-
newlib/libc/string/memmem.c | 3 +-
newlib/libc/string/memmove.c | 3 +-
newlib/libc/string/mempcpy.c | 3 +-
newlib/libc/string/memrchr.c | 3 +-
newlib/libc/string/memset.c | 3 +-
newlib/libc/string/rawmemchr.c | 3 +-
newlib/libc/string/rindex.c | 3 +-
newlib/libc/string/stpcpy.c | 3 +-
newlib/libc/string/stpncpy.c | 3 +-
newlib/libc/string/strcasecmp.c | 3 +-
newlib/libc/string/strcasestr.c | 3 +-
newlib/libc/string/strcat.c | 3 +-
newlib/libc/string/strchr.c | 3 +-
newlib/libc/string/strchrnul.c | 3 +-
newlib/libc/string/strcmp.c | 3 +-
newlib/libc/string/strcoll.c | 3 +-
newlib/libc/string/strcpy.c | 3 +-
newlib/libc/string/strcspn.c | 3 +-
newlib/libc/string/strdup.c | 2 +-
newlib/libc/string/strdup_r.c | 3 +-
newlib/libc/string/strerror.c | 6 +-
newlib/libc/string/strerror_r.c | 3 +-
newlib/libc/string/strlcat.c | 3 +-
newlib/libc/string/strlcpy.c | 3 +-
newlib/libc/string/strlen.c | 3 +-
newlib/libc/string/strlwr.c | 3 +-
newlib/libc/string/strncasecmp.c | 3 +-
newlib/libc/string/strncat.c | 3 +-
newlib/libc/string/strncmp.c | 3 +-
newlib/libc/string/strncpy.c | 3 +-
newlib/libc/string/strndup.c | 3 +-
newlib/libc/string/strndup_r.c | 3 +-
newlib/libc/string/strnlen.c | 3 +-
newlib/libc/string/strpbrk.c | 3 +-
newlib/libc/string/strrchr.c | 3 +-
newlib/libc/string/strsep.c | 3 +-
newlib/libc/string/strsignal.c | 3 +-
newlib/libc/string/strspn.c | 3 +-
newlib/libc/string/strstr.c | 3 +-
newlib/libc/string/strtok.c | 3 +-
newlib/libc/string/strtok_r.c | 6 +-
newlib/libc/string/strupr.c | 3 +-
newlib/libc/string/strxfrm.c | 3 +-
newlib/libc/string/swab.c | 3 +-
newlib/libc/string/u_strerr.c | 3 +-
newlib/libc/string/wcpcpy.c | 3 +-
newlib/libc/string/wcpncpy.c | 3 +-
newlib/libc/string/wcscasecmp.c | 3 +-
newlib/libc/string/wcscat.c | 3 +-
newlib/libc/string/wcschr.c | 3 +-
newlib/libc/string/wcscmp.c | 3 +-
newlib/libc/string/wcscoll.c | 3 +-
newlib/libc/string/wcscpy.c | 3 +-
newlib/libc/string/wcscspn.c | 3 +-
newlib/libc/string/wcslcat.c | 3 +-
newlib/libc/string/wcslcpy.c | 3 +-
newlib/libc/string/wcslen.c | 3 +-
newlib/libc/string/wcsncasecmp.c | 3 +-
newlib/libc/string/wcsncat.c | 3 +-
newlib/libc/string/wcsncmp.c | 3 +-
newlib/libc/string/wcsncpy.c | 3 +-
newlib/libc/string/wcsnlen.c | 3 +-
newlib/libc/string/wcspbrk.c | 3 +-
newlib/libc/string/wcsrchr.c | 3 +-
newlib/libc/string/wcsspn.c | 3 +-
newlib/libc/string/wcsstr.c | 3 +-
newlib/libc/string/wcstok.c | 3 +-
newlib/libc/string/wcswidth.c | 3 +-
newlib/libc/string/wcsxfrm.c | 3 +-
newlib/libc/string/wcwidth.c | 6 +-
newlib/libc/string/wmemchr.c | 3 +-
newlib/libc/string/wmemcmp.c | 3 +-
newlib/libc/string/wmemcpy.c | 3 +-
newlib/libc/string/wmemmove.c | 3 +-
newlib/libc/string/wmempcpy.c | 3 +-
newlib/libc/string/wmemset.c | 3 +-
newlib/libc/string/xpg_strerror_r.c | 3 +-
newlib/libc/sys/a29khif/kill.c | 3 +-
newlib/libc/sys/h8300hms/misc.c | 8 +--
newlib/libc/sys/h8500hms/misc.c | 8 +--
newlib/libc/sys/linux/ctermid.c | 3 +-
newlib/libc/sys/linux/getpwent.c | 9 +--
newlib/libc/sys/linux/pread.c | 6 +-
newlib/libc/sys/linux/pread64.c | 3 +-
newlib/libc/sys/linux/pwrite.c | 6 +-
newlib/libc/sys/linux/pwrite64.c | 3 +-
newlib/libc/sys/sparc64/ieee.c | 12 ++--
newlib/libc/sys/sun4/ieee.c | 12 ++--
newlib/libc/sys/sysnec810/misc.c | 3 +-
newlib/libc/sys/sysvi386/fpx.c | 9 +--
newlib/libc/sys/sysvnecv70/fpx.c | 9 +--
newlib/libc/syscalls/sysclose.c | 3 +-
newlib/libc/syscalls/sysexecve.c | 3 +-
newlib/libc/syscalls/sysfcntl.c | 3 +-
newlib/libc/syscalls/sysfstat.c | 3 +-
newlib/libc/syscalls/sysgettod.c | 3 +-
newlib/libc/syscalls/sysisatty.c | 3 +-
newlib/libc/syscalls/syskill.c | 3 +-
newlib/libc/syscalls/syslink.c | 3 +-
newlib/libc/syscalls/syslseek.c | 3 +-
newlib/libc/syscalls/sysopen.c | 3 +-
newlib/libc/syscalls/sysread.c | 3 +-
newlib/libc/syscalls/syssbrk.c | 3 +-
newlib/libc/syscalls/sysstat.c | 3 +-
newlib/libc/syscalls/systimes.c | 3 +-
newlib/libc/syscalls/sysunlink.c | 3 +-
newlib/libc/syscalls/syswait.c | 3 +-
newlib/libc/syscalls/syswrite.c | 3 +-
newlib/libc/time/asctime.c | 3 +-
newlib/libc/time/asctime_r.c | 3 +-
newlib/libc/time/ctime.c | 3 +-
newlib/libc/time/ctime_r.c | 3 +-
newlib/libc/time/difftime.c | 3 +-
newlib/libc/time/gmtime.c | 3 +-
newlib/libc/time/gmtime_r.c | 3 +-
newlib/libc/time/lcltime.c | 3 +-
newlib/libc/time/lcltime_r.c | 3 +-
newlib/libc/time/mktime.c | 6 +-
newlib/libc/time/strftime.c | 6 +-
newlib/libc/time/time.c | 3 +-
newlib/libc/time/tzcalc_limits.c | 3 +-
newlib/libc/time/tzset_r.c | 6 +-
newlib/libc/unix/basename.c | 3 +-
newlib/libc/unix/dirname.c | 3 +-
newlib/libc/unix/pread.c | 6 +-
newlib/libc/unix/pwrite.c | 6 +-
newlib/libc/unix/ttyname.c | 3 +-
newlib/libc/unix/ttyname_r.c | 3 +-
newlib/libc/xdr/xdr.c | 99 +++++++++++--------------------
newlib/libc/xdr/xdr_array.c | 6 +-
newlib/libc/xdr/xdr_float.c | 6 +-
newlib/libc/xdr/xdr_float_vax.c | 6 +-
newlib/libc/xdr/xdr_mem.c | 48 +++++----------
newlib/libc/xdr/xdr_private.c | 9 +--
newlib/libc/xdr/xdr_rec.c | 69 +++++++--------------
newlib/libc/xdr/xdr_reference.c | 6 +-
newlib/libc/xdr/xdr_sizeof.c | 24 +++-----
newlib/libc/xdr/xdr_stdio.c | 33 ++++-------
newlib/libm/common/s_isinf.c | 3 +-
newlib/libm/common/s_isinfd.c | 3 +-
newlib/libm/common/s_isnand.c | 3 +-
newlib/libm/common/sf_isinf.c | 6 +-
newlib/libm/common/sf_isinff.c | 6 +-
newlib/libm/common/sf_isnan.c | 6 +-
newlib/libm/common/sf_isnanf.c | 6 +-
newlib/libm/machine/i386/f_math.h | 6 +-
newlib/libm/mathfp/s_acos.c | 3 +-
newlib/libm/mathfp/s_asin.c | 3 +-
newlib/libm/mathfp/s_asine.c | 3 +-
newlib/libm/mathfp/s_atan.c | 3 +-
newlib/libm/mathfp/s_atan2.c | 3 +-
newlib/libm/mathfp/s_atangent.c | 3 +-
newlib/libm/mathfp/s_ceil.c | 3 +-
newlib/libm/mathfp/s_cos.c | 3 +-
newlib/libm/mathfp/s_cosh.c | 3 +-
newlib/libm/mathfp/s_exp.c | 3 +-
newlib/libm/mathfp/s_exp2.c | 3 +-
newlib/libm/mathfp/s_fabs.c | 3 +-
newlib/libm/mathfp/s_floor.c | 3 +-
newlib/libm/mathfp/s_ldexp.c | 3 +-
newlib/libm/mathfp/s_log.c | 3 +-
newlib/libm/mathfp/s_log10.c | 3 +-
newlib/libm/mathfp/s_logarithm.c | 3 +-
newlib/libm/mathfp/s_numtest.c | 3 +-
newlib/libm/mathfp/s_sin.c | 3 +-
newlib/libm/mathfp/s_sincos.c | 3 +-
newlib/libm/mathfp/s_sine.c | 3 +-
newlib/libm/mathfp/s_sineh.c | 3 +-
newlib/libm/mathfp/s_sinf.c | 3 +-
newlib/libm/mathfp/s_sinh.c | 3 +-
newlib/libm/mathfp/s_sqrt.c | 3 +-
newlib/libm/mathfp/s_tan.c | 3 +-
newlib/libm/mathfp/s_tanh.c | 3 +-
newlib/libm/mathfp/sf_acos.c | 3 +-
newlib/libm/mathfp/sf_asin.c | 3 +-
newlib/libm/mathfp/sf_asine.c | 3 +-
newlib/libm/mathfp/sf_atan.c | 3 +-
newlib/libm/mathfp/sf_atan2.c | 3 +-
newlib/libm/mathfp/sf_atangent.c | 3 +-
newlib/libm/mathfp/sf_ceil.c | 3 +-
newlib/libm/mathfp/sf_cos.c | 3 +-
newlib/libm/mathfp/sf_cosh.c | 3 +-
newlib/libm/mathfp/sf_exp.c | 3 +-
newlib/libm/mathfp/sf_exp2.c | 3 +-
newlib/libm/mathfp/sf_fabs.c | 3 +-
newlib/libm/mathfp/sf_floor.c | 3 +-
newlib/libm/mathfp/sf_fmod.c | 3 +-
newlib/libm/mathfp/sf_ldexp.c | 3 +-
newlib/libm/mathfp/sf_log.c | 3 +-
newlib/libm/mathfp/sf_log10.c | 3 +-
newlib/libm/mathfp/sf_logarithm.c | 3 +-
newlib/libm/mathfp/sf_numtest.c | 3 +-
newlib/libm/mathfp/sf_sin.c | 3 +-
newlib/libm/mathfp/sf_sincos.c | 3 +-
newlib/libm/mathfp/sf_sine.c | 3 +-
newlib/libm/mathfp/sf_sineh.c | 3 +-
newlib/libm/mathfp/sf_sinh.c | 3 +-
newlib/libm/mathfp/sf_sqrt.c | 3 +-
newlib/libm/mathfp/sf_tan.c | 3 +-
newlib/libm/mathfp/sf_tanh.c | 3 +-
newlib/libm/test/convert.c | 12 ++--
newlib/libm/test/dcvt.c | 33 ++++-------
newlib/libm/test/math.c | 33 ++++-------
newlib/libm/test/string.c | 6 +-
newlib/libm/test/test.c | 27 +++------
newlib/libm/test/test_ieee.c | 3 +-
newlib/libm/test/test_is.c | 43 +++++++-------
729 files changed, 1338 insertions(+), 2605 deletions(-)
diff --git a/libgloss/bfin/_exit.c b/libgloss/bfin/_exit.c
index e8186326a..e55cf0849 100644
--- a/libgloss/bfin/_exit.c
+++ b/libgloss/bfin/_exit.c
@@ -17,8 +17,7 @@
#include <_ansi.h>
void
-_DEFUN (_exit, (rc),
- int rc)
+_exit (int rc)
{
while (1)
asm volatile ("EXCPT 0;");
diff --git a/libgloss/close.c b/libgloss/close.c
index 7aafcea46..48156aa35 100644
--- a/libgloss/close.c
+++ b/libgloss/close.c
@@ -18,8 +18,7 @@
* close -- We don't need to do anything, but pretend we did.
*/
int
-_DEFUN (close ,(fd),
- int fd)
+close (int fd)
{
return (0);
}
diff --git a/libgloss/cr16/fstat.c b/libgloss/cr16/fstat.c
index 73e1fa248..781b2a208 100644
--- a/libgloss/cr16/fstat.c
+++ b/libgloss/cr16/fstat.c
@@ -19,8 +19,7 @@
* fstat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (_fstat, (fd, buf),
- int fd,
+_fstat (int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/cr16/getpid.c b/libgloss/cr16/getpid.c
index d254c9b0d..efe190098 100644
--- a/libgloss/cr16/getpid.c
+++ b/libgloss/cr16/getpid.c
@@ -19,8 +19,7 @@
* getpid -- only one process, so just return 1.
*/
int
-_DEFUN (_getpid, (),
- )
+_getpid (void)
{
return __MYPID;
}
diff --git a/libgloss/cr16/isatty.c b/libgloss/cr16/isatty.c
index 604e8f097..fa3cd038c 100644
--- a/libgloss/cr16/isatty.c
+++ b/libgloss/cr16/isatty.c
@@ -20,8 +20,7 @@
* serial port, we'll say yes and return a 1.
*/
int
-_DEFUN (_isatty, (fd),
- int fd)
+_isatty (int fd)
{
return (1);
}
diff --git a/libgloss/cr16/kill.c b/libgloss/cr16/kill.c
index 43c3ec554..f51ddb5f5 100644
--- a/libgloss/cr16/kill.c
+++ b/libgloss/cr16/kill.c
@@ -20,8 +20,7 @@ extern void _exit (int) __attribute__((__noreturn__));
* kill -- go out via exit...
*/
int
-_DEFUN (_kill, (pid, sig),
- int pid,
+_kill (int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/cr16/putnum.c b/libgloss/cr16/putnum.c
index 3317bbf0a..af7232205 100644
--- a/libgloss/cr16/putnum.c
+++ b/libgloss/cr16/putnum.c
@@ -18,8 +18,7 @@
* putnum -- print a 32 bit number in hex
*/
void
-_DEFUN (putnum, (num),
- unsigned int num)
+putnum (unsigned int num)
{
char buf[9];
int cnt;
diff --git a/libgloss/cr16/stat.c b/libgloss/cr16/stat.c
index 743fc94a9..3900a1bce 100644
--- a/libgloss/cr16/stat.c
+++ b/libgloss/cr16/stat.c
@@ -20,8 +20,7 @@
* stat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (_stat, (path, buf),
- const char *path,
+_stat (const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/libgloss/crx/fstat.c b/libgloss/crx/fstat.c
index 75f863583..e96cc07d1 100644
--- a/libgloss/crx/fstat.c
+++ b/libgloss/crx/fstat.c
@@ -19,8 +19,7 @@
* fstat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (fstat, (fd, buf),
- int fd,
+fstat (int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/crx/getpid.c b/libgloss/crx/getpid.c
index 3c1a7b8b8..912ca18a5 100644
--- a/libgloss/crx/getpid.c
+++ b/libgloss/crx/getpid.c
@@ -19,8 +19,7 @@
* getpid -- only one process, so just return 1.
*/
int
-_DEFUN (getpid, (),
- )
+getpid (void)
{
return __MYPID;
}
diff --git a/libgloss/crx/isatty.c b/libgloss/crx/isatty.c
index ac3d041e7..c0039a59e 100644
--- a/libgloss/crx/isatty.c
+++ b/libgloss/crx/isatty.c
@@ -20,8 +20,7 @@
* serial port, we'll say yes and return a 1.
*/
int
-_DEFUN (isatty, (fd),
- int fd)
+isatty (int fd)
{
return (1);
}
diff --git a/libgloss/crx/kill.c b/libgloss/crx/kill.c
index db5018cfc..98cd3c40e 100644
--- a/libgloss/crx/kill.c
+++ b/libgloss/crx/kill.c
@@ -19,8 +19,7 @@
* kill -- go out via exit...
*/
int
-_DEFUN (kill, (pid, sig),
- int pid,
+kill (int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/crx/putnum.c b/libgloss/crx/putnum.c
index 3317bbf0a..af7232205 100644
--- a/libgloss/crx/putnum.c
+++ b/libgloss/crx/putnum.c
@@ -18,8 +18,7 @@
* putnum -- print a 32 bit number in hex
*/
void
-_DEFUN (putnum, (num),
- unsigned int num)
+putnum (unsigned int num)
{
char buf[9];
int cnt;
diff --git a/libgloss/crx/stat.c b/libgloss/crx/stat.c
index 9562b9097..497ef83c0 100644
--- a/libgloss/crx/stat.c
+++ b/libgloss/crx/stat.c
@@ -20,8 +20,7 @@
* stat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (stat, (path, buf),
- const char *path,
+stat (const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/libgloss/epiphany/_isatty.c b/libgloss/epiphany/_isatty.c
index 9ec5060f9..cfb1bf6e4 100644
--- a/libgloss/epiphany/_isatty.c
+++ b/libgloss/epiphany/_isatty.c
@@ -20,7 +20,7 @@
#include <errno.h>
int
-_DEFUN(_isatty, (fd), int fd)
+_isatty (int fd)
{
struct stat buf;
diff --git a/libgloss/frv/fstat.c b/libgloss/frv/fstat.c
index 680c4a1c0..99f0abfd6 100644
--- a/libgloss/frv/fstat.c
+++ b/libgloss/frv/fstat.c
@@ -19,8 +19,7 @@
* fstat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (_fstat, (fd, buf),
- int fd,
+_fstat (int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/frv/getpid.c b/libgloss/frv/getpid.c
index e6d568207..1809a2dde 100644
--- a/libgloss/frv/getpid.c
+++ b/libgloss/frv/getpid.c
@@ -18,8 +18,7 @@
* getpid -- only one process, so just return 1.
*/
int
-_DEFUN (_getpid, (),
- )
+_getpid (void)
{
return __MYPID;
}
diff --git a/libgloss/frv/isatty.c b/libgloss/frv/isatty.c
index e4c99065b..65c02b7d6 100644
--- a/libgloss/frv/isatty.c
+++ b/libgloss/frv/isatty.c
@@ -20,8 +20,7 @@
* serial port, we'll say yes and return a 1.
*/
int
-_DEFUN (_isatty, (fd),
- int fd)
+_isatty (int fd)
{
return (1);
}
diff --git a/libgloss/frv/kill.c b/libgloss/frv/kill.c
index 8dda1e9a6..3be632ead 100644
--- a/libgloss/frv/kill.c
+++ b/libgloss/frv/kill.c
@@ -20,8 +20,7 @@ extern void _exit (int) __attribute__((__noreturn__));
* kill -- go out via exit...
*/
int
-_DEFUN (_kill, (pid, sig),
- int pid,
+_kill (int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/frv/print.c b/libgloss/frv/print.c
index 8c8be847a..3dc3d0fe8 100644
--- a/libgloss/frv/print.c
+++ b/libgloss/frv/print.c
@@ -18,8 +18,7 @@
* print -- do a raw print of a string
*/
void
-_DEFUN (_print, (ptr),
-char *ptr)
+_print (char *ptr)
{
while (*ptr) {
outbyte (*ptr++);
diff --git a/libgloss/frv/putnum.c b/libgloss/frv/putnum.c
index c7fa12114..a07315e13 100644
--- a/libgloss/frv/putnum.c
+++ b/libgloss/frv/putnum.c
@@ -18,8 +18,7 @@
* putnum -- print a 32 bit number in hex
*/
void
-_DEFUN (_putnum, (num),
- unsigned int num)
+_putnum (unsigned int num)
{
char buf[9];
int cnt;
diff --git a/libgloss/frv/sim-time.c b/libgloss/frv/sim-time.c
index 196f855ad..7a6af4acb 100644
--- a/libgloss/frv/sim-time.c
+++ b/libgloss/frv/sim-time.c
@@ -38,8 +38,7 @@ extern time_t _sim_time (void) __asm__("_sim_time");
* time -- return current time in seconds.
*/
time_t
-_DEFUN (time, time (t),
- time_t *t)
+time (time_t *t)
{
time_t ret = _sim_time ();
@@ -53,8 +52,7 @@ _DEFUN (time, time (t),
* _times -- no clock, so return an error.
*/
int
-_DEFUN (_times, _times (buf),
- struct tms *buf)
+_times (struct tms *buf)
{
errno = EINVAL;
return (-1);
@@ -65,8 +63,7 @@ _DEFUN (_times, _times (buf),
* microseconds.
*/
int
-_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
- struct timeval *tv,
+_gettimeofday (struct timeval *tv,
void *tzvp)
{
struct timezone *tz = tzvp;
diff --git a/libgloss/frv/stat.c b/libgloss/frv/stat.c
index ceaedc216..b471f542c 100644
--- a/libgloss/frv/stat.c
+++ b/libgloss/frv/stat.c
@@ -20,8 +20,7 @@
* stat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (_stat, (path, buf),
- const char *path,
+_stat (const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/libgloss/fstat.c b/libgloss/fstat.c
index e7f913358..c9d14d103 100644
--- a/libgloss/fstat.c
+++ b/libgloss/fstat.c
@@ -19,8 +19,7 @@
* fstat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (fstat, (fd, buf),
- int fd,
+fstat (int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/ft32/fstat.c b/libgloss/ft32/fstat.c
index 0bd432e58..517d13442 100644
--- a/libgloss/ft32/fstat.c
+++ b/libgloss/ft32/fstat.c
@@ -19,8 +19,7 @@
* fstat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (_fstat, (fd, buf),
- int fd,
+_fstat (int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/ft32/getpid.c b/libgloss/ft32/getpid.c
index 75bba424a..435d0933f 100644
--- a/libgloss/ft32/getpid.c
+++ b/libgloss/ft32/getpid.c
@@ -18,8 +18,7 @@
* getpid -- only one process, so just return 1.
*/
int
-_DEFUN (_getpid, (),
- )
+_getpid (void)
{
return __MYPID;
}
diff --git a/libgloss/ft32/isatty.c b/libgloss/ft32/isatty.c
index fd2d73760..def8ff01c 100644
--- a/libgloss/ft32/isatty.c
+++ b/libgloss/ft32/isatty.c
@@ -20,8 +20,7 @@
* serial port, we'll say yes and return a 1.
*/
int
-_DEFUN (_isatty, (fd),
- int fd)
+_isatty (int fd)
{
return (1);
}
diff --git a/libgloss/ft32/kill.c b/libgloss/ft32/kill.c
index 4b2241f56..06ec59c61 100644
--- a/libgloss/ft32/kill.c
+++ b/libgloss/ft32/kill.c
@@ -20,8 +20,7 @@ extern void _exit (int) __attribute__((__noreturn__));
* kill -- go out via exit...
*/
int
-_DEFUN (_kill, (pid, sig),
- int pid,
+_kill (int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/ft32/sim-lseek.S b/libgloss/ft32/sim-lseek.S
index c2a134ca1..488edf3df 100644
--- a/libgloss/ft32/sim-lseek.S
+++ b/libgloss/ft32/sim-lseek.S
@@ -22,8 +22,7 @@
* an error.
*/
off_t
-_DEFUN (_lseek, (fd, offset, whence),
- int fd,
+_lseek (int fd,
off_t offset,
int whence)
{
diff --git a/libgloss/ft32/sim-lseek.c b/libgloss/ft32/sim-lseek.c
index e5c08c8e7..d35e08272 100644
--- a/libgloss/ft32/sim-lseek.c
+++ b/libgloss/ft32/sim-lseek.c
@@ -22,8 +22,7 @@
* an error.
*/
off_t
-_DEFUN (_lseek, (fd, offset, whence),
- int fd,
+_lseek (int fd,
off_t offset,
int whence)
{
diff --git a/libgloss/ft32/sim-time.c b/libgloss/ft32/sim-time.c
index 8f417ebb7..9d2993b88 100644
--- a/libgloss/ft32/sim-time.c
+++ b/libgloss/ft32/sim-time.c
@@ -21,8 +21,7 @@
* _times -- no clock, so return an error.
*/
int
-_DEFUN (_times, _times (buf),
- struct tms *buf)
+_times (struct tms *buf)
{
errno = EINVAL;
return (-1);
@@ -33,8 +32,7 @@ _DEFUN (_times, _times (buf),
* microseconds.
*/
int
-_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
- struct timeval *tv,
+_gettimeofday (struct timeval *tv,
void *tzvp)
{
struct timezone *tz = tzvp;
diff --git a/libgloss/ft32/stat.c b/libgloss/ft32/stat.c
index 4d738efe2..df7ef39ee 100644
--- a/libgloss/ft32/stat.c
+++ b/libgloss/ft32/stat.c
@@ -20,8 +20,7 @@
* stat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (_stat, (path, buf),
- const char *path,
+_stat (const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/libgloss/getpid.c b/libgloss/getpid.c
index 07f7f9279..9814fd539 100644
--- a/libgloss/getpid.c
+++ b/libgloss/getpid.c
@@ -18,8 +18,7 @@
* getpid -- only one process, so just return 1.
*/
int
-_DEFUN (getpid, (),
- )
+getpid (void)
{
return __MYPID;
}
diff --git a/libgloss/isatty.c b/libgloss/isatty.c
index 675d99bc2..2b54861ea 100644
--- a/libgloss/isatty.c
+++ b/libgloss/isatty.c
@@ -20,8 +20,7 @@
* serial port, we'll say yes, return a 1.
*/
int
-_DEFUN (isatty, (fd),
- int fd)
+isatty (int fd)
{
return (1);
}
diff --git a/libgloss/kill.c b/libgloss/kill.c
index ada45f6c8..a0eaee75b 100644
--- a/libgloss/kill.c
+++ b/libgloss/kill.c
@@ -18,8 +18,7 @@
* kill -- go out via exit...
*/
int
-_DEFUN (kill, (pid, sig),
- int pid,
+kill (int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/libnosys/_exit.c b/libgloss/libnosys/_exit.c
index 44d845b8c..731dea7f0 100644
--- a/libgloss/libnosys/_exit.c
+++ b/libgloss/libnosys/_exit.c
@@ -6,8 +6,7 @@
#include <_syslist.h>
void
-_DEFUN (_exit, (rc),
- int rc)
+_exit (int rc)
{
/* Default stub just causes a divide by 0 exception. */
int x = rc / INT_MAX;
diff --git a/libgloss/libnosys/chown.c b/libgloss/libnosys/chown.c
index 0ddb85d03..faea82be8 100644
--- a/libgloss/libnosys/chown.c
+++ b/libgloss/libnosys/chown.c
@@ -12,8 +12,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_chown, (path, owner, group),
- const char *path,
+_chown (const char *path,
uid_t owner,
gid_t group)
{
diff --git a/libgloss/libnosys/close.c b/libgloss/libnosys/close.c
index b759b86ee..8dc3e8b6a 100644
--- a/libgloss/libnosys/close.c
+++ b/libgloss/libnosys/close.c
@@ -11,8 +11,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_close, (fildes),
- int fildes)
+_close (int fildes)
{
errno = ENOSYS;
return -1;
diff --git a/libgloss/libnosys/execve.c b/libgloss/libnosys/execve.c
index a93641a34..950a43c75 100644
--- a/libgloss/libnosys/execve.c
+++ b/libgloss/libnosys/execve.c
@@ -11,8 +11,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_execve, (name, argv, env),
- char *name,
+_execve (char *name,
char **argv,
char **env)
{
diff --git a/libgloss/libnosys/fork.c b/libgloss/libnosys/fork.c
index 5fbf68b93..c4724a3f0 100644
--- a/libgloss/libnosys/fork.c
+++ b/libgloss/libnosys/fork.c
@@ -11,8 +11,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_fork, (),
- void)
+_fork (void)
{
errno = ENOSYS;
return -1;
diff --git a/libgloss/libnosys/fstat.c b/libgloss/libnosys/fstat.c
index d04b40721..c85b9f209 100644
--- a/libgloss/libnosys/fstat.c
+++ b/libgloss/libnosys/fstat.c
@@ -13,8 +13,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_fstat, (fildes, st),
- int fildes,
+_fstat (int fildes,
struct stat *st)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/getpid.c b/libgloss/libnosys/getpid.c
index 9ed416c6b..f8d451e8b 100644
--- a/libgloss/libnosys/getpid.c
+++ b/libgloss/libnosys/getpid.c
@@ -11,8 +11,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_getpid, (),
- void)
+_getpid (void)
{
errno = ENOSYS;
return -1;
diff --git a/libgloss/libnosys/gettod.c b/libgloss/libnosys/gettod.c
index 5e0b2db55..2b5354e72 100644
--- a/libgloss/libnosys/gettod.c
+++ b/libgloss/libnosys/gettod.c
@@ -15,8 +15,7 @@ extern int errno;
struct timeval;
int
-_DEFUN (_gettimeofday, (ptimeval, ptimezone),
- struct timeval *ptimeval,
+_gettimeofday (struct timeval *ptimeval,
void *ptimezone)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/isatty.c b/libgloss/libnosys/isatty.c
index d93e17702..a175bf992 100644
--- a/libgloss/libnosys/isatty.c
+++ b/libgloss/libnosys/isatty.c
@@ -11,8 +11,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_isatty, (file),
- int file)
+_isatty (int file)
{
errno = ENOSYS;
return 0;
diff --git a/libgloss/libnosys/kill.c b/libgloss/libnosys/kill.c
index c58328794..27c4f8cf6 100644
--- a/libgloss/libnosys/kill.c
+++ b/libgloss/libnosys/kill.c
@@ -11,8 +11,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_kill, (pid, sig),
- int pid,
+_kill (int pid,
int sig)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/link.c b/libgloss/libnosys/link.c
index b27b5bca6..0bae1ef8e 100644
--- a/libgloss/libnosys/link.c
+++ b/libgloss/libnosys/link.c
@@ -11,8 +11,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_link, (existing, new),
- char *existing,
+_link (char *existing,
char *new)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/lseek.c b/libgloss/libnosys/lseek.c
index f583a1461..fcc7be411 100644
--- a/libgloss/libnosys/lseek.c
+++ b/libgloss/libnosys/lseek.c
@@ -11,8 +11,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_lseek, (file, ptr, dir),
- int file,
+_lseek (int file,
int ptr,
int dir)
{
diff --git a/libgloss/libnosys/open.c b/libgloss/libnosys/open.c
index ee8becedc..0c864a5ba 100644
--- a/libgloss/libnosys/open.c
+++ b/libgloss/libnosys/open.c
@@ -11,8 +11,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_open, (file, flags, mode),
- char *file,
+_open (char *file,
int flags,
int mode)
{
diff --git a/libgloss/libnosys/read.c b/libgloss/libnosys/read.c
index 0ff3a9a8c..cfc281297 100644
--- a/libgloss/libnosys/read.c
+++ b/libgloss/libnosys/read.c
@@ -11,8 +11,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_read, (file, ptr, len),
- int file,
+_read (int file,
char *ptr,
int len)
{
diff --git a/libgloss/libnosys/readlink.c b/libgloss/libnosys/readlink.c
index 00f3f8982..014c956f9 100644
--- a/libgloss/libnosys/readlink.c
+++ b/libgloss/libnosys/readlink.c
@@ -12,8 +12,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_readlink, (path, buf, bufsize),
- const char *path,
+_readlink (const char *path,
char *buf,
size_t bufsize)
{
diff --git a/libgloss/libnosys/stat.c b/libgloss/libnosys/stat.c
index 9fa7003d1..734f67289 100644
--- a/libgloss/libnosys/stat.c
+++ b/libgloss/libnosys/stat.c
@@ -13,8 +13,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_stat, (file, st),
- const char *file,
+_stat (const char *file,
struct stat *st)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/symlink.c b/libgloss/libnosys/symlink.c
index cf7a15896..bebfbba52 100644
--- a/libgloss/libnosys/symlink.c
+++ b/libgloss/libnosys/symlink.c
@@ -11,8 +11,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_symlink, (path1, path2),
- const char *path1,
+_symlink (const char *path1,
const char *path2)
{
errno = ENOSYS;
diff --git a/libgloss/libnosys/times.c b/libgloss/libnosys/times.c
index f205e50f5..908cd8d12 100644
--- a/libgloss/libnosys/times.c
+++ b/libgloss/libnosys/times.c
@@ -12,8 +12,7 @@ extern int errno;
#include "warning.h"
clock_t
-_DEFUN (_times, (buf),
- struct tms *buf)
+_times (struct tms *buf)
{
errno = ENOSYS;
return -1;
diff --git a/libgloss/libnosys/unlink.c b/libgloss/libnosys/unlink.c
index c543709e4..3414bf82c 100644
--- a/libgloss/libnosys/unlink.c
+++ b/libgloss/libnosys/unlink.c
@@ -11,8 +11,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_unlink, (name),
- char *name)
+_unlink (char *name)
{
errno = ENOSYS;
return -1;
diff --git a/libgloss/libnosys/wait.c b/libgloss/libnosys/wait.c
index 2a785be1f..029dcbcd4 100644
--- a/libgloss/libnosys/wait.c
+++ b/libgloss/libnosys/wait.c
@@ -11,8 +11,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_wait, (status),
- int *status)
+_wait (int *status)
{
errno = ENOSYS;
return -1;
diff --git a/libgloss/libnosys/write.c b/libgloss/libnosys/write.c
index 0ada7702b..33d727bbf 100644
--- a/libgloss/libnosys/write.c
+++ b/libgloss/libnosys/write.c
@@ -11,8 +11,7 @@ extern int errno;
#include "warning.h"
int
-_DEFUN (_write, (file, ptr, len),
- int file,
+_write (int file,
char *ptr,
int len)
{
diff --git a/libgloss/lm32/isatty.c b/libgloss/lm32/isatty.c
index 69833fa07..d90b4df08 100644
--- a/libgloss/lm32/isatty.c
+++ b/libgloss/lm32/isatty.c
@@ -33,8 +33,7 @@
* other files are not.
*/
int
-_DEFUN (_isatty, (fd),
- int fd)
+_isatty (int fd)
{
if ((fd == 0) || (fd == 1) || (fd == 2))
return 1;
diff --git a/libgloss/lseek.c b/libgloss/lseek.c
index 42a28d966..2fde60d8d 100644
--- a/libgloss/lseek.c
+++ b/libgloss/lseek.c
@@ -20,8 +20,7 @@
* lseek -- Since a serial port is non-seekable, we return an error.
*/
off_t
-_DEFUN (lseek, (fd, offset, whence),
- int fd,
+lseek (int fd,
off_t offset,
int whence)
{
diff --git a/libgloss/m68k/idp-outbyte.c b/libgloss/m68k/idp-outbyte.c
index a95dc0c53..761d679f7 100644
--- a/libgloss/m68k/idp-outbyte.c
+++ b/libgloss/m68k/idp-outbyte.c
@@ -32,8 +32,7 @@
* to channel A.
*/
static void
-_DEFUN (raw_outbyte, (byte),
- char byte)
+raw_outbyte (char byte)
{
/* First, wait for the UART to finish clocking out the last
character we sent, if any. Then, give it the next character to
@@ -64,8 +63,7 @@ _DEFUN (raw_outbyte, (byte),
* latter we put in libidp.a, which is selected by idp.ld.
*/
void
-_DEFUN (outbyte, (byte),
- char byte)
+outbyte (char byte)
{
#ifdef GDB_MONITOR_OUTPUT
raw_outbyte (0x0f);
diff --git a/libgloss/m68k/mc68ec.c b/libgloss/m68k/mc68ec.c
index d5ee9b5fe..76e737fe7 100644
--- a/libgloss/m68k/mc68ec.c
+++ b/libgloss/m68k/mc68ec.c
@@ -25,8 +25,7 @@
* prompt. It can be restarted from there.
*/
void
-_DEFUN (_exit, (status),
- int_status)
+_exit (int_status)
{
/* Use `i' constraint to get proper immediate-operand syntax for
target assembler configuration. */
@@ -38,8 +37,7 @@ _DEFUN (_exit, (status),
* use the timer, but I'm waiting for docs. (sigh)
*/
void
-_DEFUN (delay, (num),
- int num)
+delay (int num)
{
while (num--)
{
diff --git a/libgloss/mcore/close.c b/libgloss/mcore/close.c
index b94cb602a..0a9f81141 100644
--- a/libgloss/mcore/close.c
+++ b/libgloss/mcore/close.c
@@ -18,8 +18,7 @@
* close -- We don't need to do anything, but pretend we did.
*/
int
-_DEFUN (_close ,(fd),
- int fd)
+_close (int fd)
{
return (0);
}
diff --git a/libgloss/mcore/cmb-exit.c b/libgloss/mcore/cmb-exit.c
index 0e1de85f3..84703eb0d 100644
--- a/libgloss/mcore/cmb-exit.c
+++ b/libgloss/mcore/cmb-exit.c
@@ -18,8 +18,7 @@
* _exit -- Just cause a breakpoint so user can see why we exited.
*/
void
-_DEFUN (_exit, (val),
- int val)
+_exit (int val)
{
while (1) {
asm("bkpt");
diff --git a/libgloss/mcore/cmb-inbyte.c b/libgloss/mcore/cmb-inbyte.c
index 839ffe605..9bfbbde81 100644
--- a/libgloss/mcore/cmb-inbyte.c
+++ b/libgloss/mcore/cmb-inbyte.c
@@ -15,8 +15,7 @@
#include <_ansi.h>
int
-_DEFUN (inbyte, (),
- void)
+inbyte (void)
{
return -1;
diff --git a/libgloss/mcore/cmb-outbyte.c b/libgloss/mcore/cmb-outbyte.c
index ea2aaef8b..ea31cc5af 100644
--- a/libgloss/mcore/cmb-outbyte.c
+++ b/libgloss/mcore/cmb-outbyte.c
@@ -33,8 +33,7 @@
* outbyte -- send a byte to the UART.
*/
void
-_DEFUN (outbyte, (ch),
- char ch)
+outbyte (char ch)
{
while (!(*SRREG & TRDY))
;
diff --git a/libgloss/mcore/fstat.c b/libgloss/mcore/fstat.c
index 6a2323a6e..671f56ad9 100644
--- a/libgloss/mcore/fstat.c
+++ b/libgloss/mcore/fstat.c
@@ -19,8 +19,7 @@
* fstat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (_fstat, (fd, buf),
- int fd,
+_fstat (int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/mcore/getpid.c b/libgloss/mcore/getpid.c
index eee2ac030..cc9e85749 100644
--- a/libgloss/mcore/getpid.c
+++ b/libgloss/mcore/getpid.c
@@ -18,8 +18,7 @@
* getpid -- only one process, so just return 1.
*/
int
-_DEFUN (_getpid, (),
- )
+_getpid (void)
{
return __MYPID;
}
diff --git a/libgloss/mcore/kill.c b/libgloss/mcore/kill.c
index 8883c8ecd..833fe89d7 100644
--- a/libgloss/mcore/kill.c
+++ b/libgloss/mcore/kill.c
@@ -18,8 +18,7 @@
* kill -- go out via exit...
*/
int
-_DEFUN (_kill, (pid, sig),
- int pid,
+_kill (int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/mcore/lseek.c b/libgloss/mcore/lseek.c
index 423e11e55..dc419c753 100644
--- a/libgloss/mcore/lseek.c
+++ b/libgloss/mcore/lseek.c
@@ -20,8 +20,7 @@
* lseek -- Since a serial port is non-seekable, we return an error.
*/
off_t
-_DEFUN (_lseek, (fd, offset, whence),
- int fd,
+_lseek (int fd,
off_t offset,
int whence)
{
diff --git a/libgloss/mcore/open.c b/libgloss/mcore/open.c
index 6b816e891..fdc1b3081 100644
--- a/libgloss/mcore/open.c
+++ b/libgloss/mcore/open.c
@@ -20,8 +20,7 @@
* we return an error.
*/
int
-_DEFUN (_open, (buf, flags, mode),
- const char *buf,
+_open (const char *buf,
int flags,
int mode)
{
diff --git a/libgloss/mcore/print.c b/libgloss/mcore/print.c
index d0d2bcef7..f5d0dba20 100644
--- a/libgloss/mcore/print.c
+++ b/libgloss/mcore/print.c
@@ -18,8 +18,7 @@
* print -- do a raw print of a string
*/
void
-_DEFUN (_print, (ptr),
-char *ptr)
+_print (char *ptr)
{
while (*ptr) {
outbyte (*ptr++);
diff --git a/libgloss/mcore/putnum.c b/libgloss/mcore/putnum.c
index 2e37c0993..10e298b95 100644
--- a/libgloss/mcore/putnum.c
+++ b/libgloss/mcore/putnum.c
@@ -18,8 +18,7 @@
* putnum -- print a 32 bit number in hex
*/
void
-_DEFUN (_putnum, (num),
- unsigned int num)
+_putnum (unsigned int num)
{
char buf[9];
int cnt;
diff --git a/libgloss/mcore/raise.c b/libgloss/mcore/raise.c
index 6657aa649..e39207792 100644
--- a/libgloss/mcore/raise.c
+++ b/libgloss/mcore/raise.c
@@ -15,8 +15,7 @@
#include "glue.h"
int
-_DEFUN (_raise, (sig),
- int sig)
+_raise (int sig)
{
return _kill (_getpid (), sig);
}
diff --git a/libgloss/mcore/read.c b/libgloss/mcore/read.c
index d97d98d22..d7c5670b0 100644
--- a/libgloss/mcore/read.c
+++ b/libgloss/mcore/read.c
@@ -21,8 +21,7 @@ extern char inbyte (void);
* we only have stdin.
*/
int
-_DEFUN (_read, (fd, buf, nbytes),
- int fd,
+_read (int fd,
char *buf,
int nbytes)
{
diff --git a/libgloss/mcore/stat.c b/libgloss/mcore/stat.c
index d07042a51..1e16e0e53 100644
--- a/libgloss/mcore/stat.c
+++ b/libgloss/mcore/stat.c
@@ -20,8 +20,7 @@
* stat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (_stat, (path, buf),
- const char *path,
+_stat (const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/libgloss/mcore/unlink.c b/libgloss/mcore/unlink.c
index 16dda14f2..9cbcfc53c 100644
--- a/libgloss/mcore/unlink.c
+++ b/libgloss/mcore/unlink.c
@@ -20,8 +20,7 @@
* we just return an error.
*/
int
-_DEFUN (_unlink, (path),
- char * path)
+_unlink (char * path)
{
errno = EIO;
return (-1);
diff --git a/libgloss/mcore/write.c b/libgloss/mcore/write.c
index 189ea6222..87dca10a1 100644
--- a/libgloss/mcore/write.c
+++ b/libgloss/mcore/write.c
@@ -22,8 +22,7 @@ extern int _EXFUN (outbyte, (char x));
* open will only return an error.
*/
int
-_DEFUN (_write, (fd, buf, nbytes),
- int fd,
+_write (int fd,
char *buf,
int nbytes)
{
diff --git a/libgloss/moxie/fstat.c b/libgloss/moxie/fstat.c
index 38dd07b34..78dd9328e 100644
--- a/libgloss/moxie/fstat.c
+++ b/libgloss/moxie/fstat.c
@@ -19,8 +19,7 @@
* fstat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (_fstat, (fd, buf),
- int fd,
+_fstat (int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/moxie/getpid.c b/libgloss/moxie/getpid.c
index 957eee746..93704ceb9 100644
--- a/libgloss/moxie/getpid.c
+++ b/libgloss/moxie/getpid.c
@@ -18,8 +18,7 @@
* getpid -- only one process, so just return 1.
*/
int
-_DEFUN (_getpid, (),
- )
+_getpid (void)
{
return __MYPID;
}
diff --git a/libgloss/moxie/isatty.c b/libgloss/moxie/isatty.c
index 73ade0741..f986aa725 100644
--- a/libgloss/moxie/isatty.c
+++ b/libgloss/moxie/isatty.c
@@ -20,8 +20,7 @@
* serial port, we'll say yes and return a 1.
*/
int
-_DEFUN (_isatty, (fd),
- int fd)
+_isatty (int fd)
{
return (1);
}
diff --git a/libgloss/moxie/kill.c b/libgloss/moxie/kill.c
index d602829ce..623f158f4 100644
--- a/libgloss/moxie/kill.c
+++ b/libgloss/moxie/kill.c
@@ -20,8 +20,7 @@ extern void _exit (int) __attribute__((__noreturn__));
* kill -- go out via exit...
*/
int
-_DEFUN (_kill, (pid, sig),
- int pid,
+_kill (int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/moxie/print.c b/libgloss/moxie/print.c
index a20743ac6..1857258cd 100644
--- a/libgloss/moxie/print.c
+++ b/libgloss/moxie/print.c
@@ -18,8 +18,7 @@
* print -- do a raw print of a string
*/
void
-_DEFUN (_print, (ptr),
-char *ptr)
+_print (char *ptr)
{
while (*ptr) {
outbyte (*ptr++);
diff --git a/libgloss/moxie/putnum.c b/libgloss/moxie/putnum.c
index f5bac1f2b..0f7e89453 100644
--- a/libgloss/moxie/putnum.c
+++ b/libgloss/moxie/putnum.c
@@ -18,8 +18,7 @@
* putnum -- print a 32 bit number in hex
*/
void
-_DEFUN (_putnum, (num),
- unsigned int num)
+_putnum (unsigned int num)
{
char buf[9];
int cnt;
diff --git a/libgloss/moxie/qemu-time.c b/libgloss/moxie/qemu-time.c
index 1abd5a9f7..0049c24ee 100644
--- a/libgloss/moxie/qemu-time.c
+++ b/libgloss/moxie/qemu-time.c
@@ -40,8 +40,7 @@
* _times -- FIXME
*/
int
-_DEFUN (_times, _times (buf),
- struct tms *buf)
+_times (struct tms *buf)
{
errno = EINVAL;
return (-1);
@@ -70,8 +69,7 @@ rtc_write (unsigned char reg, unsigned char val)
* time -- return current time in seconds.
*/
time_t
-_DEFUN (time, time (t),
- time_t *t)
+time (time_t *t)
{
struct tm tm;
time_t ret;
@@ -100,8 +98,7 @@ _DEFUN (time, time (t),
* return the microseconds.
*/
int
-_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
- struct timeval *tv,
+_gettimeofday (struct timeval *tv,
void *tzvp)
{
struct timezone *tz = tzvp;
diff --git a/libgloss/moxie/sim-lseek.S b/libgloss/moxie/sim-lseek.S
index 5e5493cd7..86fb67504 100644
--- a/libgloss/moxie/sim-lseek.S
+++ b/libgloss/moxie/sim-lseek.S
@@ -22,8 +22,7 @@
* an error.
*/
off_t
-_DEFUN (_lseek, (fd, offset, whence),
- int fd,
+_lseek (int fd,
off_t offset,
int whence)
{
diff --git a/libgloss/moxie/sim-lseek.c b/libgloss/moxie/sim-lseek.c
index d22d7226c..dacd769af 100644
--- a/libgloss/moxie/sim-lseek.c
+++ b/libgloss/moxie/sim-lseek.c
@@ -22,8 +22,7 @@
* an error.
*/
off_t
-_DEFUN (_lseek, (fd, offset, whence),
- int fd,
+_lseek (int fd,
off_t offset,
int whence)
{
diff --git a/libgloss/moxie/sim-time.c b/libgloss/moxie/sim-time.c
index d3f43d385..53793bfe1 100644
--- a/libgloss/moxie/sim-time.c
+++ b/libgloss/moxie/sim-time.c
@@ -37,8 +37,7 @@ extern time_t _sim_time (void) __asm__("_sim_time");
* time -- return current time in seconds.
*/
time_t
-_DEFUN (time, time (t),
- time_t *t)
+time (time_t *t)
{
time_t ret = _sim_time ();
@@ -52,8 +51,7 @@ _DEFUN (time, time (t),
* _times -- no clock, so return an error.
*/
int
-_DEFUN (_times, _times (buf),
- struct tms *buf)
+_times (struct tms *buf)
{
errno = EINVAL;
return (-1);
@@ -64,8 +62,7 @@ _DEFUN (_times, _times (buf),
* microseconds.
*/
int
-_DEFUN (_gettimeofday, _gettimeofday (tv, tz),
- struct timeval *tv,
+_gettimeofday (struct timeval *tv,
void *tzvp)
{
struct timezone *tz = tzvp;
diff --git a/libgloss/moxie/stat.c b/libgloss/moxie/stat.c
index 01a958210..c80e8d347 100644
--- a/libgloss/moxie/stat.c
+++ b/libgloss/moxie/stat.c
@@ -20,8 +20,7 @@
* stat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (_stat, (path, buf),
- const char *path,
+_stat (const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/libgloss/open.c b/libgloss/open.c
index 90787b1b9..a0eb1717b 100644
--- a/libgloss/open.c
+++ b/libgloss/open.c
@@ -20,8 +20,7 @@
* we return an error.
*/
int
-_DEFUN (open, (buf, flags, mode),
- const char *buf,
+open (const char *buf,
int flags,
int mode)
{
diff --git a/libgloss/print.c b/libgloss/print.c
index 8f78ff2af..76d543b67 100644
--- a/libgloss/print.c
+++ b/libgloss/print.c
@@ -18,8 +18,7 @@
* print -- do a raw print of a string
*/
void
-_DEFUN (print, (ptr),
-char *ptr)
+print (char *ptr)
{
while (*ptr) {
outbyte (*ptr++);
diff --git a/libgloss/putnum.c b/libgloss/putnum.c
index 842e10f07..c368c4136 100644
--- a/libgloss/putnum.c
+++ b/libgloss/putnum.c
@@ -18,8 +18,7 @@
* putnum -- print a 32 bit number in hex
*/
void
-_DEFUN (putnum, (num),
- unsigned int num)
+putnum (unsigned int num)
{
char buf[9];
int cnt;
diff --git a/libgloss/read.c b/libgloss/read.c
index 507c9802f..24108ce0d 100644
--- a/libgloss/read.c
+++ b/libgloss/read.c
@@ -21,8 +21,7 @@ extern char inbyte (void);
* we only have stdin.
*/
int
-_DEFUN (read, (fd, buf, nbytes),
- int fd,
+read (int fd,
char *buf,
int nbytes)
{
diff --git a/libgloss/spu/getpid.c b/libgloss/spu/getpid.c
index ff2d82028..89361720f 100644
--- a/libgloss/spu/getpid.c
+++ b/libgloss/spu/getpid.c
@@ -31,7 +31,7 @@ Author: Andreas Neukoetter (ti95neuk@de.ibm.com)
*/
int
-getpid ()
+getpid (void)
{
return (1);
}
diff --git a/libgloss/stat.c b/libgloss/stat.c
index 5957645c6..4d6312830 100644
--- a/libgloss/stat.c
+++ b/libgloss/stat.c
@@ -20,8 +20,7 @@
* stat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (stat, (path, buf),
- const char *path,
+stat (const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/libgloss/tic6x/getpid.c b/libgloss/tic6x/getpid.c
index 3c1a7b8b8..912ca18a5 100644
--- a/libgloss/tic6x/getpid.c
+++ b/libgloss/tic6x/getpid.c
@@ -19,8 +19,7 @@
* getpid -- only one process, so just return 1.
*/
int
-_DEFUN (getpid, (),
- )
+getpid (void)
{
return __MYPID;
}
diff --git a/libgloss/tic6x/kill.c b/libgloss/tic6x/kill.c
index db5018cfc..98cd3c40e 100644
--- a/libgloss/tic6x/kill.c
+++ b/libgloss/tic6x/kill.c
@@ -19,8 +19,7 @@
* kill -- go out via exit...
*/
int
-_DEFUN (kill, (pid, sig),
- int pid,
+kill (int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/unlink.c b/libgloss/unlink.c
index 15ea7e8a9..76c1a4fef 100644
--- a/libgloss/unlink.c
+++ b/libgloss/unlink.c
@@ -20,8 +20,7 @@
* we just return an error.
*/
int
-_DEFUN (unlink, (path),
- char * path)
+unlink (char * path)
{
errno = EIO;
return (-1);
diff --git a/libgloss/write.c b/libgloss/write.c
index 69f452c34..4b25cfce7 100644
--- a/libgloss/write.c
+++ b/libgloss/write.c
@@ -22,8 +22,7 @@ extern int _EXFUN (outbyte, (char x));
* open will only return an error.
*/
int
-_DEFUN (write, (fd, buf, nbytes),
- int fd,
+write (int fd,
char *buf,
int nbytes)
{
diff --git a/libgloss/xc16x/misc.c b/libgloss/xc16x/misc.c
index 2eb951a5a..d96550129 100644
--- a/libgloss/xc16x/misc.c
+++ b/libgloss/xc16x/misc.c
@@ -17,21 +17,19 @@
/* _raise(), getpid(), and kill() are required by abort().
getpid/kill are prefixed with '_' because of MISSING_SYSCALL_NAMES. */
-int _DEFUN(_raise,(sig),
- int sig)
+int _raise (int sig)
{
errno = ENOSYS;
return -1;
}
-int _DEFUN(_getpid,(),)
+int _getpid (void)
{
errno = ENOSYS;
return -1;
}
-int _DEFUN(_kill,(pid, sig),
- int pid,
+int _kill (int pid,
int sig)
{
errno = ENOSYS;
diff --git a/libgloss/xstormy16/close.c b/libgloss/xstormy16/close.c
index 5fcfbf576..2b50e6432 100644
--- a/libgloss/xstormy16/close.c
+++ b/libgloss/xstormy16/close.c
@@ -18,8 +18,7 @@
* close -- We don't need to do anything, but pretend we did.
*/
int
-_DEFUN (_close ,(fd),
- int fd)
+_close (int fd)
{
return (0);
}
diff --git a/libgloss/xstormy16/fstat.c b/libgloss/xstormy16/fstat.c
index 2926ccaab..b962036f3 100644
--- a/libgloss/xstormy16/fstat.c
+++ b/libgloss/xstormy16/fstat.c
@@ -19,8 +19,7 @@
* fstat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (_fstat, (fd, buf),
- int fd,
+_fstat (int fd,
struct stat *buf)
{
buf->st_mode = S_IFCHR; /* Always pretend to be a tty */
diff --git a/libgloss/xstormy16/getpid.c b/libgloss/xstormy16/getpid.c
index 0f081a11d..e49fde4a0 100644
--- a/libgloss/xstormy16/getpid.c
+++ b/libgloss/xstormy16/getpid.c
@@ -18,8 +18,7 @@
* getpid -- only one process, so just return 1.
*/
int
-_DEFUN (_getpid, (),
- )
+_getpid (void)
{
return __MYPID;
}
diff --git a/libgloss/xstormy16/isatty.c b/libgloss/xstormy16/isatty.c
index 0e92a9f4f..f7d8fa098 100644
--- a/libgloss/xstormy16/isatty.c
+++ b/libgloss/xstormy16/isatty.c
@@ -20,8 +20,7 @@
* serial port, we'll say yes and return a 1.
*/
int
-_DEFUN (_isatty, (fd),
- int fd)
+_isatty (int fd)
{
return (1);
}
diff --git a/libgloss/xstormy16/kill.c b/libgloss/xstormy16/kill.c
index 2374dc29d..f5ccd2191 100644
--- a/libgloss/xstormy16/kill.c
+++ b/libgloss/xstormy16/kill.c
@@ -18,8 +18,7 @@
* kill -- go out via exit...
*/
int
-_DEFUN (_kill, (pid, sig),
- int pid,
+_kill (int pid,
int sig)
{
if(pid == __MYPID)
diff --git a/libgloss/xstormy16/lseek.c b/libgloss/xstormy16/lseek.c
index 11dbab08e..c00665723 100644
--- a/libgloss/xstormy16/lseek.c
+++ b/libgloss/xstormy16/lseek.c
@@ -20,8 +20,7 @@
* lseek -- Since a serial port is non-seekable, we return an error.
*/
off_t
-_DEFUN (_lseek, (fd, offset, whence),
- int fd,
+_lseek (int fd,
off_t offset,
int whence)
{
diff --git a/libgloss/xstormy16/open.c b/libgloss/xstormy16/open.c
index 600f92982..f96484c7b 100644
--- a/libgloss/xstormy16/open.c
+++ b/libgloss/xstormy16/open.c
@@ -20,8 +20,7 @@
* we return an error.
*/
int
-_DEFUN (_open, (buf, flags, mode),
- const char *buf,
+_open (const char *buf,
int flags,
int mode)
{
diff --git a/libgloss/xstormy16/stat.c b/libgloss/xstormy16/stat.c
index b80b83c6c..7d089edfa 100644
--- a/libgloss/xstormy16/stat.c
+++ b/libgloss/xstormy16/stat.c
@@ -20,8 +20,7 @@
* stat -- Since we have no file system, we just return an error.
*/
int
-_DEFUN (_stat, (path, buf),
- const char *path,
+_stat (const char *path,
struct stat *buf)
{
errno = EIO;
diff --git a/libgloss/xstormy16/unlink.c b/libgloss/xstormy16/unlink.c
index 1c56663ea..10180ac9b 100644
--- a/libgloss/xstormy16/unlink.c
+++ b/libgloss/xstormy16/unlink.c
@@ -20,8 +20,7 @@
* we just return an error.
*/
int
-_DEFUN (_unlink, (path),
- char * path)
+_unlink (char * path)
{
errno = EIO;
return (-1);
diff --git a/newlib/libc/argz/argz_add.c b/newlib/libc/argz/argz_add.c
index 3194f0851..a1a8d3d0e 100644
--- a/newlib/libc/argz/argz_add.c
+++ b/newlib/libc/argz/argz_add.c
@@ -11,8 +11,7 @@
#include <stdlib.h>
error_t
-_DEFUN (argz_add, (argz, argz_len, str),
- char **argz,
+argz_add (char **argz,
size_t *argz_len,
const char *str)
{
diff --git a/newlib/libc/argz/argz_add_sep.c b/newlib/libc/argz/argz_add_sep.c
index 92c73716d..f2964e672 100644
--- a/newlib/libc/argz/argz_add_sep.c
+++ b/newlib/libc/argz/argz_add_sep.c
@@ -11,8 +11,7 @@
#include <argz.h>
error_t
-_DEFUN (argz_add_sep, (argz, argz_len, str, sep),
- char **argz,
+argz_add_sep (char **argz,
size_t *argz_len,
const char *str,
int sep)
diff --git a/newlib/libc/argz/argz_append.c b/newlib/libc/argz/argz_append.c
index a84f8e0b9..de0cc82ce 100644
--- a/newlib/libc/argz/argz_append.c
+++ b/newlib/libc/argz/argz_append.c
@@ -11,8 +11,7 @@
#include <stdlib.h>
error_t
-_DEFUN (argz_append, (argz, argz_len, buf, buf_len),
- char **argz,
+argz_append (char **argz,
size_t *argz_len,
const char *buf,
size_t buf_len)
diff --git a/newlib/libc/argz/argz_count.c b/newlib/libc/argz/argz_count.c
index 33d0eecc2..4c0007ce2 100644
--- a/newlib/libc/argz/argz_count.c
+++ b/newlib/libc/argz/argz_count.c
@@ -10,8 +10,7 @@
#include <sys/types.h>
size_t
-_DEFUN (argz_count, (argz, argz_len),
- const char *argz,
+argz_count (const char *argz,
size_t argz_len)
{
int i;
diff --git a/newlib/libc/argz/argz_create.c b/newlib/libc/argz/argz_create.c
index d4b8b0592..4ab622d28 100644
--- a/newlib/libc/argz/argz_create.c
+++ b/newlib/libc/argz/argz_create.c
@@ -11,8 +11,7 @@
#include <stdlib.h>
error_t
-_DEFUN (argz_create, (argv, argz, argz_len),
- char *const argv[],
+argz_create (char *const argv[],
char **argz,
size_t *argz_len)
{
diff --git a/newlib/libc/argz/argz_create_sep.c b/newlib/libc/argz/argz_create_sep.c
index afff44c1e..bf578e6bb 100644
--- a/newlib/libc/argz/argz_create_sep.c
+++ b/newlib/libc/argz/argz_create_sep.c
@@ -11,8 +11,7 @@
#include <stdlib.h>
error_t
-_DEFUN (argz_create_sep, (string, sep, argz, argz_len),
- const char *string,
+argz_create_sep (const char *string,
int sep,
char **argz,
size_t *argz_len)
diff --git a/newlib/libc/argz/argz_delete.c b/newlib/libc/argz/argz_delete.c
index a4e12273d..aa1fe4c75 100644
--- a/newlib/libc/argz/argz_delete.c
+++ b/newlib/libc/argz/argz_delete.c
@@ -11,8 +11,7 @@
#include <stdlib.h>
error_t
-_DEFUN (argz_delete, (argz, argz_len, entry),
- char **argz,
+argz_delete (char **argz,
size_t *argz_len,
char *entry)
{
--git a/newlib/libc/argz/argz_extract.c b/newlib/libc/argz/argz_extract.c
index 4932de6a9..e97b76905 100644
--- a/newlib/libc/argz/argz_extract.c
+++ b/newlib/libc/argz/argz_extract.c
@@ -9,8 +9,7 @@
#include <sys/types.h>
void
-_DEFUN (argz_extract, (argz, argz_len, argv),
- char *argz,
+argz_extract (char *argz,
size_t argz_len,
char **argv)
{
diff --git a/newlib/libc/argz/argz_insert.c b/newlib/libc/argz/argz_insert.c
index 5965e04a6..abdfeb0ea 100644
--- a/newlib/libc/argz/argz_insert.c
+++ b/newlib/libc/argz/argz_insert.c
@@ -13,8 +13,7 @@
#include <stddef.h>
error_t
-_DEFUN (argz_insert, (argz, argz_len, before, entry),
- char **argz,
+argz_insert (char **argz,
size_t *argz_len,
char *before,
const char *entry)
diff --git a/newlib/libc/argz/argz_next.c b/newlib/libc/argz/argz_next.c
index 3f672217e..0d6f21d70 100644
--- a/newlib/libc/argz/argz_next.c
+++ b/newlib/libc/argz/argz_next.c
@@ -11,8 +11,7 @@
#include <stdlib.h>
char *
-_DEFUN (argz_next, (argz, argz_len, entry),
- char *argz,
+argz_next (char *argz,
size_t argz_len,
const char *entry)
{
diff --git a/newlib/libc/argz/argz_replace.c b/newlib/libc/argz/argz_replace.c
index e6c6ead3e..f2e0d52b7 100644
--- a/newlib/libc/argz/argz_replace.c
+++ b/newlib/libc/argz/argz_replace.c
@@ -13,8 +13,7 @@
#include "buf_findstr.h"
error_t
-_DEFUN (argz_replace, (argz, argz_len, str, with, replace_count),
- char **argz,
+argz_replace (char **argz,
size_t *argz_len,
const char *str,
const char *with,
diff --git a/newlib/libc/argz/argz_stringify.c b/newlib/libc/argz/argz_stringify.c
index 72895f5e7..98f6c9bc2 100644
--- a/newlib/libc/argz/argz_stringify.c
+++ b/newlib/libc/argz/argz_stringify.c
@@ -10,8 +10,7 @@
#include <sys/types.h>
void
-_DEFUN (argz_stringify, (argz, argz_len, sep),
- char *argz,
+argz_stringify (char *argz,
size_t argz_len,
int sep)
{
diff --git a/newlib/libc/argz/envz_add.c b/newlib/libc/argz/envz_add.c
index f01d09926..60ecf17bc 100644
--- a/newlib/libc/argz/envz_add.c
+++ b/newlib/libc/argz/envz_add.c
@@ -12,8 +12,7 @@
#include <envz.h>
error_t
-_DEFUN (envz_add, (envz, envz_len, name, value),
- char **envz,
+envz_add (char **envz,
size_t *envz_len,
const char *name,
const char *value)
diff --git a/newlib/libc/argz/envz_entry.c b/newlib/libc/argz/envz_entry.c
index bbe38529e..869c332ad 100644
--- a/newlib/libc/argz/envz_entry.c
+++ b/newlib/libc/argz/envz_entry.c
@@ -13,8 +13,7 @@
#include "buf_findstr.h"
char *
-_DEFUN (envz_entry, (envz, envz_len, name),
- const char *envz,
+envz_entry (const char *envz,
size_t envz_len,
const char *name)
{
diff --git a/newlib/libc/argz/envz_get.c b/newlib/libc/argz/envz_get.c
index 62d3d0cff..9863642c7 100644
--- a/newlib/libc/argz/envz_get.c
+++ b/newlib/libc/argz/envz_get.c
@@ -13,8 +13,7 @@
#include "buf_findstr.h"
char *
-_DEFUN (envz_get, (envz, envz_len, name),
- const char *envz,
+envz_get (const char *envz,
size_t envz_len,
const char *name)
{
diff --git a/newlib/libc/argz/envz_merge.c b/newlib/libc/argz/envz_merge.c
index 9299069e4..3be7c1fbc 100644
--- a/newlib/libc/argz/envz_merge.c
+++ b/newlib/libc/argz/envz_merge.c
@@ -12,8 +12,7 @@
#include <envz.h>
error_t
-_DEFUN (envz_merge, (envz, envz_len, envz2, envz2_len, override),
- char **envz,
+envz_merge (char **envz,
size_t *envz_len,
const char *envz2,
size_t envz2_len,
diff --git a/newlib/libc/argz/envz_remove.c b/newlib/libc/argz/envz_remove.c
index 2558656aa..8fc9e8f16 100644
--- a/newlib/libc/argz/envz_remove.c
+++ b/newlib/libc/argz/envz_remove.c
@@ -12,8 +12,7 @@
#include <envz.h>
void
-_DEFUN (envz_remove, (envz, envz_len, name),
- char **envz,
+envz_remove (char **envz,
size_t *envz_len,
const char *name)
{
diff --git a/newlib/libc/argz/envz_strip.c b/newlib/libc/argz/envz_strip.c
index 857f8492e..8efa5cbb5 100644
--- a/newlib/libc/argz/envz_strip.c
+++ b/newlib/libc/argz/envz_strip.c
@@ -12,8 +12,7 @@
#include <envz.h>
void
-_DEFUN (envz_strip, (envz, envz_len),
- char **envz,
+envz_strip (char **envz,
size_t *envz_len)
{
char *entry = 0;
diff --git a/newlib/libc/ctype/isalnum.c b/newlib/libc/ctype/isalnum.c
index ebb414c69..d926f97b7 100644
--- a/newlib/libc/ctype/isalnum.c
+++ b/newlib/libc/ctype/isalnum.c
@@ -44,7 +44,7 @@ No OS subroutines are required.
#undef isalnum
int
-_DEFUN(isalnum,(c),int c)
+isalnum (int c)
{
return(__CTYPE_PTR[c+1] & (_U|_L|_N));
}
diff --git a/newlib/libc/ctype/isalpha.c b/newlib/libc/ctype/isalpha.c
index 7a737a527..8b8e78a29 100644
--- a/newlib/libc/ctype/isalpha.c
+++ b/newlib/libc/ctype/isalpha.c
@@ -43,7 +43,7 @@ No supporting OS subroutines are required.
#undef isalpha
int
-_DEFUN(isalpha,(c),int c)
+isalpha (int c)
{
return(__CTYPE_PTR[c+1] & (_U|_L));
}
diff --git a/newlib/libc/ctype/isascii.c b/newlib/libc/ctype/isascii.c
index 71f299fa0..5adb81222 100644
--- a/newlib/libc/ctype/isascii.c
+++ b/newlib/libc/ctype/isascii.c
@@ -44,7 +44,7 @@ No supporting OS subroutines are required.
#undef isascii
int
-_DEFUN(isascii,(c),int c)
+isascii (int c)
{
return c >= 0 && c< 128;
}
diff --git a/newlib/libc/ctype/isblank.c b/newlib/libc/ctype/isblank.c
index e054b947c..0ebc2192c 100644
--- a/newlib/libc/ctype/isblank.c
+++ b/newlib/libc/ctype/isblank.c
@@ -42,7 +42,7 @@ No supporting OS subroutines are required.
#undef isblank
int
-_DEFUN(isblank,(c),int c)
+isblank (int c)
{
return ((__CTYPE_PTR[c+1] & _B) || (c == '\t'));
}
diff --git a/newlib/libc/ctype/iscntrl.c b/newlib/libc/ctype/iscntrl.c
index b57b71790..ebbdd7371 100644
--- a/newlib/libc/ctype/iscntrl.c
+++ b/newlib/libc/ctype/iscntrl.c
@@ -46,7 +46,7 @@ No supporting OS subroutines are required.
#undef iscntrl
int
-_DEFUN(iscntrl,(c),int c)
+iscntrl (int c)
{
return(__CTYPE_PTR[c+1] & _C);
}
diff --git a/newlib/libc/ctype/isdigit.c b/newlib/libc/ctype/isdigit.c
index 5cd411b65..a5c511964 100644
--- a/newlib/libc/ctype/isdigit.c
+++ b/newlib/libc/ctype/isdigit.c
@@ -45,7 +45,7 @@ No supporting OS subroutines are required.
#undef isdigit
int
-_DEFUN(isdigit,(c),int c)
+isdigit (int c)
{
return(__CTYPE_PTR[c+1] & _N);
}
diff --git a/newlib/libc/ctype/islower.c b/newlib/libc/ctype/islower.c
index a6fb889a1..2b3440489 100644
--- a/newlib/libc/ctype/islower.c
+++ b/newlib/libc/ctype/islower.c
@@ -43,7 +43,7 @@ No supporting OS subroutines are required.
#undef islower
int
-_DEFUN(islower,(c),int c)
+islower (int c)
{
return ((__CTYPE_PTR[c+1] & (_U|_L)) == _L);
}
diff --git a/newlib/libc/ctype/isprint.c b/newlib/libc/ctype/isprint.c
index afabe8b1d..e34fbe28a 100644
--- a/newlib/libc/ctype/isprint.c
+++ b/newlib/libc/ctype/isprint.c
@@ -57,7 +57,7 @@ No supporting OS subroutines are required.
#undef isgraph
int
-_DEFUN(isgraph,(c),int c)
+isgraph (int c)
{
return(__CTYPE_PTR[c+1] & (_P|_U|_L|_N));
}
@@ -65,7 +65,7 @@ _DEFUN(isgraph,(c),int c)
#undef isprint
int
-_DEFUN(isprint,(c),int c)
+isprint (int c)
{
return(__CTYPE_PTR[c+1] & (_P|_U|_L|_N|_B));
}
diff --git a/newlib/libc/ctype/ispunct.c b/newlib/libc/ctype/ispunct.c
index 83796dc1c..9c5a3fcca 100644
--- a/newlib/libc/ctype/ispunct.c
+++ b/newlib/libc/ctype/ispunct.c
@@ -45,7 +45,7 @@ No supporting OS subroutines are required.
#undef ispunct
int
-_DEFUN(ispunct,(c),int c)
+ispunct (int c)
{
return(__CTYPE_PTR[c+1] & _P);
}
diff --git a/newlib/libc/ctype/isspace.c b/newlib/libc/ctype/isspace.c
index 68dc5cb1d..0def2c0ce 100644
--- a/newlib/libc/ctype/isspace.c
+++ b/newlib/libc/ctype/isspace.c
@@ -44,7 +44,7 @@ No supporting OS subroutines are required.
#undef isspace
int
-_DEFUN(isspace,(c),int c)
+isspace (int c)
{
return(__CTYPE_PTR[c+1] & _S);
}
diff --git a/newlib/libc/ctype/isupper.c b/newlib/libc/ctype/isupper.c
index 10fa230bd..aeed383ec 100644
--- a/newlib/libc/ctype/isupper.c
+++ b/newlib/libc/ctype/isupper.c
@@ -41,7 +41,7 @@ No supporting OS subroutines are required.
#undef isupper
int
-_DEFUN(isupper,(c),int c)
+isupper (int c)
{
return ((__CTYPE_PTR[c+1] & (_U|_L)) == _U);
}
diff --git a/newlib/libc/ctype/iswalnum.c b/newlib/libc/ctype/iswalnum.c
index d9295434d..45273a8b2 100644
--- a/newlib/libc/ctype/iswalnum.c
+++ b/newlib/libc/ctype/iswalnum.c
@@ -37,7 +37,7 @@ No supporting OS subroutines are required.
#include <wctype.h>
int
-_DEFUN(iswalnum,(c),wint_t c)
+iswalnum (wint_t c)
{
return (iswalpha (c) || iswdigit (c));
}
diff --git a/newlib/libc/ctype/iswalpha.c b/newlib/libc/ctype/iswalpha.c
index 973aa09b4..2906cd12a 100644
--- a/newlib/libc/ctype/iswalpha.c
+++ b/newlib/libc/ctype/iswalpha.c
@@ -74,7 +74,7 @@ No supporting OS subroutines are required.
#endif /* _MB_CAPABLE */
int
-_DEFUN(iswalpha,(c), wint_t c)
+iswalpha (wint_t c)
{
#ifdef _MB_CAPABLE
unsigned const char *table;
diff --git a/newlib/libc/ctype/iswblank.c b/newlib/libc/ctype/iswblank.c
index b83683d94..ef91572cd 100644
--- a/newlib/libc/ctype/iswblank.c
+++ b/newlib/libc/ctype/iswblank.c
@@ -69,7 +69,7 @@ No supporting OS subroutines are required.
#include "local.h"
int
-_DEFUN(iswblank,(c), wint_t c)
+iswblank (wint_t c)
{
#ifdef _MB_CAPABLE
c = _jp2uc (c);
diff --git a/newlib/libc/ctype/iswcntrl.c b/newlib/libc/ctype/iswcntrl.c
index c96ed343a..249a0a811 100644
--- a/newlib/libc/ctype/iswcntrl.c
+++ b/newlib/libc/ctype/iswcntrl.c
@@ -69,7 +69,7 @@ No supporting OS subroutines are required.
#include "local.h"
int
-_DEFUN(iswcntrl,(c), wint_t c)
+iswcntrl (wint_t c)
{
#ifdef _MB_CAPABLE
c = _jp2uc (c);
diff --git a/newlib/libc/ctype/iswctype.c b/newlib/libc/ctype/iswctype.c
index 89c0f9a31..027cb8ae3 100644
--- a/newlib/libc/ctype/iswctype.c
+++ b/newlib/libc/ctype/iswctype.c
@@ -38,7 +38,7 @@ No supporting OS subroutines are required.
#include "local.h"
int
-_DEFUN(iswctype,(c, desc), wint_t c, wctype_t desc)
+iswctype (wint_t c, wctype_t desc)
{
switch (desc)
{
diff --git a/newlib/libc/ctype/iswdigit.c b/newlib/libc/ctype/iswdigit.c
index 7926f8dc2..2b2614135 100644
--- a/newlib/libc/ctype/iswdigit.c
+++ b/newlib/libc/ctype/iswdigit.c
@@ -36,7 +36,7 @@ No supporting OS subroutines are required.
#include <wctype.h>
int
-_DEFUN(iswdigit,(c), wint_t c)
+iswdigit (wint_t c)
{
return (c >= (wint_t)'0' && c <= (wint_t)'9');
}
diff --git a/newlib/libc/ctype/iswgraph.c b/newlib/libc/ctype/iswgraph.c
index 90e1f97fa..e0df4aa3f 100644
--- a/newlib/libc/ctype/iswgraph.c
+++ b/newlib/libc/ctype/iswgraph.c
@@ -65,7 +65,7 @@ No supporting OS subroutines are required.
#include <wctype.h>
int
-_DEFUN(iswgraph,(c),wint_t c)
+iswgraph (wint_t c)
{
return (iswprint (c) && !iswspace (c));
}
diff --git a/newlib/libc/ctype/iswlower.c b/newlib/libc/ctype/iswlower.c
index 19cfdc420..8b38835f3 100644
--- a/newlib/libc/ctype/iswlower.c
+++ b/newlib/libc/ctype/iswlower.c
@@ -36,7 +36,7 @@ No supporting OS subroutines are required.
#include <wctype.h>
int
-_DEFUN(iswlower,(c),wint_t c)
+iswlower (wint_t c)
{
return (towupper (c) != c);
}
diff --git a/newlib/libc/ctype/iswprint.c b/newlib/libc/ctype/iswprint.c
index 51a50019b..c6050b502 100644
--- a/newlib/libc/ctype/iswprint.c
+++ b/newlib/libc/ctype/iswprint.c
@@ -73,7 +73,7 @@ No supporting OS subroutines are required.
#endif /* _MB_CAPABLE */
int
-_DEFUN(iswprint,(c), wint_t c)
+iswprint (wint_t c)
{
#ifdef _MB_CAPABLE
unsigned const char *table;
diff --git a/newlib/libc/ctype/iswpunct.c b/newlib/libc/ctype/iswpunct.c
index b1069a202..8ab703846 100644
--- a/newlib/libc/ctype/iswpunct.c
+++ b/newlib/libc/ctype/iswpunct.c
@@ -69,7 +69,7 @@ No supporting OS subroutines are required.
#include "local.h"
int
-_DEFUN(iswpunct,(c), wint_t c)
+iswpunct (wint_t c)
{
return (!iswalnum (c) && iswgraph (c));
}
diff --git a/newlib/libc/ctype/iswspace.c b/newlib/libc/ctype/iswspace.c
index d6ba3e97d..ae3841aa5 100644
--- a/newlib/libc/ctype/iswspace.c
+++ b/newlib/libc/ctype/iswspace.c
@@ -69,7 +69,7 @@ No supporting OS subroutines are required.
#include "local.h"
int
-_DEFUN(iswspace,(c), wint_t c)
+iswspace (wint_t c)
{
#ifdef _MB_CAPABLE
c = _jp2uc (c);
diff --git a/newlib/libc/ctype/iswupper.c b/newlib/libc/ctype/iswupper.c
index 49f009346..c4969a3ec 100644
--- a/newlib/libc/ctype/iswupper.c
+++ b/newlib/libc/ctype/iswupper.c
@@ -36,7 +36,7 @@ No supporting OS subroutines are required.
#include <wctype.h>
int
-_DEFUN(iswupper,(c),wint_t c)
+iswupper (wint_t c)
{
return (towlower (c) != c);
}
diff --git a/newlib/libc/ctype/iswxdigit.c b/newlib/libc/ctype/iswxdigit.c
index 3f47962f1..436718642 100644
--- a/newlib/libc/ctype/iswxdigit.c
+++ b/newlib/libc/ctype/iswxdigit.c
@@ -36,7 +36,7 @@ No supporting OS subroutines are required.
#include <wctype.h>
int
-_DEFUN(iswxdigit,(c), wint_t c)
+iswxdigit (wint_t c)
{
return ((c >= (wint_t)'0' && c <= (wint_t)'9') ||
(c >= (wint_t)'a' && c <= (wint_t)'f') ||
diff --git a/newlib/libc/ctype/isxdigit.c b/newlib/libc/ctype/isxdigit.c
index f5e858c94..2bfe18dbf 100644
--- a/newlib/libc/ctype/isxdigit.c
+++ b/newlib/libc/ctype/isxdigit.c
@@ -44,7 +44,7 @@ No supporting OS subroutines are required.
#undef isxdigit
int
-_DEFUN(isxdigit,(c),int c)
+isxdigit (int c)
{
return(__CTYPE_PTR[c+1] & ((_X)|(_N)));
}
diff --git a/newlib/libc/ctype/jp2uc.c b/newlib/libc/ctype/jp2uc.c
index 8fbd1b083..29eec0ff5 100644
--- a/newlib/libc/ctype/jp2uc.c
+++ b/newlib/libc/ctype/jp2uc.c
@@ -48,7 +48,7 @@
#define JP_EUCJP 3
static wint_t
-_DEFUN (__jp2uc, (c, type), wint_t c, int type)
+__jp2uc (wint_t c, int type)
{
int index, adj;
unsigned char byte1, byte2;
@@ -152,7 +152,7 @@ _DEFUN (__jp2uc, (c, type), wint_t c, int type)
}
wint_t
-_DEFUN (_jp2uc, (c), wint_t c)
+_jp2uc (wint_t c)
{
if (!strcmp (__current_locale_charset (), "JIS"))
c = __jp2uc (c, JP_JIS);
diff --git a/newlib/libc/ctype/toascii.c b/newlib/libc/ctype/toascii.c
index 450e231a3..de5b8e1c3 100644
--- a/newlib/libc/ctype/toascii.c
+++ b/newlib/libc/ctype/toascii.c
@@ -41,7 +41,7 @@ No supporting OS subroutines are required.
#undef toascii
int
-_DEFUN(toascii,(c),int c)
+toascii (int c)
{
return (c)&0177;
}
diff --git a/newlib/libc/ctype/tolower.c b/newlib/libc/ctype/tolower.c
index 5ebd3cd96..aae2ce09e 100644
--- a/newlib/libc/ctype/tolower.c
+++ b/newlib/libc/ctype/tolower.c
@@ -62,7 +62,7 @@ No supporting OS subroutines are required.
#undef tolower
int
-_DEFUN(tolower,(c),int c)
+tolower (int c)
{
#if defined (_MB_EXTENDED_CHARSETS_ISO) || defined (_MB_EXTENDED_CHARSETS_WINDOWS)
if ((unsigned char) c <= 0x7f)
diff --git a/newlib/libc/ctype/toupper.c b/newlib/libc/ctype/toupper.c
index d9089a95b..61951b00b 100644
--- a/newlib/libc/ctype/toupper.c
+++ b/newlib/libc/ctype/toupper.c
@@ -62,7 +62,7 @@ No supporting OS subroutines are required.
#undef toupper
int
-_DEFUN(toupper,(c),int c)
+toupper (int c)
{
#if defined (_MB_EXTENDED_CHARSETS_ISO) || defined (_MB_EXTENDED_CHARSETS_WINDOWS)
if ((unsigned char) c <= 0x7f)
diff --git a/newlib/libc/ctype/towctrans.c b/newlib/libc/ctype/towctrans.c
index 3500cbaac..edbdfce41 100644
--- a/newlib/libc/ctype/towctrans.c
+++ b/newlib/libc/ctype/towctrans.c
@@ -76,8 +76,7 @@ No supporting OS subroutines are required.
#include "local.h"
wint_t
-_DEFUN (_towctrans_r, (r, c, w),
- struct _reent *r,
+_towctrans_r (struct _reent *r,
wint_t c,
wctrans_t w)
{
@@ -94,8 +93,7 @@ _DEFUN (_towctrans_r, (r, c, w),
#ifndef _REENT_ONLY
wint_t
-_DEFUN (towctrans, (c, w),
- wint_t c,
+towctrans (wint_t c,
wctrans_t w)
{
return _towctrans_r (_REENT, c, w);
diff --git a/newlib/libc/ctype/towlower.c b/newlib/libc/ctype/towlower.c
index 4485fdef4..db390dbdf 100644
--- a/newlib/libc/ctype/towlower.c
+++ b/newlib/libc/ctype/towlower.c
@@ -73,7 +73,7 @@ No supporting OS subroutines are required.
#include "local.h"
wint_t
-_DEFUN(towlower,(c), wint_t c)
+towlower (wint_t c)
{
#ifdef _MB_CAPABLE
c = _jp2uc (c);
diff --git a/newlib/libc/ctype/towupper.c b/newlib/libc/ctype/towupper.c
index 06d12ea99..306f72bd5 100644
--- a/newlib/libc/ctype/towupper.c
+++ b/newlib/libc/ctype/towupper.c
@@ -73,7 +73,7 @@ No supporting OS subroutines are required.
#include "local.h"
wint_t
-_DEFUN(towupper,(c), wint_t c)
+towupper (wint_t c)
{
#ifdef _MB_CAPABLE
c = _jp2uc (c);
diff --git a/newlib/libc/ctype/wctrans.c b/newlib/libc/ctype/wctrans.c
index 7183c45ca..4a58df152 100644
--- a/newlib/libc/ctype/wctrans.c
+++ b/newlib/libc/ctype/wctrans.c
@@ -75,8 +75,7 @@ No supporting OS subroutines are required.
#include "local.h"
wctrans_t
-_DEFUN (_wctrans_r, (r, c),
- struct _reent *r,
+_wctrans_r (struct _reent *r,
const char *c)
{
if (!strcmp (c, "tolower"))
@@ -92,8 +91,7 @@ _DEFUN (_wctrans_r, (r, c),
#ifndef _REENT_ONLY
wctrans_t
-_DEFUN (wctrans, (c),
- const char *c)
+wctrans (const char *c)
{
return _wctrans_r (_REENT, c);
}
diff --git a/newlib/libc/ctype/wctype.c b/newlib/libc/ctype/wctype.c
index 6cd9425bc..5f2ae7a25 100644
--- a/newlib/libc/ctype/wctype.c
+++ b/newlib/libc/ctype/wctype.c
@@ -76,8 +76,7 @@ No supporting OS subroutines are required.
#include "local.h"
wctype_t
-_DEFUN (_wctype_r, (r, c),
- struct _reent *r,
+_wctype_r (struct _reent *r,
const char *c)
{
switch (*c)
@@ -135,8 +134,7 @@ _DEFUN (_wctype_r, (r, c),
#ifndef _REENT_ONLY
wctype_t
-_DEFUN (wctype, (c),
- const char *c)
+wctype (const char *c)
{
return _wctype_r (_REENT, c);
}
diff --git a/newlib/libc/iconv/ces/euc.c b/newlib/libc/iconv/ces/euc.c
index fb0a50e90..29d36f941 100644
--- a/newlib/libc/iconv/ces/euc.c
+++ b/newlib/libc/iconv/ces/euc.c
@@ -101,8 +101,7 @@ static euc_cs_desc_t euc_kr_cs_desc [] =
#if defined (ICONV_FROM_UCS_CES_EUC)
static void *
-_DEFUN(euc_from_ucs_init, (rptr, encoding),
- struct _reent *rptr,
+euc_from_ucs_init (struct _reent *rptr,
const char *encoding)
{
int i;
@@ -165,8 +164,7 @@ error1:
}
static size_t
-_DEFUN(euc_from_ucs_close, (rptr, data),
- struct _reent *rptr,
+euc_from_ucs_close (struct _reent *rptr,
void *data)
{
int i;
@@ -185,8 +183,7 @@ _DEFUN(euc_from_ucs_close, (rptr, data),
}
static size_t
-_DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
- void *data,
+euc_convert_from_ucs (void *data,
register ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -261,8 +258,7 @@ _DEFUN(euc_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_EUC)
static void *
-_DEFUN(euc_to_ucs_init, (rptr, encoding),
- struct _reent *rptr,
+euc_to_ucs_init (struct _reent *rptr,
const char *encoding)
{
int i;
@@ -325,8 +321,7 @@ error1:
}
static size_t
-_DEFUN(euc_to_ucs_close, (rptr, data),
- struct _reent *rptr,
+euc_to_ucs_close (struct _reent *rptr,
void *data)
{
int i;
@@ -345,8 +340,7 @@ _DEFUN(euc_to_ucs_close, (rptr, data),
}
static ucs4_t
-_DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
- void *data,
+euc_convert_to_ucs (void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -432,8 +426,7 @@ _DEFUN(euc_convert_to_ucs, (data, inbuf, inbytesleft),
#endif /* ICONV_TO_UCS_CES_EUC */
static int
-_DEFUN(euc_get_mb_cur_max, (data),
- void *data)
+euc_get_mb_cur_max (void *data)
{
return ((euc_data_t *)data)->mb_cur_max;
}
diff --git a/newlib/libc/iconv/ces/table-pcs.c b/newlib/libc/iconv/ces/table-pcs.c
index 77b820bae..45cfe6267 100644
--- a/newlib/libc/iconv/ces/table-pcs.c
+++ b/newlib/libc/iconv/ces/table-pcs.c
@@ -40,8 +40,7 @@
#if defined (ICONV_FROM_UCS_CES_TABLE_PCS)
static size_t
-_DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
- void *data,
+table_pcs_convert_from_ucs (void *data,
ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -65,24 +64,21 @@ _DEFUN(table_pcs_convert_from_ucs, (data, in, outbuf, outbytesleft),
}
static void *
-_DEFUN(table_pcs_from_ucs_init, (rptr, encoding),
- struct _reent *rptr,
+table_pcs_from_ucs_init (struct _reent *rptr,
const char *encoding)
{
return _iconv_from_ucs_ces_handlers_table.init (rptr, encoding);
}
static size_t
-_DEFUN(table_pcs_from_ucs_close, (rptr, data),
- struct _reent *rptr,
+table_pcs_from_ucs_close (struct _reent *rptr,
void *data)
{
return _iconv_from_ucs_ces_handlers_table.close (rptr, data);
}
static int
-_DEFUN(table_pcs_from_ucs_get_mb_cur_max, (data),
- void *data)
+table_pcs_from_ucs_get_mb_cur_max (void *data)
{
return _iconv_from_ucs_ces_handlers_table.get_mb_cur_max (data);
}
@@ -91,8 +87,7 @@ _DEFUN(table_pcs_from_ucs_get_mb_cur_max, (data),
#if defined (ICONV_TO_UCS_CES_TABLE_PCS)
static ucs4_t
-_DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
- void *data,
+table_pcs_convert_to_ucs (void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -113,24 +108,21 @@ _DEFUN(table_pcs_convert_to_ucs, (data, inbuf, inbytesleft),
}
static void *
-_DEFUN(table_pcs_to_ucs_init, (rptr, encoding),
- struct _reent *rptr,
+table_pcs_to_ucs_init (struct _reent *rptr,
const char *encoding)
{
return _iconv_to_ucs_ces_handlers_table.init (rptr, encoding);
}
static size_t
-_DEFUN(table_pcs_to_ucs_close, (rptr, data),
- struct _reent *rptr,
+table_pcs_to_ucs_close (struct _reent *rptr,
void *data)
{
return _iconv_to_ucs_ces_handlers_table.close (rptr, data);
}
static int
-_DEFUN(table_pcs_to_ucs_get_mb_cur_max, (data),
- void *data)
+table_pcs_to_ucs_get_mb_cur_max (void *data)
{
return _iconv_to_ucs_ces_handlers_table.get_mb_cur_max (data);
}
diff --git a/newlib/libc/iconv/ces/table.c b/newlib/libc/iconv/ces/table.c
index 969c0944b..2b844d558 100644
--- a/newlib/libc/iconv/ces/table.c
+++ b/newlib/libc/iconv/ces/table.c
@@ -74,8 +74,7 @@ _EXFUN(load_file, (struct _reent *rptr, const char *name, int direction));
* Interface data and functions implementation.
*/
static size_t
-_DEFUN(table_close, (rptr, data),
- struct _reent *rptr,
+table_close (struct _reent *rptr,
void *data)
{
const iconv_ccs_desc_t *ccsp = (iconv_ccs_desc_t *)data;
@@ -89,8 +88,7 @@ _DEFUN(table_close, (rptr, data),
#if defined (ICONV_FROM_UCS_CES_TABLE)
static void *
-_DEFUN(table_init_from_ucs, (rptr, encoding),
- struct _reent *rptr,
+table_init_from_ucs (struct _reent *rptr,
const char *encoding)
{
int i;
@@ -127,8 +125,7 @@ _DEFUN(table_init_from_ucs, (rptr, encoding),
}
static size_t
-_DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
- void *data,
+table_convert_from_ucs (void *data,
ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -172,8 +169,7 @@ _DEFUN(table_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_TABLE)
static void *
-_DEFUN(table_init_to_ucs, (rptr, encoding),
- struct _reent *rptr,
+table_init_to_ucs (struct _reent *rptr,
const char *encoding)
{
int i;
@@ -210,8 +206,7 @@ _DEFUN(table_init_to_ucs, (rptr, encoding),
}
static ucs4_t
-_DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
- void *data,
+table_convert_to_ucs (void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -253,8 +248,7 @@ _DEFUN(table_convert_to_ucs, (data, inbuf, inbytesleft),
#endif /* ICONV_TO_UCS_CES_TABLE */
static int
-_DEFUN(table_get_mb_cur_max, (data),
- void *data)
+table_get_mb_cur_max (void *data)
{
return ((iconv_ccs_desc_t *)data)->bits/8;
}
@@ -303,8 +297,7 @@ _iconv_from_ucs_ces_handlers_table =
* Code that corresponds to 'code'.
*/
static __inline ucs2_t
-_DEFUN(find_code_speed, (code, tblp),
- ucs2_t code,
+find_code_speed (ucs2_t code,
const __uint16_t *tblp)
{
int idx = tblp[code >> 8];
@@ -326,8 +319,7 @@ _DEFUN(find_code_speed, (code, tblp),
* Code that corresponds to 'code'.
*/
static __inline ucs2_t
-_DEFUN(find_code_speed_8bit, (code, tblp),
- ucs2_t code,
+find_code_speed_8bit (ucs2_t code,
const unsigned char *tblp)
{
int idx;
@@ -366,8 +358,7 @@ _DEFUN(find_code_speed_8bit, (code, tblp),
* Code that corresponds to 'code'.
*/
static ucs2_t
-_DEFUN(find_code_size, (code, tblp),
- ucs2_t code,
+find_code_size (ucs2_t code,
const __uint16_t *tblp)
{
int first, last, cur, center;
@@ -460,8 +451,7 @@ _DEFUN(find_code_size, (code, tblp),
* iconv_ccs_desc_t * pointer is success, NULL if failure.
*/
static const iconv_ccs_desc_t *
-_DEFUN(load_file, (rptr, name, direction),
- struct _reent *rptr,
+load_file (struct _reent *rptr,
const char *name,
int direction)
{
diff --git a/newlib/libc/iconv/ces/ucs-2-internal.c b/newlib/libc/iconv/ces/ucs-2-internal.c
index 2c9169473..3473444cf 100644
--- a/newlib/libc/iconv/ces/ucs-2-internal.c
+++ b/newlib/libc/iconv/ces/ucs-2-internal.c
@@ -44,8 +44,7 @@
#if defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
static size_t
-_DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
- void *data,
+ucs_2_internal_convert_from_ucs (void *data,
register ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -66,8 +65,7 @@ _DEFUN(ucs_2_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL)
static ucs4_t
-_DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft),
- void *data,
+ucs_2_internal_convert_to_ucs (void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -89,8 +87,7 @@ _DEFUN(ucs_2_internal_convert_to_ucs, (data, inbuf, inbytesleft),
#endif /* ICONV_TO_UCS_CES_UCS_2_INTERNAL */
static int
-_DEFUN(ucs_2_internal_get_mb_cur_max, (data),
- void *data)
+ucs_2_internal_get_mb_cur_max (void *data)
{
return 2;
}
diff --git a/newlib/libc/iconv/ces/ucs-2.c b/newlib/libc/iconv/ces/ucs-2.c
index a99562eec..5e965b080 100644
--- a/newlib/libc/iconv/ces/ucs-2.c
+++ b/newlib/libc/iconv/ces/ucs-2.c
@@ -50,8 +50,7 @@
#define UCS_2LE "ucs_2le"
static void *
-_DEFUN(ucs_2_init, (rptr, encoding),
- struct _reent *rptr,
+ucs_2_init (struct _reent *rptr,
const char *encoding)
{
int *data;
@@ -68,8 +67,7 @@ _DEFUN(ucs_2_init, (rptr, encoding),
}
static size_t
-_DEFUN(ucs_2_close, (rptr, data),
- struct _reent *rptr,
+ucs_2_close (struct _reent *rptr,
void *data)
{
_free_r (rptr, data);
@@ -78,8 +76,7 @@ _DEFUN(ucs_2_close, (rptr, data),
#if defined (ICONV_FROM_UCS_CES_UCS_2)
static size_t
-_DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
- void *data,
+ucs_2_convert_from_ucs (void *data,
ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -105,8 +102,7 @@ _DEFUN(ucs_2_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UCS_2)
static ucs4_t
-_DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft),
- void *data,
+ucs_2_convert_to_ucs (void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -132,8 +128,7 @@ _DEFUN(ucs_2_convert_to_ucs, (data, inbuf, inbytesleft),
#endif /* ICONV_TO_UCS_CES_UCS_2 */
static int
-_DEFUN(ucs_2_get_mb_cur_max, (data),
- void *data)
+ucs_2_get_mb_cur_max (void *data)
{
return 2;
}
diff --git a/newlib/libc/iconv/ces/ucs-4-internal.c b/newlib/libc/iconv/ces/ucs-4-internal.c
index a5c6d7e09..d10952c55 100644
--- a/newlib/libc/iconv/ces/ucs-4-internal.c
+++ b/newlib/libc/iconv/ces/ucs-4-internal.c
@@ -44,8 +44,7 @@
#if defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
static size_t
-_DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
- void *data,
+ucs_4_internal_convert_from_ucs (void *data,
register ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -66,8 +65,7 @@ _DEFUN(ucs_4_internal_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL)
static ucs4_t
-_DEFUN(ucs_4_internal_convert_to_ucs, (data, inbuf, inbytesleft),
- void *data,
+ucs_4_internal_convert_to_ucs (void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -89,8 +87,7 @@ _DEFUN(ucs_4_internal_convert_to_ucs, (data, inbuf, inbytesleft),
#endif /* ICONV_TO_UCS_CES_UCS_4_INTERNAL */
static int
-_DEFUN(ucs_4_internal_get_mb_cur_max, (data),
- void *data)
+ucs_4_internal_get_mb_cur_max (void *data)
{
return 2;
}
diff --git a/newlib/libc/iconv/ces/ucs-4.c b/newlib/libc/iconv/ces/ucs-4.c
index 0009981fe..290cc71f8 100644
--- a/newlib/libc/iconv/ces/ucs-4.c
+++ b/newlib/libc/iconv/ces/ucs-4.c
@@ -51,8 +51,7 @@
#define UCS_4LE "ucs_4le"
static void *
-_DEFUN(ucs_4_init, (rptr, encoding),
- struct _reent *rptr,
+ucs_4_init (struct _reent *rptr,
const char *encoding)
{
int *data;
@@ -69,8 +68,7 @@ _DEFUN(ucs_4_init, (rptr, encoding),
}
static size_t
-_DEFUN(ucs_4_close, (rptr, data),
- struct _reent *rptr,
+ucs_4_close (struct _reent *rptr,
void *data)
{
_free_r(rptr, data);
@@ -80,8 +78,7 @@ _DEFUN(ucs_4_close, (rptr, data),
#if defined (ICONV_FROM_UCS_CES_UCS_4)
static size_t
-_DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft),
- void *data,
+ucs_4_convert_from_ucs (void *data,
ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -107,8 +104,7 @@ _DEFUN(ucs_4_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UCS_4)
static ucs4_t
-_DEFUN(ucs_4_convert_to_ucs, (data, inbuf, inbytesleft),
- void *data,
+ucs_4_convert_to_ucs (void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -134,8 +130,7 @@ _DEFUN(ucs_4_convert_to_ucs, (data, inbuf, inbytesleft),
#endif /* ICONV_TO_UCS_CES_UCS_4 */
static int
-_DEFUN(ucs_4_get_mb_cur_max, (data),
- void *data)
+ucs_4_get_mb_cur_max (void *data)
{
return 4;
}
diff --git a/newlib/libc/iconv/ces/us-ascii.c b/newlib/libc/iconv/ces/us-ascii.c
index e6a665070..164679178 100644
--- a/newlib/libc/iconv/ces/us-ascii.c
+++ b/newlib/libc/iconv/ces/us-ascii.c
@@ -40,8 +40,7 @@
#if defined (ICONV_FROM_UCS_CES_US_ASCII)
static size_t
-_DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
- void *data,
+us_ascii_convert_from_ucs (void *data,
ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -60,8 +59,7 @@ _DEFUN(us_ascii_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_US_ASCII)
static ucs4_t
-_DEFUN(us_ascii_convert_to_ucs, (data, inbuf, inbytesleft),
- void *data,
+us_ascii_convert_to_ucs (void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -83,8 +81,7 @@ _DEFUN(us_ascii_convert_to_ucs, (data, inbuf, inbytesleft),
#endif /* ICONV_TO_UCS_CES_US_ASCII */
static int
-_DEFUN(us_ascii_get_mb_cur_max, (data),
- void *data)
+us_ascii_get_mb_cur_max (void *data)
{
return 2;
}
diff --git a/newlib/libc/iconv/ces/utf-16.c b/newlib/libc/iconv/ces/utf-16.c
index dd62a5dea..a3491bb3c 100644
--- a/newlib/libc/iconv/ces/utf-16.c
+++ b/newlib/libc/iconv/ces/utf-16.c
@@ -58,8 +58,7 @@
#define UTF_16LE "utf_16le"
static size_t
-_DEFUN(utf_16_close, (rptr, data),
- struct _reent *rptr,
+utf_16_close (struct _reent *rptr,
void *data)
{
_free_r(rptr, data);
@@ -68,8 +67,7 @@ _DEFUN(utf_16_close, (rptr, data),
#if defined (ICONV_FROM_UCS_CES_UTF_16)
static void *
-_DEFUN(utf_16_init_from_ucs, (rptr, encoding),
- struct _reent *rptr,
+utf_16_init_from_ucs (struct _reent *rptr,
const char *encoding)
{
int *data;
@@ -88,8 +86,7 @@ _DEFUN(utf_16_init_from_ucs, (rptr, encoding),
}
static size_t
-_DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
- void *data,
+utf_16_convert_from_ucs (void *data,
register ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -170,8 +167,7 @@ _DEFUN(utf_16_convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UTF_16)
static void *
-_DEFUN(utf_16_init_to_ucs, (rptr, encoding),
- struct _reent *rptr,
+utf_16_init_to_ucs (struct _reent *rptr,
const char *encoding)
{
int *data;
@@ -190,8 +186,7 @@ _DEFUN(utf_16_init_to_ucs, (rptr, encoding),
}
static ucs4_t
-_DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
- void *data,
+utf_16_convert_to_ucs (void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -268,8 +263,7 @@ _DEFUN(utf_16_convert_to_ucs, (data, inbuf, inbytesleft),
#endif /* ICONV_TO_UCS_CES_UTF_16 */
static int
-_DEFUN(utf_16_get_mb_cur_max, (data),
- void *data)
+utf_16_get_mb_cur_max (void *data)
{
return 6;
}
diff --git a/newlib/libc/iconv/ces/utf-8.c b/newlib/libc/iconv/ces/utf-8.c
index 5559272d7..116f25925 100644
--- a/newlib/libc/iconv/ces/utf-8.c
+++ b/newlib/libc/iconv/ces/utf-8.c
@@ -43,8 +43,7 @@
#if defined (ICONV_FROM_UCS_CES_UTF_8)
static size_t
-_DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
- void *data,
+convert_from_ucs (void *data,
register ucs4_t in,
unsigned char **outbuf,
size_t *outbytesleft)
@@ -125,8 +124,7 @@ _DEFUN(convert_from_ucs, (data, in, outbuf, outbytesleft),
#if defined (ICONV_TO_UCS_CES_UTF_8)
static ucs4_t
-_DEFUN(convert_to_ucs, (data, inbuf, inbytesleft),
- void *data,
+convert_to_ucs (void *data,
const unsigned char **inbuf,
size_t *inbytesleft)
{
@@ -259,8 +257,7 @@ _DEFUN(convert_to_ucs, (data, inbuf, inbytesleft),
#endif /* ICONV_TO_UCS_CES_UTF_8 */
static int
-_DEFUN(get_mb_cur_max, (data),
- void *data)
+get_mb_cur_max (void *data)
{
return UTF8_MB_CUR_MAX;
}
diff --git a/newlib/libc/iconv/lib/aliasesi.c b/newlib/libc/iconv/lib/aliasesi.c
index 7c932e65c..d04cebb57 100644
--- a/newlib/libc/iconv/lib/aliasesi.c
+++ b/newlib/libc/iconv/lib/aliasesi.c
@@ -48,8 +48,7 @@
* Returns canonical form of 'str' if success, NULL if failure.
*/
static const char *
-_DEFUN(canonical_form, (rptr, str),
- struct _reent *rptr,
+canonical_form (struct _reent *rptr,
const char *str)
{
char *p, *p1;
@@ -93,8 +92,7 @@ _DEFUN(canonical_form, (rptr, str),
* and sets current thread's/process's errno.
*/
static char *
-_DEFUN(find_alias, (rptr, alias, table, len),
- struct _reent *rptr,
+find_alias (struct _reent *rptr,
const char *alias,
const char *table,
int len)
@@ -147,8 +145,7 @@ search_again:
* and sets current thread's/process's errno.
*/
char *
-_DEFUN(_iconv_resolve_encoding_name, (rptr, cname, path),
- struct _reent *rptr,
+_iconv_resolve_encoding_name (struct _reent *rptr,
const char *ca)
{
char *p = (char *)ca;
diff --git a/newlib/libc/iconv/lib/iconv.c b/newlib/libc/iconv/lib/iconv.c
index 0cf3cf5ff..02c749d7f 100644
--- a/newlib/libc/iconv/lib/iconv.c
+++ b/newlib/libc/iconv/lib/iconv.c
@@ -120,8 +120,7 @@ No supporting OS subroutine calls are required.
*/
iconv_t
-_DEFUN(iconv_open, (to, from),
- const char *to,
+iconv_open (const char *to,
const char *from)
{
return _iconv_open_r (_REENT, to, from);
@@ -129,8 +128,7 @@ _DEFUN(iconv_open, (to, from),
size_t
-_DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft),
- iconv_t cd,
+iconv (iconv_t cd,
char **__restrict inbuf,
size_t *__restrict inbytesleft,
char **__restrict outbuf,
@@ -142,7 +140,7 @@ _DEFUN(iconv, (cd, inbuf, inbytesleft, outbuf, outbytesleft),
int
-_DEFUN(iconv_close, (cd), iconv_t cd)
+iconv_close (iconv_t cd)
{
return _iconv_close_r (_REENT, cd);
}
@@ -150,8 +148,7 @@ _DEFUN(iconv_close, (cd), iconv_t cd)
#ifndef _REENT_ONLY
iconv_t
-_DEFUN(_iconv_open_r, (rptr, to, from),
- struct _reent *rptr,
+_iconv_open_r (struct _reent *rptr,
const char *to,
const char *from)
{
@@ -201,8 +198,7 @@ _DEFUN(_iconv_open_r, (rptr, to, from),
size_t
-_DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
- struct _reent *rptr,
+_iconv_r (struct _reent *rptr,
iconv_t cd,
const char **inbuf,
size_t *inbytesleft,
@@ -288,8 +284,7 @@ _DEFUN(_iconv_r, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
int
-_DEFUN(_iconv_close_r, (rptr, cd),
- struct _reent *rptr,
+_iconv_close_r (struct _reent *rptr,
iconv_t cd)
{
int res;
diff --git a/newlib/libc/iconv/lib/iconvnls.c b/newlib/libc/iconv/lib/iconvnls.c
index dfb6a18dd..ed8f3a7ba 100644
--- a/newlib/libc/iconv/lib/iconvnls.c
+++ b/newlib/libc/iconv/lib/iconvnls.c
@@ -59,8 +59,7 @@
* and sets current thread's/process's errno.
*/
const char *
-_DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
- struct _reent *rptr,
+_iconv_nls_construct_filename (struct _reent *rptr,
const char *file,
const char *dir,
const char *ext)
@@ -114,8 +113,7 @@ _DEFUN(_iconv_nls_construct_filename, (rptr, file, ext),
* "to" encoding's value if 'direction' isn't 0.
*/
int
-_DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction),
- iconv_t cd,
+_iconv_nls_get_mb_cur_max (iconv_t cd,
int direction)
{
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -137,8 +135,7 @@ _DEFUN(_iconv_nls_get_mb_cur_max, (cd, direction),
*/
int
-_DEFUN(_iconv_nls_is_stateful, (cd, direction),
- iconv_t cd,
+_iconv_nls_is_stateful (iconv_t cd,
int direction)
{
iconv_conversion_t *ic = (iconv_conversion_t *)cd;
@@ -166,8 +163,7 @@ _DEFUN(_iconv_nls_is_stateful, (cd, direction),
* Same as _iconv_r.
*/
size_t
-_DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
- struct _reent *rptr,
+_iconv_nls_conv (struct _reent *rptr,
iconv_t cd,
const char **inbuf,
size_t *inbytesleft,
@@ -220,8 +216,7 @@ _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
* if 'direction' isn't 0.
*/
void
-_DEFUN(_iconv_nls_get_state, (cd, ps, direction),
- iconv_t cd,
+_iconv_nls_get_state (iconv_t cd,
mbstate_t *ps,
int direction)
{
@@ -247,8 +242,7 @@ _DEFUN(_iconv_nls_get_state, (cd, ps, direction),
* 0 if success, -1 if failure.
*/
int
-_DEFUN(_iconv_nls_set_state, (cd, ps, direction),
- iconv_t cd,
+_iconv_nls_set_state (iconv_t cd,
mbstate_t *ps,
int direction)
{
@@ -259,8 +253,7 @@ _DEFUN(_iconv_nls_set_state, (cd, ps, direction),
/* Same as iconv_open() but don't perform name resolving */
static iconv_t
-_DEFUN(iconv_open1, (rptr, to, from),
- struct _reent *rptr,
+iconv_open1 (struct _reent *rptr,
const char *to,
const char *from)
{
@@ -316,8 +309,7 @@ _DEFUN(iconv_open1, (rptr, to, from),
* If successful - return 0, else set errno and return -1.
*/
int
-_DEFUN(_iconv_nls_open, (rptr, encoding, towc, tomb),
- struct _reent *rptr,
+_iconv_nls_open (struct _reent *rptr,
const char *encoding,
iconv_t *tomb,
iconv_t *towc,
diff --git a/newlib/libc/iconv/lib/nullconv.c b/newlib/libc/iconv/lib/nullconv.c
index 8040c24e7..e75d83376 100644
--- a/newlib/libc/iconv/lib/nullconv.c
+++ b/newlib/libc/iconv/lib/nullconv.c
@@ -36,8 +36,7 @@ static int null_conversion_dummy_data;
static void *
-_DEFUN(null_conversion_open, (rptr, to, from),
- struct _reent *rptr,
+null_conversion_open (struct _reent *rptr,
const char *to,
const char *from)
{
@@ -46,8 +45,7 @@ _DEFUN(null_conversion_open, (rptr, to, from),
static size_t
-_DEFUN(null_conversion_close, (rptr, data),
- struct _reent *rptr,
+null_conversion_close (struct _reent *rptr,
void *data)
{
return 0;
@@ -55,9 +53,7 @@ _DEFUN(null_conversion_close, (rptr, data),
static size_t
-_DEFUN(null_conversion_convert,
- (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft),
- struct _reent *rptr,
+null_conversion_convert (struct _reent *rptr,
void *data,
const unsigned char **inbuf,
size_t *inbytesleft,
@@ -93,8 +89,7 @@ _DEFUN(null_conversion_convert,
static int
-_DEFUN(null_conversion_get_mb_cur_max, (data, direction),
- void *data,
+null_conversion_get_mb_cur_max (void *data,
int direction)
{
return ICONV_MB_LEN_MAX;
@@ -102,8 +97,7 @@ _DEFUN(null_conversion_get_mb_cur_max, (data, direction),
static void
-_DEFUN(null_conversion_get_state, (data, state, size),
- void *data,
+null_conversion_get_state (void *data,
mbstate_t *state,
int direction)
{
@@ -112,8 +106,7 @@ _DEFUN(null_conversion_get_state, (data, state, size),
static int
-_DEFUN(null_conversion_set_state, (data, state, direction),
- void *data,
+null_conversion_set_state (void *data,
mbstate_t *state,
int direction)
{
@@ -121,8 +114,7 @@ _DEFUN(null_conversion_set_state, (data, state, direction),
}
static int
-_DEFUN(null_conversion_is_stateful, (data, direction),
- void *data,
+null_conversion_is_stateful (void *data,
int direction)
{
return 0;
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index f480aee63..8c3d19073 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -45,8 +45,7 @@ _EXFUN(find_encoding_name, (const char *searchee,
*/
static void *
-_DEFUN(ucs_based_conversion_open, (rptr, to, from),
- struct _reent *rptr,
+ucs_based_conversion_open (struct _reent *rptr,
const char *to,
const char *from)
{
@@ -123,8 +122,7 @@ error:
static size_t
-_DEFUN(ucs_based_conversion_close, (rptr, data),
- struct _reent *rptr,
+ucs_based_conversion_close (struct _reent *rptr,
void *data)
{
iconv_ucs_conversion_t *uc;
@@ -144,9 +142,7 @@ _DEFUN(ucs_based_conversion_close, (rptr, data),
static size_t
-_DEFUN(ucs_based_conversion_convert,
- (rptr, data, inbuf, inbytesleft, outbuf, outbytesleft, flags),
- struct _reent *rptr,
+ucs_based_conversion_convert (struct _reent *rptr,
void *data,
const unsigned char **inbuf,
size_t *inbytesleft,
@@ -238,8 +234,7 @@ _DEFUN(ucs_based_conversion_convert,
static int
-_DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
- void *data,
+ucs_based_conversion_get_mb_cur_max (void *data,
int direction)
{
iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -252,8 +247,7 @@ _DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
static void
-_DEFUN(ucs_based_conversion_get_state, (data, state, direction),
- void *data,
+ucs_based_conversion_get_state (void *data,
mbstate_t *state,
int direction)
{
@@ -280,8 +274,7 @@ _DEFUN(ucs_based_conversion_get_state, (data, state, direction),
static int
-_DEFUN(ucs_based_conversion_set_state, (data, state, direction),
- void *data,
+ucs_based_conversion_set_state (void *data,
mbstate_t *state,
int direction)
{
@@ -302,8 +295,7 @@ _DEFUN(ucs_based_conversion_set_state, (data, state, direction),
}
static int
-_DEFUN(ucs_based_conversion_is_stateful, (data, direction),
- void *data,
+ucs_based_conversion_is_stateful (void *data,
int direction)
{
iconv_ucs_conversion_t *uc = (iconv_ucs_conversion_t *)data;
@@ -342,8 +334,7 @@ _iconv_ucs_conversion_handlers =
*/
static int
-_DEFUN(find_encoding_name, (searchee, names),
- const char *searchee,
+find_encoding_name (const char *searchee,
const char **names)
{
const char *p;
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index d05145b91..951617520 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -58,14 +58,12 @@
#define _EXPARM(name, proto) (* name) proto
#define _EXFNPTR(name, proto) (* name) proto
#endif
-#define _DEFUN(name, arglist, args) name(args)
#ifndef _LONG_DOUBLE
#define _LONG_DOUBLE long double
#endif
#else
#define _EXFUN(name, proto) name()
#define _EXFUN_NOTHROW(name, proto) name()
-#define _DEFUN(name, arglist, args) name arglist args;
#define _LONG_DOUBLE double
#endif
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index 7080b0510..baa5451a6 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -289,8 +289,7 @@ static char *currentlocale (void);
#endif /* _MB_CAPABLE */
char *
-_DEFUN(_setlocale_r, (p, category, locale),
- struct _reent *p,
+_setlocale_r (struct _reent *p,
int category,
const char *locale)
{
@@ -990,8 +989,7 @@ __locale_ctype_ptr (void)
#ifndef _REENT_ONLY
char *
-_DEFUN (setlocale, (category, locale),
- int category,
+setlocale (int category,
const char *locale)
{
return _setlocale_r (_REENT, category, locale);
diff --git a/newlib/libc/locale/localeconv.c b/newlib/libc/locale/localeconv.c
index b87f604a3..5f34a785f 100644
--- a/newlib/libc/locale/localeconv.c
+++ b/newlib/libc/locale/localeconv.c
@@ -51,8 +51,7 @@ __localeconv_l (struct __locale_t *locale)
}
struct lconv *
-_DEFUN (_localeconv_r, (data),
- struct _reent *data)
+_localeconv_r (struct _reent *data)
{
/* Note that we always fall back to the global locale, even in case
of specifying a reent. Otherwise a call to _localeconv_r would just
diff --git a/newlib/libc/machine/microblaze/strcmp.c b/newlib/libc/machine/microblaze/strcmp.c
index 82987eade..434195e2c 100644
--- a/newlib/libc/machine/microblaze/strcmp.c
+++ b/newlib/libc/machine/microblaze/strcmp.c
@@ -81,8 +81,7 @@ QUICKREF
#endif
int
-_DEFUN (strcmp, (s1, s2),
- const char *s1,
+strcmp (const char *s1,
const char *s2)
{
diff --git a/newlib/libc/machine/microblaze/strcpy.c b/newlib/libc/machine/microblaze/strcpy.c
index 8e2dae634..62072fa28 100644
--- a/newlib/libc/machine/microblaze/strcpy.c
+++ b/newlib/libc/machine/microblaze/strcpy.c
@@ -81,8 +81,7 @@ QUICKREF
#endif
char*
-_DEFUN (strcpy, (dst0, src0),
- char *__restrict dst0,
+strcpy (char *__restrict dst0,
const char *__restrict src0)
{
diff --git a/newlib/libc/machine/microblaze/strlen.c b/newlib/libc/machine/microblaze/strlen.c
index 059f4463d..acb4464bc 100644
--- a/newlib/libc/machine/microblaze/strlen.c
+++ b/newlib/libc/machine/microblaze/strlen.c
@@ -78,8 +78,7 @@ QUICKREF
#endif
size_t
-_DEFUN (strlen, (str),
- const char *str)
+strlen (const char *str)
{
#ifndef HAVE_HW_PCMP
diff --git a/newlib/libc/machine/powerpc/atosfix16.c b/newlib/libc/machine/powerpc/atosfix16.c
index dd5e2dfd4..b069d71d1 100644
--- a/newlib/libc/machine/powerpc/atosfix16.c
+++ b/newlib/libc/machine/powerpc/atosfix16.c
@@ -62,8 +62,7 @@ PORTABILITY
#include <_ansi.h>
__int16_t
-_DEFUN (_atosfix16_r, (reent, s),
- struct _reent *reent,
+_atosfix16_r (struct _reent *reent,
const char *s)
{
return _strtosfix16_r (reent, s, NULL);
@@ -71,8 +70,7 @@ _DEFUN (_atosfix16_r, (reent, s),
#ifndef _REENT_ONLY
__int16_t
-_DEFUN (atosfix16, (s),
- const char *s)
+atosfix16 (const char *s)
{
return strtosfix16 (s, NULL);
}
diff --git a/newlib/libc/machine/powerpc/atosfix32.c b/newlib/libc/machine/powerpc/atosfix32.c
index fed308b65..e1915b25a 100644
--- a/newlib/libc/machine/powerpc/atosfix32.c
+++ b/newlib/libc/machine/powerpc/atosfix32.c
@@ -8,8 +8,7 @@
#include <_ansi.h>
__int32_t
-_DEFUN (_atosfix32_r, (reent, s),
- struct _reent *reent,
+_atosfix32_r (struct _reent *reent,
const char *s)
{
return _strtosfix32_r (reent, s, NULL);
@@ -17,8 +16,7 @@ _DEFUN (_atosfix32_r, (reent, s),
#ifndef _REENT_ONLY
__int32_t
-_DEFUN (atosfix32, (s),
- const char *s)
+atosfix32 (const char *s)
{
return strtosfix32 (s, NULL);
}
diff --git a/newlib/libc/machine/powerpc/atosfix64.c b/newlib/libc/machine/powerpc/atosfix64.c
index cfc421a3a..5340b1ee2 100644
--- a/newlib/libc/machine/powerpc/atosfix64.c
+++ b/newlib/libc/machine/powerpc/atosfix64.c
@@ -8,8 +8,7 @@
#include <_ansi.h>
__int64_t
-_DEFUN (_atosfix64_r, (reent, s),
- struct _reent *reent,
+_atosfix64_r (struct _reent *reent,
const char *s)
{
return _strtosfix64_r (reent, s, NULL);
@@ -17,8 +16,7 @@ _DEFUN (_atosfix64_r, (reent, s),
#ifndef _REENT_ONLY
__int64_t
-_DEFUN (atosfix64, (s),
- const char *s)
+atosfix64 (const char *s)
{
return strtosfix64 (s, NULL);
}
diff --git a/newlib/libc/machine/powerpc/atoufix16.c b/newlib/libc/machine/powerpc/atoufix16.c
index 84a60b252..4cc833862 100644
--- a/newlib/libc/machine/powerpc/atoufix16.c
+++ b/newlib/libc/machine/powerpc/atoufix16.c
@@ -62,8 +62,7 @@ PORTABILITY
#include <_ansi.h>
__uint16_t
-_DEFUN (_atoufix16_r, (reent, s),
- struct _reent *reent,
+_atoufix16_r (struct _reent *reent,
const char *s)
{
return _strtoufix16_r (reent, s, NULL);
@@ -71,8 +70,7 @@ _DEFUN (_atoufix16_r, (reent, s),
#ifndef _REENT_ONLY
__uint16_t
-_DEFUN (atoufix16, (s),
- const char *s)
+atoufix16 (const char *s)
{
return strtoufix16 (s, NULL);
}
diff --git a/newlib/libc/machine/powerpc/atoufix32.c b/newlib/libc/machine/powerpc/atoufix32.c
index fc64c75e4..aa2333af6 100644
--- a/newlib/libc/machine/powerpc/atoufix32.c
+++ b/newlib/libc/machine/powerpc/atoufix32.c
@@ -8,8 +8,7 @@
#include <_ansi.h>
__uint32_t
-_DEFUN (_atoufix32_r, (reent, s),
- struct _reent *reent,
+_atoufix32_r (struct _reent *reent,
const char *s)
{
return _strtoufix32_r (reent, s, NULL);
@@ -17,8 +16,7 @@ _DEFUN (_atoufix32_r, (reent, s),
#ifndef _REENT_ONLY
__uint32_t
-_DEFUN (atoufix32, (s),
- const char *s)
+atoufix32 (const char *s)
{
return strtoufix32 (s, NULL);
}
diff --git a/newlib/libc/machine/powerpc/atoufix64.c b/newlib/libc/machine/powerpc/atoufix64.c
index e8ff7773d..cf9517e95 100644
--- a/newlib/libc/machine/powerpc/atoufix64.c
+++ b/newlib/libc/machine/powerpc/atoufix64.c
@@ -8,8 +8,7 @@
#include <_ansi.h>
__uint64_t
-_DEFUN (_atoufix64_r, (reent, s),
- struct _reent *reent,
+_atoufix64_r (struct _reent *reent,
const char *s)
{
return _strtoufix64_r (reent, s, NULL);
@@ -17,8 +16,7 @@ _DEFUN (_atoufix64_r, (reent, s),
#ifndef _REENT_ONLY
__uint64_t
-_DEFUN (atoufix64, (s),
- const char *s)
+atoufix64 (const char *s)
{
return strtoufix64 (s, NULL);
}
diff --git a/newlib/libc/machine/powerpc/strtosfix16.c b/newlib/libc/machine/powerpc/strtosfix16.c
index 4e998db03..3fba45409 100644
--- a/newlib/libc/machine/powerpc/strtosfix16.c
+++ b/newlib/libc/machine/powerpc/strtosfix16.c
@@ -92,8 +92,7 @@ PORTABILITY
* Ignores `locale' stuff.
*/
__int16_t
-_DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
- struct _reent *rptr,
+_strtosfix16_r (struct _reent *rptr,
const char *nptr,
char **endptr)
{
@@ -169,8 +168,7 @@ _DEFUN (_strtosfix16_r, (rptr, nptr, endptr),
#ifndef _REENT_ONLY
__int16_t
-_DEFUN (strtosfix16, (s, ptr, base),
- const char *s,
+strtosfix16 (const char *s,
char **ptr)
{
return _strtosfix16_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtosfix32.c b/newlib/libc/machine/powerpc/strtosfix32.c
index e8966808e..b21de9ea1 100644
--- a/newlib/libc/machine/powerpc/strtosfix32.c
+++ b/newlib/libc/machine/powerpc/strtosfix32.c
@@ -13,8 +13,7 @@
* Ignores `locale' stuff.
*/
__int32_t
-_DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
- struct _reent *rptr,
+_strtosfix32_r (struct _reent *rptr,
const char *nptr,
char **endptr)
{
@@ -92,8 +91,7 @@ _DEFUN (_strtosfix32_r, (rptr, nptr, endptr),
#ifndef _REENT_ONLY
__int32_t
-_DEFUN (strtosfix32, (s, ptr, base),
- const char *s,
+strtosfix32 (const char *s,
char **ptr)
{
return _strtosfix32_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtosfix64.c b/newlib/libc/machine/powerpc/strtosfix64.c
index f7344fc22..16032128f 100644
--- a/newlib/libc/machine/powerpc/strtosfix64.c
+++ b/newlib/libc/machine/powerpc/strtosfix64.c
@@ -13,8 +13,7 @@
* Ignores `locale' stuff.
*/
__int64_t
-_DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
- struct _reent *rptr,
+_strtosfix64_r (struct _reent *rptr,
const char *nptr,
char **endptr)
{
@@ -105,8 +104,7 @@ _DEFUN (_strtosfix64_r, (rptr, nptr, endptr),
#ifndef _REENT_ONLY
__int64_t
-_DEFUN (strtosfix64, (s, ptr, base),
- const char *s,
+strtosfix64 (const char *s,
char **ptr)
{
return _strtosfix64_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix16.c b/newlib/libc/machine/powerpc/strtoufix16.c
index 0757930d4..9b16268bb 100644
--- a/newlib/libc/machine/powerpc/strtoufix16.c
+++ b/newlib/libc/machine/powerpc/strtoufix16.c
@@ -91,8 +91,7 @@ PORTABILITY
* Ignores `locale' stuff.
*/
__uint16_t
-_DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
- struct _reent *rptr,
+_strtoufix16_r (struct _reent *rptr,
const char *nptr,
char **endptr)
{
@@ -160,8 +159,7 @@ _DEFUN (_strtoufix16_r, (rptr, nptr, endptr),
#ifndef _REENT_ONLY
__uint16_t
-_DEFUN (strtoufix16, (s, ptr, base),
- const char *s,
+strtoufix16 (const char *s,
char **ptr)
{
return _strtoufix16_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix32.c b/newlib/libc/machine/powerpc/strtoufix32.c
index 60f278daa..7d03f8c9b 100644
--- a/newlib/libc/machine/powerpc/strtoufix32.c
+++ b/newlib/libc/machine/powerpc/strtoufix32.c
@@ -13,8 +13,7 @@
* Ignores `locale' stuff.
*/
__uint32_t
-_DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
- struct _reent *rptr,
+_strtoufix32_r (struct _reent *rptr,
const char *nptr,
char **endptr)
{
@@ -89,8 +88,7 @@ _DEFUN (_strtoufix32_r, (rptr, nptr, endptr),
#ifndef _REENT_ONLY
__uint32_t
-_DEFUN (strtoufix32, (s, ptr, base),
- const char *s,
+strtoufix32 (const char *s,
char **ptr)
{
return _strtoufix32_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/strtoufix64.c b/newlib/libc/machine/powerpc/strtoufix64.c
index 509f51318..a2f0484b3 100644
--- a/newlib/libc/machine/powerpc/strtoufix64.c
+++ b/newlib/libc/machine/powerpc/strtoufix64.c
@@ -13,8 +13,7 @@
* Ignores `locale' stuff.
*/
__uint64_t
-_DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
- struct _reent *rptr,
+_strtoufix64_r (struct _reent *rptr,
const char *nptr,
char **endptr)
{
@@ -104,8 +103,7 @@ _DEFUN (_strtoufix64_r, (rptr, nptr, endptr),
#ifndef _REENT_ONLY
__uint64_t
-_DEFUN (strtoufix64, (s, ptr, base),
- const char *s,
+strtoufix64 (const char *s,
char **ptr)
{
return _strtoufix64_r (_REENT, s, ptr);
diff --git a/newlib/libc/machine/powerpc/ufix64toa.c b/newlib/libc/machine/powerpc/ufix64toa.c
index bf13894e6..c829b9b33 100644
--- a/newlib/libc/machine/powerpc/ufix64toa.c
+++ b/newlib/libc/machine/powerpc/ufix64toa.c
@@ -25,8 +25,7 @@ extern char *_simdldtoa_r (struct _reent *, LONG_DOUBLE_UNION *, int,
*/
char *
-_DEFUN (_ufix64toa_r, (rptr, value, mode, ndigits, decpt, sign, rve),
- struct _reent *rptr,
+_ufix64toa_r (struct _reent *rptr,
__uint64_t value,
int mode,
int ndigits,
diff --git a/newlib/libc/machine/powerpc/vec_calloc.c b/newlib/libc/machine/powerpc/vec_calloc.c
index cc156bc76..7a90d571c 100644
--- a/newlib/libc/machine/powerpc/vec_calloc.c
+++ b/newlib/libc/machine/powerpc/vec_calloc.c
@@ -44,8 +44,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifndef _REENT_ONLY
void *
-_DEFUN (vec_calloc, (n, size),
- size_t n,
+vec_calloc (size_t n,
size_t size)
{
return _vec_calloc_r (_REENT, n, size);
diff --git a/newlib/libc/machine/powerpc/vec_free.c b/newlib/libc/machine/powerpc/vec_free.c
index fa2ea9686..c893e5ab4 100644
--- a/newlib/libc/machine/powerpc/vec_free.c
+++ b/newlib/libc/machine/powerpc/vec_free.c
@@ -6,8 +6,7 @@
#ifndef _REENT_ONLY
void
-_DEFUN (vec_free, (aptr),
- void *aptr)
+vec_free (void *aptr)
{
_free_r (_REENT, aptr);
}
diff --git a/newlib/libc/machine/powerpc/vec_malloc.c b/newlib/libc/machine/powerpc/vec_malloc.c
index ad62b119f..b62fe0762 100644
--- a/newlib/libc/machine/powerpc/vec_malloc.c
+++ b/newlib/libc/machine/powerpc/vec_malloc.c
@@ -96,8 +96,7 @@ Supporting OS subroutines required: <<sbrk>>. */
#ifndef _REENT_ONLY
void *
-_DEFUN (vec_malloc, (nbytes),
- size_t nbytes) /* get a block */
+vec_malloc (size_t nbytes) /* get a block */
{
return _memalign_r (_REENT, 16, nbytes);
}
diff --git a/newlib/libc/machine/powerpc/vec_realloc.c b/newlib/libc/machine/powerpc/vec_realloc.c
index 05ee82be1..db6f32060 100644
--- a/newlib/libc/machine/powerpc/vec_realloc.c
+++ b/newlib/libc/machine/powerpc/vec_realloc.c
@@ -7,8 +7,7 @@
#ifndef _REENT_ONLY
void *
-_DEFUN (vec_realloc, (ap, nbytes),
- void *ap,
+vec_realloc (void *ap,
size_t nbytes)
{
return _vec_realloc_r (_REENT, ap, nbytes);
diff --git a/newlib/libc/machine/powerpc/vfprintf.c b/newlib/libc/machine/powerpc/vfprintf.c
index 1615d4b25..2cae2aaa1 100644
--- a/newlib/libc/machine/powerpc/vfprintf.c
+++ b/newlib/libc/machine/powerpc/vfprintf.c
@@ -271,8 +271,7 @@ static char *cvt_ufix64 (struct _reent *, unsigned long long, int, int *, int *
#define FIXEDPOINT 0x400 /* fixed-point */
int
-_DEFUN (VFPRINTF, (fp, fmt0, ap),
- FILE * fp,
+VFPRINTF (FILE * fp,
const char *fmt0,
va_list ap)
{
@@ -281,8 +280,7 @@ _DEFUN (VFPRINTF, (fp, fmt0, ap),
}
int
-_DEFUN (_VFPRINTF_R, (data, fp, fmt0, ap),
- struct _reent *data,
+_VFPRINTF_R (struct _reent *data,
FILE * fp,
const char *fmt0,
va_list ap)
diff --git a/newlib/libc/machine/powerpc/vfscanf.c b/newlib/libc/machine/powerpc/vfscanf.c
index 4a3e48c22..f0443bf4a 100644
--- a/newlib/libc/machine/powerpc/vfscanf.c
+++ b/newlib/libc/machine/powerpc/vfscanf.c
@@ -182,8 +182,7 @@ typedef union
#ifndef _REENT_ONLY
int
-_DEFUN (vfscanf, (fp, fmt, ap),
- register FILE *__restrict fp,
+vfscanf (register FILE *__restrict fp,
const char *__restrict fmt,
va_list ap)
{
@@ -203,8 +202,7 @@ __svfscanf (fp, fmt0, ap)
#endif /* !_REENT_ONLY */
int
-_DEFUN (_vfscanf_r, (data, fp, fmt, ap),
- struct _reent *data,
+_vfscanf_r (struct _reent *data,
register FILE *__restrict fp,
const char *__restrict fmt,
va_list ap)
diff --git a/newlib/libc/machine/spu/assert.c b/newlib/libc/machine/spu/assert.c
index e8028459c..90e94eb5d 100644
--- a/newlib/libc/machine/spu/assert.c
+++ b/newlib/libc/machine/spu/assert.c
@@ -10,8 +10,7 @@
/* func can be NULL, in which case no function information is given. */
void
-_DEFUN (__assert_func, (file, line, func, failedexpr),
- const char *file,
+__assert_func (const char *file,
int line,
const char *func,
const char *failedexpr)
@@ -31,8 +30,7 @@ _DEFUN (__assert_func, (file, line, func, failedexpr),
}
void
-_DEFUN (__assert, (file, line, failedexpr),
- const char *file,
+__assert (const char *file,
int line,
const char *failedexpr)
{
diff --git a/newlib/libc/machine/spu/clearerr.c b/newlib/libc/machine/spu/clearerr.c
index 667667a91..27f726a64 100644
--- a/newlib/libc/machine/spu/clearerr.c
+++ b/newlib/libc/machine/spu/clearerr.c
@@ -37,8 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#ifndef _REENT_ONLY
void
-_DEFUN (clearerr, (fp),
- FILE * fp)
+clearerr (FILE * fp)
{
int ret;
diff --git a/newlib/libc/machine/spu/creat.c b/newlib/libc/machine/spu/creat.c
index 0e271c1a7..5b8c603f5 100644
--- a/newlib/libc/machine/spu/creat.c
+++ b/newlib/libc/machine/spu/creat.c
@@ -7,8 +7,7 @@
#include <fcntl.h>
int
-_DEFUN(creat, (path, mode),
- const char *path,
+creat (const char *path,
mode_t mode)
{
return open (path, O_WRONLY | O_CREAT | O_TRUNC, mode);
diff --git a/newlib/libc/machine/spu/fclose.c b/newlib/libc/machine/spu/fclose.c
index 4e1b8253b..6a3e5073f 100644
--- a/newlib/libc/machine/spu/fclose.c
+++ b/newlib/libc/machine/spu/fclose.c
@@ -37,8 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#ifndef _REENT_ONLY
int
-_DEFUN (fclose, (fp),
- FILE * fp)
+fclose (FILE * fp)
{
int ret;
diff --git a/newlib/libc/machine/spu/fdopen.c b/newlib/libc/machine/spu/fdopen.c
index edec03cff..6244e50df 100644
--- a/newlib/libc/machine/spu/fdopen.c
+++ b/newlib/libc/machine/spu/fdopen.c
@@ -34,8 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef _REENT_ONLY
/* Just a stub for now. */
FILE *
-_DEFUN (fdopen, (fd, mode),
- int fd,
+fdopen (int fd,
const char *mode)
{
errno = ENOSYS;
diff --git a/newlib/libc/machine/spu/feof.c b/newlib/libc/machine/spu/feof.c
index 25e3a8f82..8e874148f 100644
--- a/newlib/libc/machine/spu/feof.c
+++ b/newlib/libc/machine/spu/feof.c
@@ -37,8 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#ifndef _REENT_ONLY
int
-_DEFUN (feof, (fp),
- FILE * fp)
+feof (FILE * fp)
{
int result;
diff --git a/newlib/libc/machine/spu/ferror.c b/newlib/libc/machine/spu/ferror.c
index ac747eff4..be7970fb6 100644
--- a/newlib/libc/machine/spu/ferror.c
+++ b/newlib/libc/machine/spu/ferror.c
@@ -37,8 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#ifndef _REENT_ONLY
int
-_DEFUN (ferror, (fp),
- FILE * fp)
+ferror (FILE * fp)
{
int result;
diff --git a/newlib/libc/machine/spu/fflush.c b/newlib/libc/machine/spu/fflush.c
index 7037f4990..6b45ac4a1 100644
--- a/newlib/libc/machine/spu/fflush.c
+++ b/newlib/libc/machine/spu/fflush.c
@@ -36,8 +36,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#ifndef _REENT_ONLY
int
-_DEFUN (fflush, (fp),
- FILE * fp)
+fflush (FILE * fp)
{
int result;
diff --git a/newlib/libc/machine/spu/fgetc.c b/newlib/libc/machine/spu/fgetc.c
index 815203228..8e191cfcb 100644
--- a/newlib/libc/machine/spu/fgetc.c
+++ b/newlib/libc/machine/spu/fgetc.c
@@ -37,8 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#ifndef _REENT_ONLY
int
-_DEFUN (fgetc, (fp),
- FILE * fp)
+fgetc (FILE * fp)
{
int result;
diff --git a/newlib/libc/machine/spu/fgetpos.c b/newlib/libc/machine/spu/fgetpos.c
index bb7d780ea..68d41ac0e 100644
--- a/newlib/libc/machine/spu/fgetpos.c
+++ b/newlib/libc/machine/spu/fgetpos.c
@@ -44,8 +44,7 @@ typedef struct
#ifndef _REENT_ONLY
int
-_DEFUN (fgetpos, (fp, pos),
- FILE *__restrict fp,
+fgetpos (FILE *__restrict fp,
_fpos_t *__restrict pos)
{
c99_fgetpos_t arg;
diff --git a/newlib/libc/machine/spu/fgets.c b/newlib/libc/machine/spu/fgets.c
index 8f2a9785f..cde29da34 100644
--- a/newlib/libc/machine/spu/fgets.c
+++ b/newlib/libc/machine/spu/fgets.c
@@ -46,8 +46,7 @@ typedef struct
#ifndef _REENT_ONLY
char *
-_DEFUN (fgets, (buf, n, fp),
- char *__restrict buf,
+fgets (char *__restrict buf,
int n,
FILE *__restrict fp)
{
diff --git a/newlib/libc/machine/spu/fileno.c b/newlib/libc/machine/spu/fileno.c
index 867a6b8f3..cbf9e50c4 100644
--- a/newlib/libc/machine/spu/fileno.c
+++ b/newlib/libc/machine/spu/fileno.c
@@ -37,8 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#ifndef _REENT_ONLY
int
-_DEFUN (fileno, (fp),
- FILE *fp)
+fileno (FILE *fp)
{
int ret;
diff --git a/newlib/libc/machine/spu/fopen.c b/newlib/libc/machine/spu/fopen.c
index ffa8f6904..13ecdad1e 100644
--- a/newlib/libc/machine/spu/fopen.c
+++ b/newlib/libc/machine/spu/fopen.c
@@ -45,8 +45,7 @@ typedef struct
#ifndef _REENT_ONLY
FILE *
-_DEFUN (fopen, (file, mode),
- const char *__restrict file,
+fopen (const char *__restrict file,
const char *__restrict mode)
{
int ret;
diff --git a/newlib/libc/machine/spu/fputs.c b/newlib/libc/machine/spu/fputs.c
index 82b72e060..898418606 100644
--- a/newlib/libc/machine/spu/fputs.c
+++ b/newlib/libc/machine/spu/fputs.c
@@ -46,8 +46,7 @@ typedef struct
#ifndef _REENT_ONLY
int
-_DEFUN (fputs, (s, fp),
- char const *__restrict s,
+fputs (char const *__restrict s,
FILE *__restrict fp)
{
c99_fputs_t args;
diff --git a/newlib/libc/machine/spu/fread.c b/newlib/libc/machine/spu/fread.c
index 8a6e9c417..12b6bb782 100644
--- a/newlib/libc/machine/spu/fread.c
+++ b/newlib/libc/machine/spu/fread.c
@@ -49,8 +49,7 @@ typedef struct
#ifndef _REENT_ONLY
size_t
-_DEFUN (fread, (buf, size, count, fp),
- void *__restrict buf,
+fread (void *__restrict buf,
size_t size,
size_t count,
FILE *__restrict fp)
diff --git a/newlib/libc/machine/spu/freopen.c b/newlib/libc/machine/spu/freopen.c
index 0e3f15f83..8babcfe27 100644
--- a/newlib/libc/machine/spu/freopen.c
+++ b/newlib/libc/machine/spu/freopen.c
@@ -47,8 +47,7 @@ typedef struct
#ifndef _REENT_ONLY
FILE *
-_DEFUN (freopen, (file, mode, fp),
- const char *__restrict file,
+freopen (const char *__restrict file,
const char *__restrict mode,
FILE *__restrict fp)
{
diff --git a/newlib/libc/machine/spu/fseek.c b/newlib/libc/machine/spu/fseek.c
index 136d5c639..df33ed85c 100644
--- a/newlib/libc/machine/spu/fseek.c
+++ b/newlib/libc/machine/spu/fseek.c
@@ -47,8 +47,7 @@ typedef struct
#ifndef _REENT_ONLY
int
-_DEFUN (fseek, (fp, offset, whence),
- register FILE *fp,
+fseek (register FILE *fp,
long offset,
int whence)
{
diff --git a/newlib/libc/machine/spu/fsetpos.c b/newlib/libc/machine/spu/fsetpos.c
index a92cca5a3..87daa4c18 100644
--- a/newlib/libc/machine/spu/fsetpos.c
+++ b/newlib/libc/machine/spu/fsetpos.c
@@ -45,8 +45,7 @@ typedef struct
#ifndef _REENT_ONLY
int
-_DEFUN (fsetpos, (iop, pos),
- FILE * iop,
+fsetpos (FILE * iop,
const _fpos_t * pos)
{
c99_fsetpos_t args;
diff --git a/newlib/libc/machine/spu/ftell.c b/newlib/libc/machine/spu/ftell.c
index 4782e5ea3..8e56983e5 100644
--- a/newlib/libc/machine/spu/ftell.c
+++ b/newlib/libc/machine/spu/ftell.c
@@ -38,8 +38,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#ifndef _REENT_ONLY
long
-_DEFUN (ftell, (fp),
- FILE * fp)
+ftell (FILE * fp)
{
long ret;
diff --git a/newlib/libc/machine/spu/fwrite.c b/newlib/libc/machine/spu/fwrite.c
index 0db2f549b..84572af1d 100644
--- a/newlib/libc/machine/spu/fwrite.c
+++ b/newlib/libc/machine/spu/fwrite.c
@@ -49,8 +49,7 @@ typedef struct
} c99_fwrite_t;
size_t
-_DEFUN (fwrite, (buf, size, count, fp),
- const void *__restrict buf,
+fwrite (const void *__restrict buf,
size_t size,
size_t count,
FILE * fp)
diff --git a/newlib/libc/machine/spu/perror.c b/newlib/libc/machine/spu/perror.c
index 612467318..eae1419a1 100644
--- a/newlib/libc/machine/spu/perror.c
+++ b/newlib/libc/machine/spu/perror.c
@@ -14,8 +14,7 @@ typedef struct
} c99_perror_t;
void
-_DEFUN (perror, (s),
- const char *s)
+perror (const char *s)
{
c99_perror_t arg;
diff --git a/newlib/libc/machine/spu/puts.c b/newlib/libc/machine/spu/puts.c
index 427508969..27bd2bd52 100644
--- a/newlib/libc/machine/spu/puts.c
+++ b/newlib/libc/machine/spu/puts.c
@@ -5,8 +5,7 @@
#ifndef _REENT_ONLY
int
-_DEFUN (puts, (s),
- char const * s)
+puts (char const * s)
{
CHECK_STD_INIT(_REENT);
diff --git a/newlib/libc/machine/spu/rewind.c b/newlib/libc/machine/spu/rewind.c
index 8d1a0a90f..e075fc7ee 100644
--- a/newlib/libc/machine/spu/rewind.c
+++ b/newlib/libc/machine/spu/rewind.c
@@ -37,8 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#ifndef _REENT_ONLY
void
-_DEFUN (rewind, (fp),
- FILE * fp)
+rewind (FILE * fp)
{
int ret;
diff --git a/newlib/libc/machine/spu/setbuf.c b/newlib/libc/machine/spu/setbuf.c
index c942bb9a9..427d5dc8d 100644
--- a/newlib/libc/machine/spu/setbuf.c
+++ b/newlib/libc/machine/spu/setbuf.c
@@ -46,8 +46,7 @@ typedef struct
#ifndef _REENT_ONLY
void
-_DEFUN (setbuf, (fp, buf),
- FILE *__restrict fp,
+setbuf (FILE *__restrict fp,
char *__restrict buf)
{
c99_setbuf_t args;
diff --git a/newlib/libc/machine/spu/setvbuf.c b/newlib/libc/machine/spu/setvbuf.c
index a045cc37b..91c1cf3bf 100644
--- a/newlib/libc/machine/spu/setvbuf.c
+++ b/newlib/libc/machine/spu/setvbuf.c
@@ -50,8 +50,7 @@ typedef struct
#ifndef _REENT_ONLY
int
-_DEFUN (setvbuf, (fp, buf, mode, size),
- FILE * fp,
+setvbuf (FILE * fp,
char *buf,
int mode,
size_t size)
diff --git a/newlib/libc/machine/spu/stdio.c b/newlib/libc/machine/spu/stdio.c
index 14332b475..2a308b8aa 100644
--- a/newlib/libc/machine/spu/stdio.c
+++ b/newlib/libc/machine/spu/stdio.c
@@ -39,8 +39,7 @@ Author: Kazunori Asayama <asayama@sm.sony.co.jp>
static FILE __fp[SPE_FOPEN_MAX];
FILE *
-_DEFUN (__sfp, (d),
- struct _reent *d)
+__sfp (struct _reent *d)
{
int i;
for (i = 0; i < SPE_FOPEN_MAX; i++) {
@@ -53,8 +52,7 @@ _DEFUN (__sfp, (d),
}
static void
-_DEFUN (__cleanup, (s),
- struct _reent *s)
+__cleanup (struct _reent *s)
{
int i;
for (i = 0; i < SPE_FOPEN_MAX; i++) {
@@ -65,8 +63,7 @@ _DEFUN (__cleanup, (s),
}
void
-_DEFUN (__sinit, (s),
- struct _reent *s)
+__sinit (struct _reent *s)
{
s->__cleanup = __cleanup;
s->__sdidinit = 1;
diff --git a/newlib/libc/machine/spu/tmpnam.c b/newlib/libc/machine/spu/tmpnam.c
index 5cbf2793b..898a1a70f 100644
--- a/newlib/libc/machine/spu/tmpnam.c
+++ b/newlib/libc/machine/spu/tmpnam.c
@@ -35,8 +35,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#include "c99ppe.h"
char *
-_DEFUN (tmpnam, (s),
- char *s)
+tmpnam (char *s)
{
/* The return value gets written over buf
*/
diff --git a/newlib/libc/machine/spu/vfprintf.c b/newlib/libc/machine/spu/vfprintf.c
index 90dcaef56..6e436421b 100644
--- a/newlib/libc/machine/spu/vfprintf.c
+++ b/newlib/libc/machine/spu/vfprintf.c
@@ -57,8 +57,7 @@ typedef struct
#ifndef _REENT_ONLY
int
-_DEFUN (vfprintf, (fp, fmt0, ap),
- FILE *__restrict fp,
+vfprintf (FILE *__restrict fp,
const char *__restrict fmt0,
va_list ap)
{
diff --git a/newlib/libc/machine/spu/vfscanf.c b/newlib/libc/machine/spu/vfscanf.c
index c22f76db7..9af12e91a 100644
--- a/newlib/libc/machine/spu/vfscanf.c
+++ b/newlib/libc/machine/spu/vfscanf.c
@@ -57,8 +57,7 @@ typedef struct
#ifndef _REENT_ONLY
int
-_DEFUN (vfscanf, (fp, fmt, ap),
- FILE *__restrict fp,
+vfscanf (FILE *__restrict fp,
const char *__restrict fmt,
va_list ap)
{
diff --git a/newlib/libc/machine/spu/vprintf.c b/newlib/libc/machine/spu/vprintf.c
index e99144623..29cac0c8d 100644
--- a/newlib/libc/machine/spu/vprintf.c
+++ b/newlib/libc/machine/spu/vprintf.c
@@ -23,8 +23,7 @@ typedef struct
#ifndef _REENT_ONLY
int
-_DEFUN (vprintf, (fmt, ap),
- const char *fmt,
+vprintf (const char *fmt,
va_list ap)
{
c99_vprintf_t args;
diff --git a/newlib/libc/machine/spu/vscanf.c b/newlib/libc/machine/spu/vscanf.c
index aae6bc45b..39348905d 100644
--- a/newlib/libc/machine/spu/vscanf.c
+++ b/newlib/libc/machine/spu/vscanf.c
@@ -55,8 +55,7 @@ typedef struct
#ifndef _REENT_ONLY
int
-_DEFUN (vscanf, (fmt, ap),
- const char *fmt,
+vscanf (const char *fmt,
va_list ap)
{
c99_vscanf_t args;
diff --git a/newlib/libc/machine/spu/vsnprintf.c b/newlib/libc/machine/spu/vsnprintf.c
index b30770d68..81ba7bef2 100644
--- a/newlib/libc/machine/spu/vsnprintf.c
+++ b/newlib/libc/machine/spu/vsnprintf.c
@@ -27,8 +27,7 @@ typedef struct
#ifndef _REENT_ONLY
int
-_DEFUN (vsnprintf, (str, size, fmt, ap),
- char *__restrict str,
+vsnprintf (char *__restrict str,
size_t size,
const char *__restrict fmt,
va_list ap)
diff --git a/newlib/libc/machine/spu/vsprintf.c b/newlib/libc/machine/spu/vsprintf.c
index 12461c08e..8b0e414de 100644
--- a/newlib/libc/machine/spu/vsprintf.c
+++ b/newlib/libc/machine/spu/vsprintf.c
@@ -26,8 +26,7 @@ typedef struct
#ifndef _REENT_ONLY
int
-_DEFUN (vsprintf, (str, fmt, ap),
- char *__restrict str,
+vsprintf (char *__restrict str,
const char *__restrict fmt,
va_list ap)
{
diff --git a/newlib/libc/machine/spu/vsscanf.c b/newlib/libc/machine/spu/vsscanf.c
index 7725e6822..a94b152d2 100644
--- a/newlib/libc/machine/spu/vsscanf.c
+++ b/newlib/libc/machine/spu/vsscanf.c
@@ -57,8 +57,7 @@ typedef struct
#ifndef _REENT_ONLY
int
-_DEFUN (vsscanf, (str, fmt, ap),
- const char *__restrict str,
+vsscanf (const char *__restrict str,
const char *__restrict fmt,
va_list ap)
{
diff --git a/newlib/libc/misc/__dprintf.c b/newlib/libc/misc/__dprintf.c
index 5fa30e0ab..592d714c2 100644
--- a/newlib/libc/misc/__dprintf.c
+++ b/newlib/libc/misc/__dprintf.c
@@ -177,8 +177,7 @@ parse_number (s, p)
/* Fetch the number at S of SIZE bytes. */
static long
-_DEFUN(get_number, (s, size, unsigned_p),
- char *s,
+get_number (char *s,
long size,
int unsigned_p)
{
@@ -220,8 +219,7 @@ _DEFUN(get_number, (s, size, unsigned_p),
/* Print X in base BASE. */
static void
-_DEFUN(print_number, (base, unsigned_p, n),
- int base,
+print_number (int base,
int unsigned_p,
long n)
{
@@ -254,8 +252,7 @@ _DEFUN(print_number, (base, unsigned_p, n),
stdio is working. */
static void
-_DEFUN(write_char, (c),
- char c)
+write_char (char c)
{
_write_r (_REENT, CONSOLE_FD, &c, 1);
}
@@ -265,8 +262,7 @@ _DEFUN(write_char, (c),
stdio is working. */
static void
-_DEFUN(write_string, (s),
- const char *s)
+write_string (const char *s)
{
_write_r (_REENT, CONSOLE_FD, s, strlen (s));
}
diff --git a/newlib/libc/posix/_isatty.c b/newlib/libc/posix/_isatty.c
index 7d6ccae7c..c4dcc1f9c 100644
--- a/newlib/libc/posix/_isatty.c
+++ b/newlib/libc/posix/_isatty.c
@@ -6,7 +6,7 @@
#include <errno.h>
int
-_DEFUN(_isatty, (fd), int fd)
+_isatty (int fd)
{
struct stat buf;
diff --git a/newlib/libc/posix/closedir.c b/newlib/libc/posix/closedir.c
index 7801da043..032636d09 100644
--- a/newlib/libc/posix/closedir.c
+++ b/newlib/libc/posix/closedir.c
@@ -49,8 +49,7 @@ extern void _cleanupdir (DIR *dirp);
* close a directory.
*/
int
-_DEFUN(closedir, (dirp),
- register DIR *dirp)
+closedir (register DIR *dirp)
{
int rc;
diff --git a/newlib/libc/posix/creat.c b/newlib/libc/posix/creat.c
index 116f26ce3..fab807375 100644
--- a/newlib/libc/posix/creat.c
+++ b/newlib/libc/posix/creat.c
@@ -5,8 +5,7 @@
#include <fcntl.h>
int
-_DEFUN(creat, (path, mode),
- const char *path,
+creat (const char *path,
mode_t mode)
{
return open (path, O_WRONLY | O_CREAT | O_TRUNC, mode);
diff --git a/newlib/libc/posix/execl.c b/newlib/libc/posix/execl.c
index e25f21917..6ba95e2dc 100644
--- a/newlib/libc/posix/execl.c
+++ b/newlib/libc/posix/execl.c
@@ -18,8 +18,7 @@ static char ***p_environ = &environ;
#include <stdarg.h>
int
-_DEFUN(execl, (path, arg0, ...),
- const char *path,
+execl (const char *path,
const char *arg0, ...)
#else
@@ -27,8 +26,7 @@ _DEFUN(execl, (path, arg0, ...),
#include <varargs.h>
int
-_DEFUN(execl, (path, arg0, va_alist),
- const char *path,
+execl (const char *path,
const char *arg0,
va_dcl)
diff --git a/newlib/libc/posix/execle.c b/newlib/libc/posix/execle.c
index 67387f545..641bdac72 100644
--- a/newlib/libc/posix/execle.c
+++ b/newlib/libc/posix/execle.c
@@ -13,8 +13,7 @@
#include <stdarg.h>
int
-_DEFUN(execle, (path, arg0, ...),
- const char *path,
+execle (const char *path,
const char *arg0, ...)
#else
@@ -22,8 +21,7 @@ _DEFUN(execle, (path, arg0, ...),
#include <varargs.h>
int
-_DEFUN(execle, (path, arg0, va_alist),
- const char *path,
+execle (const char *path,
const char *arg0,
va_dcl)
diff --git a/newlib/libc/posix/execlp.c b/newlib/libc/posix/execlp.c
index f1de21f1c..41b300d8f 100644
--- a/newlib/libc/posix/execlp.c
+++ b/newlib/libc/posix/execlp.c
@@ -13,8 +13,7 @@
#include <stdarg.h>
int
-_DEFUN(execlp, (path, arg0, ...),
- const char *path,
+execlp (const char *path,
const char *arg0, ...)
#else
@@ -22,8 +21,7 @@ _DEFUN(execlp, (path, arg0, ...),
#include <varargs.h>
int
-_DEFUN(execlp, (path, arg0, va_alist),
- const char *path,
+execlp (const char *path,
const char *arg0,
va_dcl)
diff --git a/newlib/libc/posix/execv.c b/newlib/libc/posix/execv.c
index 96220dd98..6a1052c26 100644
--- a/newlib/libc/posix/execv.c
+++ b/newlib/libc/posix/execv.c
@@ -14,8 +14,7 @@
static char ***p_environ = &environ;
int
-_DEFUN (execv, (path, argv),
- const char *path,
+execv (const char *path,
char * const argv[])
{
return _execve (path, (char * const *) argv, *p_environ);
diff --git a/newlib/libc/posix/execve.c b/newlib/libc/posix/execve.c
index c2a2144f5..99c145426 100644
--- a/newlib/libc/posix/execve.c
+++ b/newlib/libc/posix/execve.c
@@ -10,8 +10,7 @@
int
-_DEFUN(execve, (path, argv, envp),
- const char *path,
+execve (const char *path,
char * const argv[],
char * const envp[])
{
diff --git a/newlib/libc/posix/execvp.c b/newlib/libc/posix/execvp.c
index 1c1fd3a01..be7e71cea 100644
--- a/newlib/libc/posix/execvp.c
+++ b/newlib/libc/posix/execvp.c
@@ -21,8 +21,7 @@
*/
static char *
-_DEFUN (strccpy, (s1, s2, c),
- char *s1,
+strccpy (char *s1,
char *s2,
char c)
{
@@ -36,8 +35,7 @@ _DEFUN (strccpy, (s1, s2, c),
}
int
-_DEFUN (execvp, (file, argv),
- const char *file,
+execvp (const char *file,
char * const argv[])
{
char *path = getenv ("PATH");
diff --git a/newlib/libc/posix/isatty.c b/newlib/libc/posix/isatty.c
index afd5ec85e..8a6740a55 100644
--- a/newlib/libc/posix/isatty.c
+++ b/newlib/libc/posix/isatty.c
@@ -4,7 +4,7 @@
#include <reent.h>
int
-_DEFUN(isatty, (fd), int fd)
+isatty (int fd)
{
return _isatty (fd);
}
diff --git a/newlib/libc/posix/opendir.c b/newlib/libc/posix/opendir.c
index ca764e156..1416f1053 100644
--- a/newlib/libc/posix/opendir.c
+++ b/newlib/libc/posix/opendir.c
@@ -47,8 +47,7 @@ static char sccsid[] = "@(#)opendir.c 5.11 (Berkeley) 2/23/91";
* open a directory.
*/
DIR *
-_DEFUN(opendir, (name),
- const char *name)
+opendir (const char *name)
{
register DIR *dirp;
register int fd;
diff --git a/newlib/libc/posix/popen.c b/newlib/libc/posix/popen.c
index bbd0fc424..04aca4c9f 100644
--- a/newlib/libc/posix/popen.c
+++ b/newlib/libc/posix/popen.c
@@ -109,8 +109,7 @@ static struct pid {
} *pidlist;
FILE *
-_DEFUN(popen, (program, type),
- const char *program,
+popen (const char *program,
const char *type)
{
struct pid *cur;
@@ -197,8 +196,7 @@ _DEFUN(popen, (program, type),
* if already `pclosed', or waitpid returns an error.
*/
int
-_DEFUN(pclose, (iop),
- FILE *iop)
+pclose (FILE *iop)
{
register struct pid *cur, *last;
int pstat;
diff --git a/newlib/libc/posix/posix_spawn.c b/newlib/libc/posix/posix_spawn.c
index cade6b005..19c5cd0fe 100644
--- a/newlib/libc/posix/posix_spawn.c
+++ b/newlib/libc/posix/posix_spawn.c
@@ -294,8 +294,7 @@ do_posix_spawn(pid_t *pid, const char *path,
}
int
-_DEFUN(posix_spawn, (pid, path, fa, sa, argv, envp),
- pid_t *pid,
+posix_spawn (pid_t *pid,
const char *path,
const posix_spawn_file_actions_t *fa,
const posix_spawnattr_t *sa,
@@ -306,8 +305,7 @@ _DEFUN(posix_spawn, (pid, path, fa, sa, argv, envp),
}
int
-_DEFUN(posix_spawnp, (pid, path, fa, sa, argv, envp),
- pid_t *pid,
+posix_spawnp (pid_t *pid,
const char *path,
const posix_spawn_file_actions_t *fa,
const posix_spawnattr_t *sa,
@@ -322,8 +320,7 @@ _DEFUN(posix_spawnp, (pid, path, fa, sa, argv, envp),
*/
int
-_DEFUN(posix_spawn_file_actions_init, (ret),
- posix_spawn_file_actions_t *ret)
+posix_spawn_file_actions_init (posix_spawn_file_actions_t *ret)
{
posix_spawn_file_actions_t fa;
@@ -337,8 +334,7 @@ _DEFUN(posix_spawn_file_actions_init, (ret),
}
int
-_DEFUN(posix_spawn_file_actions_destroy, (fa),
- posix_spawn_file_actions_t *fa)
+posix_spawn_file_actions_destroy (posix_spawn_file_actions_t *fa)
{
posix_spawn_file_actions_entry_t *fae;
@@ -357,8 +353,7 @@ _DEFUN(posix_spawn_file_actions_destroy, (fa),
}
int
-_DEFUN(posix_spawn_file_actions_addopen, (fa, fildes, path, oflag, mode),
- posix_spawn_file_actions_t * __restrict fa,
+posix_spawn_file_actions_addopen (posix_spawn_file_actions_t * __restrict fa,
int fildes,
const char * __restrict path,
int oflag,
@@ -392,8 +387,7 @@ _DEFUN(posix_spawn_file_actions_addopen, (fa, fildes, path, oflag, mode),
}
int
-_DEFUN(posix_spawn_file_actions_adddup2, (fa, fildes, newfildes),
- posix_spawn_file_actions_t *fa,
+posix_spawn_file_actions_adddup2 (posix_spawn_file_actions_t *fa,
int fildes,
int newfildes)
{
@@ -417,8 +411,7 @@ _DEFUN(posix_spawn_file_actions_adddup2, (fa, fildes, newfildes),
}
int
-_DEFUN(posix_spawn_file_actions_addclose, (fa, fildes),
- posix_spawn_file_actions_t *fa,
+posix_spawn_file_actions_addclose (posix_spawn_file_actions_t *fa,
int fildes)
{
posix_spawn_file_actions_entry_t *fae;
@@ -444,8 +437,7 @@ _DEFUN(posix_spawn_file_actions_addclose, (fa, fildes),
*/
int
-_DEFUN(posix_spawnattr_init, (ret),
- posix_spawnattr_t *ret)
+posix_spawnattr_init (posix_spawnattr_t *ret)
{
posix_spawnattr_t sa;
@@ -459,16 +451,14 @@ _DEFUN(posix_spawnattr_init, (ret),
}
int
-_DEFUN(posix_spawnattr_destroy, (sa),
- posix_spawnattr_t *sa)
+posix_spawnattr_destroy (posix_spawnattr_t *sa)
{
free(*sa);
return (0);
}
int
-_DEFUN(posix_spawnattr_getflags, (sa, flags),
- const posix_spawnattr_t * __restrict sa,
+posix_spawnattr_getflags (const posix_spawnattr_t * __restrict sa,
short * __restrict flags)
{
*flags = (*sa)->sa_flags;
@@ -476,8 +466,7 @@ _DEFUN(posix_spawnattr_getflags, (sa, flags),
}
int
-_DEFUN(posix_spawnattr_getpgroup, (sa, pgroup),
- const posix_spawnattr_t * __restrict sa,
+posix_spawnattr_getpgroup (const posix_spawnattr_t * __restrict sa,
pid_t * __restrict pgroup)
{
*pgroup = (*sa)->sa_pgroup;
@@ -485,8 +474,7 @@ _DEFUN(posix_spawnattr_getpgroup, (sa, pgroup),
}
int
-_DEFUN(posix_spawnattr_getschedparam, (sa, schedparam),
- const posix_spawnattr_t * __restrict sa,
+posix_spawnattr_getschedparam (const posix_spawnattr_t * __restrict sa,
struct sched_param * __restrict schedparam)
{
*schedparam = (*sa)->sa_schedparam;
@@ -494,8 +482,7 @@ _DEFUN(posix_spawnattr_getschedparam, (sa, schedparam),
}
int
-_DEFUN(posix_spawnattr_getschedpolicy, (sa, schedpolicy),
- const posix_spawnattr_t * __restrict sa,
+posix_spawnattr_getschedpolicy (const posix_spawnattr_t * __restrict sa,
int * __restrict schedpolicy)
{
*schedpolicy = (*sa)->sa_schedpolicy;
@@ -503,8 +490,7 @@ _DEFUN(posix_spawnattr_getschedpolicy, (sa, schedpolicy),
}
int
-_DEFUN(posix_spawnattr_getsigdefault, (sa, sigdefault),
- const posix_spawnattr_t * __restrict sa,
+posix_spawnattr_getsigdefault (const posix_spawnattr_t * __restrict sa,
sigset_t * __restrict sigdefault)
{
*sigdefault = (*sa)->sa_sigdefault;
@@ -512,8 +498,7 @@ _DEFUN(posix_spawnattr_getsigdefault, (sa, sigdefault),
}
int
-_DEFUN(posix_spawnattr_getsigmask, (sa, sigmask),
- const posix_spawnattr_t * __restrict sa,
+posix_spawnattr_getsigmask (const posix_spawnattr_t * __restrict sa,
sigset_t * __restrict sigmask)
{
*sigmask = (*sa)->sa_sigmask;
@@ -521,8 +506,7 @@ _DEFUN(posix_spawnattr_getsigmask, (sa, sigmask),
}
int
-_DEFUN(posix_spawnattr_setflags, (sa, flags),
- posix_spawnattr_t *sa,
+posix_spawnattr_setflags (posix_spawnattr_t *sa,
short flags)
{
(*sa)->sa_flags = flags;
@@ -530,8 +514,7 @@ _DEFUN(posix_spawnattr_setflags, (sa, flags),
}
int
-_DEFUN(posix_spawnattr_setpgroup, (sa, pgroup),
- posix_spawnattr_t *sa,
+posix_spawnattr_setpgroup (posix_spawnattr_t *sa,
pid_t pgroup)
{
(*sa)->sa_pgroup = pgroup;
@@ -539,8 +522,7 @@ _DEFUN(posix_spawnattr_setpgroup, (sa, pgroup),
}
int
-_DEFUN(posix_spawnattr_setschedparam, (sa, schedparam),
- posix_spawnattr_t * __restrict sa,
+posix_spawnattr_setschedparam (posix_spawnattr_t * __restrict sa,
const struct sched_param * __restrict schedparam)
{
(*sa)->sa_schedparam = *schedparam;
@@ -548,8 +530,7 @@ _DEFUN(posix_spawnattr_setschedparam, (sa, schedparam),
}
int
-_DEFUN(posix_spawnattr_setschedpolicy, (sa, schedpolicy),
- posix_spawnattr_t *sa,
+posix_spawnattr_setschedpolicy (posix_spawnattr_t *sa,
int schedpolicy)
{
(*sa)->sa_schedpolicy = schedpolicy;
@@ -557,8 +538,7 @@ _DEFUN(posix_spawnattr_setschedpolicy, (sa, schedpolicy),
}
int
-_DEFUN(posix_spawnattr_setsigdefault, (sa, sigdefault),
- posix_spawnattr_t * __restrict sa,
+posix_spawnattr_setsigdefault (posix_spawnattr_t * __restrict sa,
const sigset_t * __restrict sigdefault)
{
(*sa)->sa_sigdefault = *sigdefault;
@@ -566,8 +546,7 @@ _DEFUN(posix_spawnattr_setsigdefault, (sa, sigdefault),
}
int
-_DEFUN(posix_spawnattr_setsigmask, (sa, sigmask),
- posix_spawnattr_t * __restrict sa,
+posix_spawnattr_setsigmask (posix_spawnattr_t * __restrict sa,
const sigset_t * __restrict sigmask)
{
(*sa)->sa_sigmask = *sigmask;
diff --git a/newlib/libc/posix/readdir.c b/newlib/libc/posix/readdir.c
index 3e620e328..40608f93c 100644
--- a/newlib/libc/posix/readdir.c
+++ b/newlib/libc/posix/readdir.c
@@ -45,8 +45,7 @@ extern int getdents (int fd, void *dp, int count);
* get next entry in a directory.
*/
struct dirent *
-_DEFUN(readdir, (dirp),
- register DIR *dirp)
+readdir (register DIR *dirp)
{
register struct dirent *dp;
diff --git a/newlib/libc/posix/readdir_r.c b/newlib/libc/posix/readdir_r.c
index a75eee9a3..8f4a98293 100644
--- a/newlib/libc/posix/readdir_r.c
+++ b/newlib/libc/posix/readdir_r.c
@@ -50,8 +50,7 @@ extern int getdents (int fd, void *dp, int count);
* get next entry in a directory using supplied dirent structure.
*/
int
-_DEFUN(readdir_r, (dirp, dp, dpp),
- register DIR *__restrict dirp,
+readdir_r (register DIR *__restrict dirp,
struct dirent *__restrict dp,
struct dirent **__restrict dpp) {
diff --git a/newlib/libc/posix/rewinddir.c b/newlib/libc/posix/rewinddir.c
index f9ca9f7d4..930b79afc 100644
--- a/newlib/libc/posix/rewinddir.c
+++ b/newlib/libc/posix/rewinddir.c
@@ -42,8 +42,7 @@ static char sccsid[] = "@(#)rewinddir.c 5.1 (Berkeley) 5/25/90";
#include <sys/lock.h>
void
-_DEFUN(rewinddir, (dirp),
- DIR *dirp)
+rewinddir (DIR *dirp)
{
#ifdef HAVE_DD_LOCK
__lock_acquire_recursive(dirp->dd_lock);
diff --git a/newlib/libc/posix/scandir.c b/newlib/libc/posix/scandir.c
index 0ffe68971..d95cff378 100644
--- a/newlib/libc/posix/scandir.c
+++ b/newlib/libc/posix/scandir.c
@@ -68,8 +68,7 @@ static char sccsid[] = "@(#)scandir.c 5.10 (Berkeley) 2/23/91";
#endif
int
-_DEFUN(scandir, (dirname, namelist, select, dcomp),
- const char *dirname,
+scandir (const char *dirname,
struct dirent ***namelist,
int (*select) __P((const struct dirent *)),
int (*dcomp) __P((const struct dirent **, const struct dirent **)))
@@ -169,8 +168,7 @@ cleanup:
* Alphabetic order comparison routine for those who want it.
*/
int
-_DEFUN(alphasort, (d1, d2),
- const struct dirent **d1,
+alphasort (const struct dirent **d1,
const struct dirent **d2)
{
return(strcmp((*d1)->d_name, (*d2)->d_name));
diff --git a/newlib/libc/posix/seekdir.c b/newlib/libc/posix/seekdir.c
index f876d7075..6ffeb1415 100644
--- a/newlib/libc/posix/seekdir.c
+++ b/newlib/libc/posix/seekdir.c
@@ -46,8 +46,7 @@ static char sccsid[] = "@(#)seekdir.c 5.7 (Berkeley) 6/1/90";
* _seekdir is in telldir.c so that it can share opaque data structures.
*/
void
-_DEFUN(seekdir, (dirp, loc),
- DIR *dirp,
+seekdir (DIR *dirp,
long loc)
{
#ifdef HAVE_DD_LOCK
diff --git a/newlib/libc/posix/telldir.c b/newlib/libc/posix/telldir.c
index 9c945fcf7..af86d8d4f 100644
--- a/newlib/libc/posix/telldir.c
+++ b/newlib/libc/posix/telldir.c
@@ -81,8 +81,7 @@ __LOCK_INIT(static, __dd_hash_mutex);
#if !defined(_ELIX_LEVEL) || (_ELIX_LEVEL >= 2)
long
-_DEFUN(telldir, (dirp),
- DIR *dirp)
+telldir (DIR *dirp)
{
register int index;
register struct ddloc *lp;
@@ -119,8 +118,7 @@ _DEFUN(telldir, (dirp),
* Only values returned by "telldir" should be passed to seekdir.
*/
void
-_DEFUN(_seekdir, (dirp, loc),
- register DIR *dirp,
+_seekdir (register DIR *dirp,
long loc)
{
register struct ddloc *lp;
@@ -173,8 +171,7 @@ found:
/* clean out any hash entries from a closed directory */
void
-_DEFUN(_cleanupdir, (dirp),
- register DIR *dirp)
+_cleanupdir (register DIR *dirp)
{
int i;
diff --git a/newlib/libc/reent/execr.c b/newlib/libc/reent/execr.c
index 0dc531384..59b61223e 100644
--- a/newlib/libc/reent/execr.c
+++ b/newlib/libc/reent/execr.c
@@ -45,8 +45,7 @@ DESCRIPTION
*/
int
-_DEFUN (_execve_r, (ptr, name, argv, env),
- struct _reent *ptr,
+_execve_r (struct _reent *ptr,
const char *name,
char *const argv[],
char *const env[])
@@ -81,8 +80,7 @@ DESCRIPTION
#ifndef NO_FORK
int
-_DEFUN (_fork_r, (ptr),
- struct _reent *ptr)
+_fork_r (struct _reent *ptr)
{
int ret;
@@ -113,8 +111,7 @@ DESCRIPTION
*/
int
-_DEFUN (_wait_r, (ptr, status),
- struct _reent *ptr,
+_wait_r (struct _reent *ptr,
int *status)
{
int ret;
diff --git a/newlib/libc/reent/fcntlr.c b/newlib/libc/reent/fcntlr.c
index fdfe41090..cd19d226f 100644
--- a/newlib/libc/reent/fcntlr.c
+++ b/newlib/libc/reent/fcntlr.c
@@ -40,8 +40,7 @@ DESCRIPTION
*/
int
-_DEFUN (_fcntl_r, (ptr, fd, cmd, arg),
- struct _reent *ptr,
+_fcntl_r (struct _reent *ptr,
int fd,
int cmd,
int arg)
diff --git a/newlib/libc/reent/fstat64r.c b/newlib/libc/reent/fstat64r.c
index 06a89a5c8..c546f5c1d 100644
--- a/newlib/libc/reent/fstat64r.c
+++ b/newlib/libc/reent/fstat64r.c
@@ -47,8 +47,7 @@ DESCRIPTION
*/
int
-_DEFUN (_fstat64_r, (ptr, fd, pstat),
- struct _reent *ptr,
+_fstat64_r (struct _reent *ptr,
int fd,
struct stat64 *pstat)
{
diff --git a/newlib/libc/reent/gettimeofdayr.c b/newlib/libc/reent/gettimeofdayr.c
index 80942afb0..9b982a993 100644
--- a/newlib/libc/reent/gettimeofdayr.c
+++ b/newlib/libc/reent/gettimeofdayr.c
@@ -52,8 +52,7 @@ DESCRIPTION
*/
int
-_DEFUN (_gettimeofday_r, (ptr, ptimeval, ptimezone),
- struct _reent *ptr,
+_gettimeofday_r (struct _reent *ptr,
struct timeval *ptimeval,
void *ptimezone)
{
diff --git a/newlib/libc/reent/linkr.c b/newlib/libc/reent/linkr.c
index 5e85f2d2e..b22da5f94 100644
--- a/newlib/libc/reent/linkr.c
+++ b/newlib/libc/reent/linkr.c
@@ -43,8 +43,7 @@ DESCRIPTION
*/
int
-_DEFUN (_link_r, (ptr, old, new),
- struct _reent *ptr,
+_link_r (struct _reent *ptr,
const char *old,
const char *new)
{
diff --git a/newlib/libc/reent/lseek64r.c b/newlib/libc/reent/lseek64r.c
index 2f16f0bca..40769fb6d 100644
--- a/newlib/libc/reent/lseek64r.c
+++ b/newlib/libc/reent/lseek64r.c
@@ -41,8 +41,7 @@ DESCRIPTION
*/
_off64_t
-_DEFUN (_lseek64_r, (ptr, fd, pos, whence),
- struct _reent *ptr,
+_lseek64_r (struct _reent *ptr,
int fd,
_off64_t pos,
int whence)
diff --git a/newlib/libc/reent/lseekr.c b/newlib/libc/reent/lseekr.c
index 639158912..ac2daaab9 100644
--- a/newlib/libc/reent/lseekr.c
+++ b/newlib/libc/reent/lseekr.c
@@ -38,8 +38,7 @@ DESCRIPTION
*/
_off_t
-_DEFUN (_lseek_r, (ptr, fd, pos, whence),
- struct _reent *ptr,
+_lseek_r (struct _reent *ptr,
int fd,
_off_t pos,
int whence)
diff --git a/newlib/libc/reent/mkdirr.c b/newlib/libc/reent/mkdirr.c
index dca20dc2c..fd72df64c 100644
--- a/newlib/libc/reent/mkdirr.c
+++ b/newlib/libc/reent/mkdirr.c
@@ -40,8 +40,7 @@ DESCRIPTION
#include <sys/stat.h>
int
-_DEFUN (_mkdir_r, (ptr, path, mode),
- struct _reent *ptr,
+_mkdir_r (struct _reent *ptr,
const char *path,
int mode)
{
diff --git a/newlib/libc/reent/openr.c b/newlib/libc/reent/openr.c
index 33ace75ad..c6a7db5de 100644
--- a/newlib/libc/reent/openr.c
+++ b/newlib/libc/reent/openr.c
@@ -39,8 +39,7 @@ DESCRIPTION
*/
int
-_DEFUN (_open_r, (ptr, file, flags, mode),
- struct _reent *ptr,
+_open_r (struct _reent *ptr,
const char *file,
int flags,
int mode)
diff --git a/newlib/libc/reent/readr.c b/newlib/libc/reent/readr.c
index 9a3a694cc..7fccefd32 100644
--- a/newlib/libc/reent/readr.c
+++ b/newlib/libc/reent/readr.c
@@ -38,8 +38,7 @@ DESCRIPTION
*/
_ssize_t
-_DEFUN (_read_r, (ptr, fd, buf, cnt),
- struct _reent *ptr,
+_read_r (struct _reent *ptr,
int fd,
void *buf,
size_t cnt)
diff --git a/newlib/libc/reent/reent.c b/newlib/libc/reent/reent.c
index a98c3110c..7c57e2019 100644
--- a/newlib/libc/reent/reent.c
+++ b/newlib/libc/reent/reent.c
@@ -30,8 +30,7 @@ int errno;
/* Interim cleanup code */
void
-_DEFUN (cleanup_glue, (ptr, glue),
- struct _reent *ptr,
+cleanup_glue (struct _reent *ptr,
struct _glue *glue)
{
/* Have to reclaim these in reverse order: */
@@ -42,8 +41,7 @@ _DEFUN (cleanup_glue, (ptr, glue),
}
void
-_DEFUN (_reclaim_reent, (ptr),
- struct _reent *ptr)
+_reclaim_reent (struct _reent *ptr)
{
if (ptr != _impure_ptr)
{
diff --git a/newlib/libc/reent/renamer.c b/newlib/libc/reent/renamer.c
index 736c1a30f..5420dc4a0 100644
--- a/newlib/libc/reent/renamer.c
+++ b/newlib/libc/reent/renamer.c
@@ -40,8 +40,7 @@ DESCRIPTION
*/
int
-_DEFUN (_rename_r, (ptr, old, new),
- struct _reent *ptr,
+_rename_r (struct _reent *ptr,
const char *old,
const char *new)
{
diff --git a/newlib/libc/reent/sbrkr.c b/newlib/libc/reent/sbrkr.c
index 0bc4163c1..21c4bd913 100644
--- a/newlib/libc/reent/sbrkr.c
+++ b/newlib/libc/reent/sbrkr.c
@@ -41,8 +41,7 @@ DESCRIPTION
*/
void *
-_DEFUN (_sbrk_r, (ptr, incr),
- struct _reent *ptr,
+_sbrk_r (struct _reent *ptr,
ptrdiff_t incr)
{
char *ret;
diff --git a/newlib/libc/reent/signalr.c b/newlib/libc/reent/signalr.c
index 9229061d5..345910e4b 100644
--- a/newlib/libc/reent/signalr.c
+++ b/newlib/libc/reent/signalr.c
@@ -43,8 +43,7 @@ DESCRIPTION
*/
int
-_DEFUN (_kill_r, (ptr, pid, sig),
- struct _reent *ptr,
+_kill_r (struct _reent *ptr,
int pid,
int sig)
{
@@ -78,8 +77,7 @@ DESCRIPTION
*/
int
-_DEFUN (_getpid_r, (ptr),
- struct _reent *ptr)
+_getpid_r (struct _reent *ptr)
{
int ret;
ret = _getpid ();
diff --git a/newlib/libc/reent/stat64r.c b/newlib/libc/reent/stat64r.c
index 2077c0a2e..b64736ef2 100644
--- a/newlib/libc/reent/stat64r.c
+++ b/newlib/libc/reent/stat64r.c
@@ -45,8 +45,7 @@ DESCRIPTION
*/
int
-_DEFUN (_stat64_r, (ptr, file, pstat),
- struct _reent *ptr,
+_stat64_r (struct _reent *ptr,
const char *file,
struct stat64 *pstat)
{
diff --git a/newlib/libc/reent/statr.c b/newlib/libc/reent/statr.c
index fb27ab0c0..9388e0246 100644
--- a/newlib/libc/reent/statr.c
+++ b/newlib/libc/reent/statr.c
@@ -45,8 +45,7 @@ DESCRIPTION
*/
int
-_DEFUN (_stat_r, (ptr, file, pstat),
- struct _reent *ptr,
+_stat_r (struct _reent *ptr,
const char *file,
struct stat *pstat)
{
diff --git a/newlib/libc/reent/timesr.c b/newlib/libc/reent/timesr.c
index dbe6a4ef0..bb890035a 100644
--- a/newlib/libc/reent/timesr.c
+++ b/newlib/libc/reent/timesr.c
@@ -44,8 +44,7 @@ DESCRIPTION
*/
clock_t
-_DEFUN (_times_r, (ptr, ptms),
- struct _reent *ptr,
+_times_r (struct _reent *ptr,
struct tms *ptms)
{
clock_t ret;
diff --git a/newlib/libc/reent/unlinkr.c b/newlib/libc/reent/unlinkr.c
index 0ef0ff56e..41bac0194 100644
--- a/newlib/libc/reent/unlinkr.c
+++ b/newlib/libc/reent/unlinkr.c
@@ -38,8 +38,7 @@ DESCRIPTION
*/
int
-_DEFUN (_unlink_r, (ptr, file),
- struct _reent *ptr,
+_unlink_r (struct _reent *ptr,
const char *file)
{
int ret;
diff --git a/newlib/libc/reent/writer.c b/newlib/libc/reent/writer.c
index 8d4b37530..704aba18b 100644
--- a/newlib/libc/reent/writer.c
+++ b/newlib/libc/reent/writer.c
@@ -38,8 +38,7 @@ DESCRIPTION
*/
_ssize_t
-_DEFUN (_write_r, (ptr, fd, buf, cnt),
- struct _reent *ptr,
+_write_r (struct _reent *ptr,
int fd,
const void *buf,
size_t cnt)
diff --git a/newlib/libc/search/bsearch.c b/newlib/libc/search/bsearch.c
index 79a489680..2f1dc9d77 100644
--- a/newlib/libc/search/bsearch.c
+++ b/newlib/libc/search/bsearch.c
@@ -56,8 +56,7 @@ No supporting OS subroutines are required.
#include <stdlib.h>
void *
-_DEFUN (bsearch, (key, base, nmemb, size, compar),
- const void *key,
+bsearch (const void *key,
const void *base,
size_t nmemb,
size_t size,
diff --git a/newlib/libc/search/hash.c b/newlib/libc/search/hash.c
index f20322c42..af2be9aa8 100644
--- a/newlib/libc/search/hash.c
+++ b/newlib/libc/search/hash.c
@@ -104,8 +104,7 @@ int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
/* OPEN/CLOSE */
extern DB *
-_DEFUN(__hash_open, (file, flags, mode, info, dflags),
- const char *file,
+__hash_open (const char *file,
int flags,
int mode,
int dflags,
diff --git a/newlib/libc/search/hcreate.c b/newlib/libc/search/hcreate.c
index 5472de1f0..7664353cc 100644
--- a/newlib/libc/search/hcreate.c
+++ b/newlib/libc/search/hcreate.c
@@ -57,7 +57,7 @@ __RCSID("$NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $");
static struct hsearch_data htab;
int
-_DEFUN(hcreate, (nel), size_t nel)
+hcreate (size_t nel)
{
return hcreate_r (nel, &htab);
}
@@ -69,8 +69,7 @@ hdestroy (void)
}
ENTRY *
-_DEFUN(hsearch, (item, action),
- ENTRY item,
+hsearch (ENTRY item,
ACTION action)
{
ENTRY *retval;
diff --git a/newlib/libc/search/qsort.c b/newlib/libc/search/qsort.c
index 6c84b95b7..db3f58951 100644
--- a/newlib/libc/search/qsort.c
+++ b/newlib/libc/search/qsort.c
@@ -100,8 +100,7 @@ static inline void swapfunc (char *, char *, int, int);
es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
static inline void
-_DEFUN(swapfunc, (a, b, n, swaptype),
- char *a,
+swapfunc (char *a,
char *b,
int n,
int swaptype)
@@ -131,8 +130,7 @@ _DEFUN(swapfunc, (a, b, n, swaptype),
#endif
static inline char *
-_DEFUN(med3, (a, b, c, cmp, thunk),
- char *a,
+med3 (char *a,
char *b,
char *c,
cmp_t *cmp,
@@ -149,16 +147,14 @@ __unused
#if defined(I_AM_QSORT_R)
void
-_DEFUN(__bsd_qsort_r, (a, n, es, thunk, cmp),
- void *a,
+__bsd_qsort_r (void *a,
size_t n,
size_t es,
void *thunk,
cmp_t *cmp)
#elif defined(I_AM_GNU_QSORT_R)
void
-_DEFUN(qsort_r, (a, n, es, cmp, thunk),
- void *a,
+qsort_r (void *a,
size_t n,
size_t es,
cmp_t *cmp,
@@ -166,8 +162,7 @@ _DEFUN(qsort_r, (a, n, es, cmp, thunk),
#else
#define thunk NULL
void
-_DEFUN(qsort, (a, n, es, cmp),
- void *a,
+qsort (void *a,
size_t n,
size_t es,
cmp_t *cmp)
diff --git a/newlib/libc/search/tdelete.c b/newlib/libc/search/tdelete.c
index a0128e98b..a595200db 100644
--- a/newlib/libc/search/tdelete.c
+++ b/newlib/libc/search/tdelete.c
@@ -26,8 +26,7 @@ __RCSID("$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
/* delete node with given key */
void *
-_DEFUN(tdelete, (vkey, vrootp, compar),
- const void *__restrict vkey, /* key to be deleted */
+tdelete (const void *__restrict vkey, /* key to be deleted */
void **__restrict vrootp, /* address of the root of tree */
int (*compar)(const void *, const void *))
{
diff --git a/newlib/libc/search/tdestroy.c b/newlib/libc/search/tdestroy.c
index e1418207a..04c6b7052 100644
--- a/newlib/libc/search/tdestroy.c
+++ b/newlib/libc/search/tdestroy.c
@@ -40,8 +40,7 @@ trecurse(root, free_action)
}
void
-_DEFUN(tdestroy, (vrootp, freefct),
- void *vrootp,
+tdestroy (void *vrootp,
void (*freefct)(void *))
{
node_t *root = (node_t *) vrootp;
diff --git a/newlib/libc/search/tfind.c b/newlib/libc/search/tfind.c
index 108213048..670f41fca 100644
--- a/newlib/libc/search/tfind.c
+++ b/newlib/libc/search/tfind.c
@@ -25,8 +25,7 @@ __RCSID("$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
/* find a node, or return 0 */
void *
-_DEFUN(tfind, (vkey, vrootp, compar),
- const void *vkey, /* key to be found */
+tfind (const void *vkey, /* key to be found */
void **vrootp, /* address of the tree root */
int (*compar)(const void *, const void *))
{
diff --git a/newlib/libc/search/tsearch.c b/newlib/libc/search/tsearch.c
index 8fe265703..82d69447f 100644
--- a/newlib/libc/search/tsearch.c
+++ b/newlib/libc/search/tsearch.c
@@ -25,8 +25,7 @@ __RCSID("$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $");
/* find or insert datum into search tree */
void *
-_DEFUN(tsearch, (vkey, vrootp, compar),
- const void *vkey, /* key to be located */
+tsearch (const void *vkey, /* key to be located */
void **vrootp, /* address of tree root */
int (*compar)(const void *, const void *))
{
diff --git a/newlib/libc/search/twalk.c b/newlib/libc/search/twalk.c
index 26d6e97db..02ef52242 100644
--- a/newlib/libc/search/twalk.c
+++ b/newlib/libc/search/twalk.c
@@ -49,8 +49,7 @@ trecurse(root, action, level)
/* Walk the nodes of a tree */
void
-_DEFUN(twalk, (vroot, action),
- const void *vroot, /* Root of the tree to be walked */
+twalk (const void *vroot, /* Root of the tree to be walked */
void (*action)(const void *, VISIT, int))
{
if (vroot != NULL && action != NULL)
diff --git a/newlib/libc/signal/psignal.c b/newlib/libc/signal/psignal.c
index a62f8ae01..602714f49 100644
--- a/newlib/libc/signal/psignal.c
+++ b/newlib/libc/signal/psignal.c
@@ -34,8 +34,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include <string.h>
void
-_DEFUN(psignal, (sig, s),
- int sig,
+psignal (int sig,
const char *s)
{
if (s != NULL && *s != '\0')
diff --git a/newlib/libc/signal/raise.c b/newlib/libc/signal/raise.c
index 6f93686e6..c678c6e2d 100644
--- a/newlib/libc/signal/raise.c
+++ b/newlib/libc/signal/raise.c
@@ -52,8 +52,7 @@ int _dummy_raise;
#ifndef _REENT_ONLY
int
-_DEFUN (raise, (sig),
- int sig)
+raise (int sig)
{
return _raise_r (_REENT, sig);
}
@@ -61,8 +60,7 @@ _DEFUN (raise, (sig),
#endif
int
-_DEFUN (_raise_r, (reent, sig),
- struct _reent *reent,
+_raise_r (struct _reent *reent,
int sig)
{
return _kill_r (reent, _getpid_r (reent), sig);
diff --git a/newlib/libc/signal/signal.c b/newlib/libc/signal/signal.c
index f5fe4c0b9..0110287d8 100644
--- a/newlib/libc/signal/signal.c
+++ b/newlib/libc/signal/signal.c
@@ -89,8 +89,7 @@ int _dummy_simulated_signal;
#include <_syslist.h>
int
-_DEFUN (_init_signal_r, (ptr),
- struct _reent *ptr)
+_init_signal_r (struct _reent *ptr)
{
int i;
@@ -108,8 +107,7 @@ _DEFUN (_init_signal_r, (ptr),
}
_sig_func_ptr
-_DEFUN (_signal_r, (ptr, sig, func),
- struct _reent *ptr,
+_signal_r (struct _reent *ptr,
int sig,
_sig_func_ptr func)
{
@@ -131,8 +129,7 @@ _DEFUN (_signal_r, (ptr, sig, func),
}
int
-_DEFUN (_raise_r, (ptr, sig),
- struct _reent *ptr,
+_raise_r (struct _reent *ptr,
int sig)
{
_sig_func_ptr func;
@@ -166,8 +163,7 @@ _DEFUN (_raise_r, (ptr, sig),
}
int
-_DEFUN (__sigtramp_r, (ptr, sig),
- struct _reent *ptr,
+__sigtramp_r (struct _reent *ptr,
int sig)
{
_sig_func_ptr func;
@@ -198,15 +194,13 @@ _DEFUN (__sigtramp_r, (ptr, sig),
#ifndef _REENT_ONLY
int
-_DEFUN (raise, (sig),
- int sig)
+raise (int sig)
{
return _raise_r (_REENT, sig);
}
_sig_func_ptr
-_DEFUN (signal, (sig, func),
- int sig,
+signal (int sig,
_sig_func_ptr func)
{
return _signal_r (_REENT, sig, func);
@@ -219,7 +213,7 @@ _init_signal (void)
}
int
-_DEFUN (__sigtramp, (sig), int sig)
+__sigtramp (int sig)
{
return __sigtramp_r (_REENT, sig);
}
diff --git a/newlib/libc/stdio/asiprintf.c b/newlib/libc/stdio/asiprintf.c
index ec60e3ed4..ce6d0a972 100644
--- a/newlib/libc/stdio/asiprintf.c
+++ b/newlib/libc/stdio/asiprintf.c
@@ -25,8 +25,7 @@
#include "local.h"
int
-_DEFUN(_asiprintf_r, (ptr, strp, fmt),
- struct _reent *ptr,
+_asiprintf_r (struct _reent *ptr,
char **strp,
const char *fmt, ...)
{
@@ -53,8 +52,7 @@ _DEFUN(_asiprintf_r, (ptr, strp, fmt),
#ifndef _REENT_ONLY
int
-_DEFUN(asiprintf, (strp, fmt),
- char **strp,
+asiprintf (char **strp,
const char *fmt, ...)
{
int ret;
diff --git a/newlib/libc/stdio/asniprintf.c b/newlib/libc/stdio/asniprintf.c
index ba4772f08..0bfe00d9b 100644
--- a/newlib/libc/stdio/asniprintf.c
+++ b/newlib/libc/stdio/asniprintf.c
@@ -14,8 +14,7 @@
#include "local.h"
char *
-_DEFUN(_asniprintf_r, (ptr, buf, lenp, fmt),
- struct _reent *ptr,
+_asniprintf_r (struct _reent *ptr,
char *buf,
size_t *lenp,
const char *fmt, ...)
@@ -61,8 +60,7 @@ _DEFUN(_asniprintf_r, (ptr, buf, lenp, fmt),
#ifndef _REENT_ONLY
char *
-_DEFUN(asniprintf, (buf, lenp, fmt),
- char *buf,
+asniprintf (char *buf,
size_t *lenp,
const char *fmt, ...)
{
diff --git a/newlib/libc/stdio/asnprintf.c b/newlib/libc/stdio/asnprintf.c
index c9a37dbf1..34639dc09 100644
--- a/newlib/libc/stdio/asnprintf.c
+++ b/newlib/libc/stdio/asnprintf.c
@@ -14,8 +14,7 @@
#include "local.h"
char *
-_DEFUN(_asnprintf_r, (ptr, buf, lenp, fmt),
- struct _reent *__restrict ptr,
+_asnprintf_r (struct _reent *__restrict ptr,
char *buf,
size_t *lenp,
const char *__restrict fmt, ...)
@@ -67,8 +66,7 @@ _EXFUN(_asniprintf_r, (struct _reent *, char *, size_t *, const char *, ...)
#ifndef _REENT_ONLY
char *
-_DEFUN(asnprintf, (buf, lenp, fmt),
- char *__restrict buf,
+asnprintf (char *__restrict buf,
size_t *__restrict lenp,
const char *__restrict fmt, ...)
{
diff --git a/newlib/libc/stdio/asprintf.c b/newlib/libc/stdio/asprintf.c
index b3d9122f5..330491ebe 100644
--- a/newlib/libc/stdio/asprintf.c
+++ b/newlib/libc/stdio/asprintf.c
@@ -25,8 +25,7 @@
#include "local.h"
int
-_DEFUN(_asprintf_r, (ptr, strp, fmt),
- struct _reent *ptr,
+_asprintf_r (struct _reent *ptr,
char **__restrict strp,
const char *__restrict fmt, ...)
{
@@ -59,8 +58,7 @@ _EXFUN(_asiprintf_r, (struct _reent *, char **, const char *, ...)
#ifndef _REENT_ONLY
int
-_DEFUN(asprintf, (strp, fmt),
- char **__restrict strp,
+asprintf (char **__restrict strp,
const char *__restrict fmt, ...)
{
int ret;
diff --git a/newlib/libc/stdio/clearerr.c b/newlib/libc/stdio/clearerr.c
index 23e3c18e3..be83d6dd9 100644
--- a/newlib/libc/stdio/clearerr.c
+++ b/newlib/libc/stdio/clearerr.c
@@ -72,8 +72,7 @@ No supporting OS subroutines are required.
#undef clearerr
void
-_DEFUN(clearerr, (fp),
- FILE * fp)
+clearerr (FILE * fp)
{
CHECK_INIT(_REENT, fp);
_newlib_flockfile_start (fp);
diff --git a/newlib/libc/stdio/clearerr_u.c b/newlib/libc/stdio/clearerr_u.c
index 7514fa2e9..4952f777c 100644
--- a/newlib/libc/stdio/clearerr_u.c
+++ b/newlib/libc/stdio/clearerr_u.c
@@ -33,8 +33,7 @@
#undef clearerr_unlocked
void
-_DEFUN(clearerr_unlocked, (fp),
- FILE * fp)
+clearerr_unlocked (FILE * fp)
{
CHECK_INIT(_REENT, fp);
__sclearerr (fp);
diff --git a/newlib/libc/stdio/diprintf.c b/newlib/libc/stdio/diprintf.c
index 0059e044b..8ac58354a 100644
--- a/newlib/libc/stdio/diprintf.c
+++ b/newlib/libc/stdio/diprintf.c
@@ -49,8 +49,7 @@ Supporting OS subroutines required: <<sbrk>>, <<write>>.
#include <stdarg.h>
int
-_DEFUN(_diprintf_r, (ptr, fd, format),
- struct _reent *ptr,
+_diprintf_r (struct _reent *ptr,
int fd,
const char *format, ...)
{
@@ -66,8 +65,7 @@ _DEFUN(_diprintf_r, (ptr, fd, format),
#ifndef _REENT_ONLY
int
-_DEFUN(diprintf, (fd, format),
- int fd,
+diprintf (int fd,
const char *format, ...)
{
va_list ap;
diff --git a/newlib/libc/stdio/dprintf.c b/newlib/libc/stdio/dprintf.c
index 5fd45049b..1493e1f18 100644
--- a/newlib/libc/stdio/dprintf.c
+++ b/newlib/libc/stdio/dprintf.c
@@ -53,8 +53,7 @@ Supporting OS subroutines required: <<sbrk>>, <<write>>.
#include "local.h"
int
-_DEFUN(_dprintf_r, (ptr, fd, format),
- struct _reent *ptr,
+_dprintf_r (struct _reent *ptr,
int fd,
const char *__restrict format, ...)
{
@@ -76,8 +75,7 @@ _EXFUN(_diprintf_r, (struct _reent *, int, const char *, ...)
#ifndef _REENT_ONLY
int
-_DEFUN(dprintf, (fd, format),
- int fd,
+dprintf (int fd,
const char *__restrict format, ...)
{
va_list ap;
diff --git a/newlib/libc/stdio/fclose.c b/newlib/libc/stdio/fclose.c
index 264d2e48f..1c36057a7 100644
--- a/newlib/libc/stdio/fclose.c
+++ b/newlib/libc/stdio/fclose.c
@@ -56,8 +56,7 @@ Required OS subroutines: <<close>>, <<fstat>>, <<isatty>>, <<lseek>>,
#include "local.h"
int
-_DEFUN(_fclose_r, (rptr, fp),
- struct _reent *rptr,
+_fclose_r (struct _reent *rptr,
register FILE * fp)
{
int r;
@@ -121,8 +120,7 @@ _DEFUN(_fclose_r, (rptr, fp),
#ifndef _REENT_ONLY
int
-_DEFUN(fclose, (fp),
- register FILE * fp)
+fclose (register FILE * fp)
{
return _fclose_r(_REENT, fp);
}
diff --git a/newlib/libc/stdio/fcloseall.c b/newlib/libc/stdio/fcloseall.c
index 659172b32..2e78b4b3c 100644
--- a/newlib/libc/stdio/fcloseall.c
+++ b/newlib/libc/stdio/fcloseall.c
@@ -57,8 +57,7 @@ Required OS subroutines: <<close>>, <<fstat>>, <<isatty>>, <<lseek>>,
#include "local.h"
int
-_DEFUN(_fcloseall_r, (ptr),
- struct _reent *ptr)
+_fcloseall_r (struct _reent *ptr)
{
return _fwalk_reent (ptr, _fclose_r);
}
diff --git a/newlib/libc/stdio/fdopen.c b/newlib/libc/stdio/fdopen.c
index 876a94117..854c0183d 100644
--- a/newlib/libc/stdio/fdopen.c
+++ b/newlib/libc/stdio/fdopen.c
@@ -53,8 +53,7 @@ PORTABILITY
#include <_syslist.h>
FILE *
-_DEFUN(_fdopen_r, (ptr, fd, mode),
- struct _reent *ptr,
+_fdopen_r (struct _reent *ptr,
int fd,
const char *mode)
{
@@ -123,8 +122,7 @@ _DEFUN(_fdopen_r, (ptr, fd, mode),
#ifndef _REENT_ONLY
FILE *
-_DEFUN(fdopen, (fd, mode),
- int fd,
+fdopen (int fd,
const char *mode)
{
return _fdopen_r (_REENT, fd, mode);
diff --git a/newlib/libc/stdio/feof.c b/newlib/libc/stdio/feof.c
index 617ce58df..879417936 100644
--- a/newlib/libc/stdio/feof.c
+++ b/newlib/libc/stdio/feof.c
@@ -65,8 +65,7 @@ No supporting OS subroutines are required.
#undef feof
int
-_DEFUN(feof, (fp),
- FILE * fp)
+feof (FILE * fp)
{
int result;
CHECK_INIT(_REENT, fp);
diff --git a/newlib/libc/stdio/feof_u.c b/newlib/libc/stdio/feof_u.c
index 48fc4af47..e9238e113 100644
--- a/newlib/libc/stdio/feof_u.c
+++ b/newlib/libc/stdio/feof_u.c
@@ -32,8 +32,7 @@
#undef feof_unlocked
int
-_DEFUN(feof_unlocked, (fp),
- FILE * fp)
+feof_unlocked (FILE * fp)
{
CHECK_INIT(_REENT, fp);
return __sfeof (fp);
diff --git a/newlib/libc/stdio/ferror.c b/newlib/libc/stdio/ferror.c
index f99df2311..3bff52045 100644
--- a/newlib/libc/stdio/ferror.c
+++ b/newlib/libc/stdio/ferror.c
@@ -74,8 +74,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#undef ferror
int
-_DEFUN(ferror, (fp),
- FILE * fp)
+ferror (FILE * fp)
{
int result;
CHECK_INIT(_REENT, fp);
diff --git a/newlib/libc/stdio/ferror_u.c b/newlib/libc/stdio/ferror_u.c
index 9b9edba24..ae1e278fd 100644
--- a/newlib/libc/stdio/ferror_u.c
+++ b/newlib/libc/stdio/ferror_u.c
@@ -33,8 +33,7 @@
#undef ferror_unlocked
int
-_DEFUN(ferror_unlocked, (fp),
- FILE * fp)
+ferror_unlocked (FILE * fp)
{
CHECK_INIT(_REENT, fp);
return __sferror (fp);
diff --git a/newlib/libc/stdio/fflush.c b/newlib/libc/stdio/fflush.c
index 18d6d3e74..e958af9fc 100644
--- a/newlib/libc/stdio/fflush.c
+++ b/newlib/libc/stdio/fflush.c
@@ -100,8 +100,7 @@ No supporting OS subroutines are required.
/* Core function which does not lock file pointer. This gets called
directly from __srefill. */
int
-_DEFUN(__sflush_r, (ptr, fp),
- struct _reent *ptr,
+__sflush_r (struct _reent *ptr,
register FILE * fp)
{
register unsigned char *p;
@@ -239,8 +238,7 @@ _DEFUN(__sflush_r, (ptr, fp),
and we don't want to move the underlying file pointer unless we're
writing. */
int
-_DEFUN(__sflushw_r, (ptr, fp),
- struct _reent *ptr,
+__sflushw_r (struct _reent *ptr,
register FILE *fp)
{
return (fp->_flags & __SWR) ? __sflush_r (ptr, fp) : 0;
@@ -250,8 +248,7 @@ _DEFUN(__sflushw_r, (ptr, fp),
#endif /* __IMPL_UNLOCKED__ */
int
-_DEFUN(_fflush_r, (ptr, fp),
- struct _reent *ptr,
+_fflush_r (struct _reent *ptr,
register FILE * fp)
{
int ret;
@@ -286,8 +283,7 @@ _DEFUN(_fflush_r, (ptr, fp),
#ifndef _REENT_ONLY
int
-_DEFUN(fflush, (fp),
- register FILE * fp)
+fflush (register FILE * fp)
{
if (fp == NULL)
return _fwalk_reent (_GLOBAL_REENT, _fflush_r);
diff --git a/newlib/libc/stdio/fgetc.c b/newlib/libc/stdio/fgetc.c
index 45404d30e..7d0d4842c 100644
--- a/newlib/libc/stdio/fgetc.c
+++ b/newlib/libc/stdio/fgetc.c
@@ -85,8 +85,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include "local.h"
int
-_DEFUN(_fgetc_r, (ptr, fp),
- struct _reent * ptr,
+_fgetc_r (struct _reent * ptr,
FILE * fp)
{
int result;
@@ -100,8 +99,7 @@ _DEFUN(_fgetc_r, (ptr, fp),
#ifndef _REENT_ONLY
int
-_DEFUN(fgetc, (fp),
- FILE * fp)
+fgetc (FILE * fp)
{
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
int result;
diff --git a/newlib/libc/stdio/fgetc_u.c b/newlib/libc/stdio/fgetc_u.c
index 45ee3b1b5..9a5719c29 100644
--- a/newlib/libc/stdio/fgetc_u.c
+++ b/newlib/libc/stdio/fgetc_u.c
@@ -29,8 +29,7 @@
#include "local.h"
int
-_DEFUN(_fgetc_unlocked_r, (ptr, fp),
- struct _reent * ptr,
+_fgetc_unlocked_r (struct _reent * ptr,
FILE * fp)
{
CHECK_INIT(ptr, fp);
@@ -40,8 +39,7 @@ _DEFUN(_fgetc_unlocked_r, (ptr, fp),
#ifndef _REENT_ONLY
int
-_DEFUN(fgetc_unlocked, (fp),
- FILE * fp)
+fgetc_unlocked (FILE * fp)
{
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/fgetpos.c b/newlib/libc/stdio/fgetpos.c
index 373adfd8e..b4f681281 100644
--- a/newlib/libc/stdio/fgetpos.c
+++ b/newlib/libc/stdio/fgetpos.c
@@ -65,8 +65,7 @@ No supporting OS subroutines are required.
#include <stdio.h>
int
-_DEFUN(_fgetpos_r, (ptr, fp, pos),
- struct _reent * ptr,
+_fgetpos_r (struct _reent * ptr,
FILE *__restrict fp,
_fpos_t *__restrict pos)
{
@@ -82,8 +81,7 @@ _DEFUN(_fgetpos_r, (ptr, fp, pos),
#ifndef _REENT_ONLY
int
-_DEFUN(fgetpos, (fp, pos),
- FILE *__restrict fp,
+fgetpos (FILE *__restrict fp,
_fpos_t *__restrict pos)
{
return _fgetpos_r (_REENT, fp, pos);
diff --git a/newlib/libc/stdio/fgets.c b/newlib/libc/stdio/fgets.c
index c6ef6d3d5..7adfb2179 100644
--- a/newlib/libc/stdio/fgets.c
+++ b/newlib/libc/stdio/fgets.c
@@ -94,8 +94,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
*/
char *
-_DEFUN(_fgets_r, (ptr, buf, n, fp),
- struct _reent * ptr,
+_fgets_r (struct _reent * ptr,
char *__restrict buf,
int n,
FILE *__restrict fp)
@@ -189,8 +188,7 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp),
#ifndef _REENT_ONLY
char *
-_DEFUN(fgets, (buf, n, fp),
- char *__restrict buf,
+fgets (char *__restrict buf,
int n,
FILE *__restrict fp)
{
diff --git a/newlib/libc/stdio/fgetwc.c b/newlib/libc/stdio/fgetwc.c
index 718b53a16..522697e9b 100644
--- a/newlib/libc/stdio/fgetwc.c
+++ b/newlib/libc/stdio/fgetwc.c
@@ -125,8 +125,7 @@ PORTABILITY
#include "local.h"
wint_t
-_DEFUN(__fgetwc, (ptr, fp),
- struct _reent *ptr,
+__fgetwc (struct _reent *ptr,
register FILE *fp)
{
wchar_t wc;
@@ -172,8 +171,7 @@ _DEFUN(__fgetwc, (ptr, fp),
}
wint_t
-_DEFUN(_fgetwc_r, (ptr, fp),
- struct _reent *ptr,
+_fgetwc_r (struct _reent *ptr,
register FILE *fp)
{
wint_t r;
@@ -186,8 +184,7 @@ _DEFUN(_fgetwc_r, (ptr, fp),
}
wint_t
-_DEFUN(fgetwc, (fp),
- FILE *fp)
+fgetwc (FILE *fp)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/fgetwc_u.c b/newlib/libc/stdio/fgetwc_u.c
index f3a4fea61..cbb97360b 100644
--- a/newlib/libc/stdio/fgetwc_u.c
+++ b/newlib/libc/stdio/fgetwc_u.c
@@ -30,8 +30,7 @@
#include "local.h"
wint_t
-_DEFUN(_fgetwc_unlocked_r, (ptr, fp),
- struct _reent *ptr,
+_fgetwc_unlocked_r (struct _reent *ptr,
register FILE *fp)
{
ORIENT(fp, 1);
@@ -39,8 +38,7 @@ _DEFUN(_fgetwc_unlocked_r, (ptr, fp),
}
wint_t
-_DEFUN(fgetwc_unlocked, (fp),
- FILE *fp)
+fgetwc_unlocked (FILE *fp)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/fgetws.c b/newlib/libc/stdio/fgetws.c
index 8ca95d170..c942806c6 100644
--- a/newlib/libc/stdio/fgetws.c
+++ b/newlib/libc/stdio/fgetws.c
@@ -99,8 +99,7 @@ PORTABILITY
#endif
wchar_t *
-_DEFUN(_fgetws_r, (ptr, ws, n, fp),
- struct _reent *ptr,
+_fgetws_r (struct _reent *ptr,
wchar_t * ws,
int n,
FILE * fp)
@@ -172,8 +171,7 @@ error:
}
wchar_t *
-_DEFUN(fgetws, (ws, n, fp),
- wchar_t *__restrict ws,
+fgetws (wchar_t *__restrict ws,
int n,
FILE *__restrict fp)
{
diff --git a/newlib/libc/stdio/fileno.c b/newlib/libc/stdio/fileno.c
index 949a381f8..ceb83f834 100644
--- a/newlib/libc/stdio/fileno.c
+++ b/newlib/libc/stdio/fileno.c
@@ -63,8 +63,7 @@ Supporting OS subroutines required: none.
#include "local.h"
int
-_DEFUN(fileno, (f),
- FILE * f)
+fileno (FILE * f)
{
int result;
CHECK_INIT (_REENT, f);
diff --git a/newlib/libc/stdio/fileno_u.c b/newlib/libc/stdio/fileno_u.c
index 468d1127e..830a07d2b 100644
--- a/newlib/libc/stdio/fileno_u.c
+++ b/newlib/libc/stdio/fileno_u.c
@@ -30,8 +30,7 @@
#include "local.h"
int
-_DEFUN(fileno_unlocked, (f),
- FILE * f)
+fileno_unlocked (FILE * f)
{
int result;
CHECK_INIT (_REENT, f);
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index 031b98b49..cf924536f 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -44,8 +44,7 @@ _NOINLINE_STATIC void
#else
static void
#endif
-_DEFUN(std, (ptr, flags, file),
- FILE *ptr,
+std (FILE *ptr,
int flags,
int file)
{
@@ -124,8 +123,7 @@ struct glue_with_file {
};
struct _glue *
-_DEFUN(__sfmoreglue, (d, n),
- struct _reent *d,
+__sfmoreglue (struct _reent *d,
register int n)
{
struct glue_with_file *g;
@@ -146,8 +144,7 @@ _DEFUN(__sfmoreglue, (d, n),
*/
FILE *
-_DEFUN(__sfp, (d),
- struct _reent *d)
+__sfp (struct _reent *d)
{
FILE *fp;
int n;
@@ -204,8 +201,7 @@ found:
*/
void
-_DEFUN(_cleanup_r, (ptr),
- struct _reent *ptr)
+_cleanup_r (struct _reent *ptr)
{
int (*cleanup_func) (struct _reent *, FILE *);
#ifdef _STDIO_BSD_SEMANTICS
@@ -246,8 +242,7 @@ _cleanup (void)
*/
void
-_DEFUN(__sinit, (s),
- struct _reent *s)
+__sinit (struct _reent *s)
{
__sinit_lock_acquire ();
@@ -329,8 +324,7 @@ __sinit_lock_release (void)
/* Walkable file locking routine. */
static int
-_DEFUN(__fp_lock, (ptr),
- FILE * ptr)
+__fp_lock (FILE * ptr)
{
if (!(ptr->_flags2 & __SNLK))
_flockfile (ptr);
@@ -340,8 +334,7 @@ _DEFUN(__fp_lock, (ptr),
/* Walkable file unlocking routine. */
static int
-_DEFUN(__fp_unlock, (ptr),
- FILE * ptr)
+__fp_unlock (FILE * ptr)
{
if (!(ptr->_flags2 & __SNLK))
_funlockfile (ptr);
diff --git a/newlib/libc/stdio/fiprintf.c b/newlib/libc/stdio/fiprintf.c
index e86bf86e5..ff0946287 100644
--- a/newlib/libc/stdio/fiprintf.c
+++ b/newlib/libc/stdio/fiprintf.c
@@ -22,8 +22,7 @@
#include <stdarg.h>
int
-_DEFUN(_fiprintf_r, (ptr, fp, fmt),
- struct _reent *ptr,
+_fiprintf_r (struct _reent *ptr,
FILE * fp,
const char *fmt, ...)
{
@@ -39,8 +38,7 @@ _DEFUN(_fiprintf_r, (ptr, fp, fmt),
#ifndef _REENT_ONLY
int
-_DEFUN(fiprintf, (fp, fmt),
- FILE * fp,
+fiprintf (FILE * fp,
const char *fmt, ...)
{
int ret;
diff --git a/newlib/libc/stdio/flags.c b/newlib/libc/stdio/flags.c
index b8f660ec4..71fc1f60a 100644
--- a/newlib/libc/stdio/flags.c
+++ b/newlib/libc/stdio/flags.c
@@ -30,8 +30,7 @@
*/
int
-_DEFUN(__sflags, (ptr, mode, optr),
- struct _reent *ptr,
+__sflags (struct _reent *ptr,
register char *mode,
int *optr)
{
diff --git a/newlib/libc/stdio/fmemopen.c b/newlib/libc/stdio/fmemopen.c
index 6a6153fbd..0d043520e 100644
--- a/newlib/libc/stdio/fmemopen.c
+++ b/newlib/libc/stdio/fmemopen.c
@@ -83,8 +83,7 @@ typedef struct fmemcookie {
/* Read up to non-zero N bytes into BUF from stream described by
COOKIE; return number of bytes read (0 on EOF). */
static _READ_WRITE_RETURN_TYPE
-_DEFUN(fmemreader, (ptr, cookie, buf, n),
- struct _reent *ptr,
+fmemreader (struct _reent *ptr,
void *cookie,
char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
@@ -103,8 +102,7 @@ _DEFUN(fmemreader, (ptr, cookie, buf, n),
/* Write up to non-zero N bytes of BUF into the stream described by COOKIE,
returning the number of bytes written or EOF on failure. */
static _READ_WRITE_RETURN_TYPE
-_DEFUN(fmemwriter, (ptr, cookie, buf, n),
- struct _reent *ptr,
+fmemwriter (struct _reent *ptr,
void *cookie,
const char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
@@ -159,8 +157,7 @@ _DEFUN(fmemwriter, (ptr, cookie, buf, n),
/* Seek to position POS relative to WHENCE within stream described by
COOKIE; return resulting position or fail with EOF. */
static _fpos_t
-_DEFUN(fmemseeker, (ptr, cookie, pos, whence),
- struct _reent *ptr,
+fmemseeker (struct _reent *ptr,
void *cookie,
_fpos_t pos,
int whence)
@@ -214,8 +211,7 @@ _DEFUN(fmemseeker, (ptr, cookie, pos, whence),
COOKIE; return resulting position or fail with EOF. */
#ifdef __LARGE64_FILES
static _fpos64_t
-_DEFUN(fmemseeker64, (ptr, cookie, pos, whence),
- struct _reent *ptr,
+fmemseeker64 (struct _reent *ptr,
void *cookie,
_fpos64_t pos,
int whence)
@@ -256,8 +252,7 @@ _DEFUN(fmemseeker64, (ptr, cookie, pos, whence),
/* Reclaim resources used by stream described by COOKIE. */
static int
-_DEFUN(fmemcloser, (ptr, cookie),
- struct _reent *ptr,
+fmemcloser (struct _reent *ptr,
void *cookie)
{
fmemcookie *c = (fmemcookie *) cookie;
@@ -268,8 +263,7 @@ _DEFUN(fmemcloser, (ptr, cookie),
/* Open a memstream around buffer BUF of SIZE bytes, using MODE.
Return the new stream, or fail with NULL. */
FILE *
-_DEFUN(_fmemopen_r, (ptr, buf, size, mode),
- struct _reent *ptr,
+_fmemopen_r (struct _reent *ptr,
void *__restrict buf,
size_t size,
const char *__restrict mode)
@@ -361,8 +355,7 @@ _DEFUN(_fmemopen_r, (ptr, buf, size, mode),
#ifndef _REENT_ONLY
FILE *
-_DEFUN(fmemopen, (buf, size, mode),
- void *__restrict buf,
+fmemopen (void *__restrict buf,
size_t size,
const char *__restrict mode)
{
diff --git a/newlib/libc/stdio/fopen.c b/newlib/libc/stdio/fopen.c
index 57268945f..022992b8d 100644
--- a/newlib/libc/stdio/fopen.c
+++ b/newlib/libc/stdio/fopen.c
@@ -113,8 +113,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#include "local.h"
FILE *
-_DEFUN(_fopen_r, (ptr, file, mode),
- struct _reent *ptr,
+_fopen_r (struct _reent *ptr,
const char *__restrict file,
const char *__restrict mode)
{
@@ -163,8 +162,7 @@ _DEFUN(_fopen_r, (ptr, file, mode),
#ifndef _REENT_ONLY
FILE *
-_DEFUN(fopen, (file, mode),
- const char *file,
+fopen (const char *file,
const char *mode)
{
return _fopen_r (_REENT, file, mode);
diff --git a/newlib/libc/stdio/fopencookie.c b/newlib/libc/stdio/fopencookie.c
index 4ea1ab1d1..0861528e0 100644
--- a/newlib/libc/stdio/fopencookie.c
+++ b/newlib/libc/stdio/fopencookie.c
@@ -98,8 +98,7 @@ typedef struct fccookie {
} fccookie;
static _READ_WRITE_RETURN_TYPE
-_DEFUN(fcreader, (ptr, cookie, buf, n),
- struct _reent *ptr,
+fcreader (struct _reent *ptr,
void *cookie,
char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
@@ -113,8 +112,7 @@ _DEFUN(fcreader, (ptr, cookie, buf, n),
}
static _READ_WRITE_RETURN_TYPE
-_DEFUN(fcwriter, (ptr, cookie, buf, n),
- struct _reent *ptr,
+fcwriter (struct _reent *ptr,
void *cookie,
const char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
@@ -136,8 +134,7 @@ _DEFUN(fcwriter, (ptr, cookie, buf, n),
}
static _fpos_t
-_DEFUN(fcseeker, (ptr, cookie, pos, whence),
- struct _reent *ptr,
+fcseeker (struct _reent *ptr,
void *cookie,
_fpos_t pos,
int whence)
@@ -164,8 +161,7 @@ _DEFUN(fcseeker, (ptr, cookie, pos, whence),
#ifdef __LARGE64_FILES
static _fpos64_t
-_DEFUN(fcseeker64, (ptr, cookie, pos, whence),
- struct _reent *ptr,
+fcseeker64 (struct _reent *ptr,
void *cookie,
_fpos64_t pos,
int whence)
@@ -180,8 +176,7 @@ _DEFUN(fcseeker64, (ptr, cookie, pos, whence),
#endif /* __LARGE64_FILES */
static int
-_DEFUN(fccloser, (ptr, cookie),
- struct _reent *ptr,
+fccloser (struct _reent *ptr,
void *cookie)
{
int result = 0;
@@ -197,8 +192,7 @@ _DEFUN(fccloser, (ptr, cookie),
}
FILE *
-_DEFUN(_fopencookie_r, (ptr, cookie, mode, functions),
- struct _reent *ptr,
+_fopencookie_r (struct _reent *ptr,
void *cookie,
const char *mode,
cookie_io_functions_t functions)
@@ -253,8 +247,7 @@ _DEFUN(_fopencookie_r, (ptr, cookie, mode, functions),
#ifndef _REENT_ONLY
FILE *
-_DEFUN(fopencookie, (cookie, mode, functions),
- void *cookie,
+fopencookie (void *cookie,
const char *mode,
cookie_io_functions_t functions)
{
diff --git a/newlib/libc/stdio/fprintf.c b/newlib/libc/stdio/fprintf.c
index 9dab2cd19..4c03b1a02 100644
--- a/newlib/libc/stdio/fprintf.c
+++ b/newlib/libc/stdio/fprintf.c
@@ -22,8 +22,7 @@
#include <stdarg.h>
int
-_DEFUN(_fprintf_r, (ptr, fp, fmt),
- struct _reent *ptr,
+_fprintf_r (struct _reent *ptr,
FILE *__restrict fp,
const char *__restrict fmt, ...)
{
@@ -45,8 +44,7 @@ _EXFUN(_fiprintf_r, (struct _reent *, FILE *, const char *, ...)
#ifndef _REENT_ONLY
int
-_DEFUN(fprintf, (fp, fmt),
- FILE *__restrict fp,
+fprintf (FILE *__restrict fp,
const char *__restrict fmt, ...)
{
int ret;
diff --git a/newlib/libc/stdio/fpurge.c b/newlib/libc/stdio/fpurge.c
index acd177a69..2e4f61ec9 100644
--- a/newlib/libc/stdio/fpurge.c
+++ b/newlib/libc/stdio/fpurge.c
@@ -60,8 +60,7 @@ No supporting OS subroutines are required.
/* Discard I/O from a single file. */
int
-_DEFUN(_fpurge_r, (ptr, fp),
- struct _reent *ptr,
+_fpurge_r (struct _reent *ptr,
register FILE * fp)
{
int t;
@@ -93,8 +92,7 @@ _DEFUN(_fpurge_r, (ptr, fp),
#ifndef _REENT_ONLY
int
-_DEFUN(fpurge, (fp),
- register FILE * fp)
+fpurge (register FILE * fp)
{
return _fpurge_r (_REENT, fp);
}
@@ -102,8 +100,7 @@ _DEFUN(fpurge, (fp),
#ifndef __rtems__
void
-_DEFUN(__fpurge, (fp),
- register FILE * fp)
+__fpurge (register FILE * fp)
{
_fpurge_r (_REENT, fp);
}
diff --git a/newlib/libc/stdio/fputc.c b/newlib/libc/stdio/fputc.c
index 452bb2961..1385cadea 100644
--- a/newlib/libc/stdio/fputc.c
+++ b/newlib/libc/stdio/fputc.c
@@ -87,8 +87,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include "local.h"
int
-_DEFUN(_fputc_r, (ptr, ch, file),
- struct _reent *ptr,
+_fputc_r (struct _reent *ptr,
int ch,
FILE * file)
{
@@ -102,8 +101,7 @@ _DEFUN(_fputc_r, (ptr, ch, file),
#ifndef _REENT_ONLY
int
-_DEFUN(fputc, (ch, file),
- int ch,
+fputc (int ch,
FILE * file)
{
#if !defined(__OPTIMIZE_SIZE__) && !defined(PREFER_SIZE_OVER_SPEED)
diff --git a/newlib/libc/stdio/fputc_u.c b/newlib/libc/stdio/fputc_u.c
index 27690e213..9e16069bc 100644
--- a/newlib/libc/stdio/fputc_u.c
+++ b/newlib/libc/stdio/fputc_u.c
@@ -29,8 +29,7 @@
#include "local.h"
int
-_DEFUN(_fputc_unlocked_r, (ptr, ch, file),
- struct _reent *ptr,
+_fputc_unlocked_r (struct _reent *ptr,
int ch,
FILE * file)
{
@@ -40,8 +39,7 @@ _DEFUN(_fputc_unlocked_r, (ptr, ch, file),
#ifndef _REENT_ONLY
int
-_DEFUN(fputc_unlocked, (ch, file),
- int ch,
+fputc_unlocked (int ch,
FILE * file)
{
#if !defined(__OPTIMIZE_SIZE__) && !defined(PREFER_SIZE_OVER_SPEED)
diff --git a/newlib/libc/stdio/fputs.c b/newlib/libc/stdio/fputs.c
index 0fd051bad..7a1eadb12 100644
--- a/newlib/libc/stdio/fputs.c
+++ b/newlib/libc/stdio/fputs.c
@@ -86,8 +86,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
* Write the given string to the given file.
*/
int
-_DEFUN(_fputs_r, (ptr, s, fp),
- struct _reent * ptr,
+_fputs_r (struct _reent * ptr,
char const *__restrict s,
FILE *__restrict fp)
{
@@ -135,8 +134,7 @@ error:
#ifndef _REENT_ONLY
int
-_DEFUN(fputs, (s, fp),
- char const *__restrict s,
+fputs (char const *__restrict s,
FILE *__restrict fp)
{
return _fputs_r (_REENT, s, fp);
diff --git a/newlib/libc/stdio/fputwc.c b/newlib/libc/stdio/fputwc.c
index 4943cef99..9a4e80d52 100644
--- a/newlib/libc/stdio/fputwc.c
+++ b/newlib/libc/stdio/fputwc.c
@@ -128,8 +128,7 @@ PORTABILITY
#include "local.h"
wint_t
-_DEFUN(__fputwc, (ptr, wc, fp),
- struct _reent *ptr,
+__fputwc (struct _reent *ptr,
wchar_t wc,
FILE *fp)
{
@@ -163,8 +162,7 @@ _DEFUN(__fputwc, (ptr, wc, fp),
}
wint_t
-_DEFUN(_fputwc_r, (ptr, wc, fp),
- struct _reent *ptr,
+_fputwc_r (struct _reent *ptr,
wchar_t wc,
FILE *fp)
{
@@ -178,8 +176,7 @@ _DEFUN(_fputwc_r, (ptr, wc, fp),
}
wint_t
-_DEFUN(fputwc, (wc, fp),
- wchar_t wc,
+fputwc (wchar_t wc,
FILE *fp)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/fputwc_u.c b/newlib/libc/stdio/fputwc_u.c
index 4d4f07a0a..d4e51532a 100644
--- a/newlib/libc/stdio/fputwc_u.c
+++ b/newlib/libc/stdio/fputwc_u.c
@@ -30,8 +30,7 @@
#include "local.h"
wint_t
-_DEFUN(_fputwc_unlocked_r, (ptr, wc, fp),
- struct _reent *ptr,
+_fputwc_unlocked_r (struct _reent *ptr,
wchar_t wc,
FILE *fp)
{
@@ -40,8 +39,7 @@ _DEFUN(_fputwc_unlocked_r, (ptr, wc, fp),
}
wint_t
-_DEFUN(fputwc_unlocked, (wc, fp),
- wchar_t wc,
+fputwc_unlocked (wchar_t wc,
FILE *fp)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/fputws.c b/newlib/libc/stdio/fputws.c
index 8a470fcfb..92f2cbf6a 100644
--- a/newlib/libc/stdio/fputws.c
+++ b/newlib/libc/stdio/fputws.c
@@ -94,8 +94,7 @@ PORTABILITY
#endif
int
-_DEFUN(_fputws_r, (ptr, ws, fp),
- struct _reent *ptr,
+_fputws_r (struct _reent *ptr,
const wchar_t *ws,
FILE *fp)
{
@@ -158,8 +157,7 @@ error:
}
int
-_DEFUN(fputws, (ws, fp),
- const wchar_t *__restrict ws,
+fputws (const wchar_t *__restrict ws,
FILE *__restrict fp)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
index c9180b833..b358d2b4a 100644
--- a/newlib/libc/stdio/fread.c
+++ b/newlib/libc/stdio/fread.c
@@ -93,8 +93,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifdef __SCLE
static size_t
-_DEFUN(crlf_r, (ptr, fp, buf, count, eof),
- struct _reent * ptr,
+crlf_r (struct _reent * ptr,
FILE * fp,
char * buf,
size_t count,
@@ -142,8 +141,7 @@ _DEFUN(crlf_r, (ptr, fp, buf, count, eof),
#endif
size_t
-_DEFUN(_fread_r, (ptr, buf, size, count, fp),
- struct _reent * ptr,
+_fread_r (struct _reent * ptr,
void *__restrict buf,
size_t size,
size_t count,
@@ -260,8 +258,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp),
#ifndef _REENT_ONLY
size_t
-_DEFUN(fread, (buf, size, count, fp),
- void *__restrict buf,
+fread (void *__restrict buf,
size_t size,
size_t count,
FILE *__restrict fp)
diff --git a/newlib/libc/stdio/freopen.c b/newlib/libc/stdio/freopen.c
index 46cbd81ce..0af1c1ecd 100644
--- a/newlib/libc/stdio/freopen.c
+++ b/newlib/libc/stdio/freopen.c
@@ -75,8 +75,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
*/
FILE *
-_DEFUN(_freopen_r, (ptr, file, mode, fp),
- struct _reent *ptr,
+_freopen_r (struct _reent *ptr,
const char *__restrict file,
const char *__restrict mode,
register FILE *__restrict fp)
@@ -243,8 +242,7 @@ _DEFUN(_freopen_r, (ptr, file, mode, fp),
#ifndef _REENT_ONLY
FILE *
-_DEFUN(freopen, (file, mode, fp),
- const char *__restrict file,
+freopen (const char *__restrict file,
const char *__restrict mode,
register FILE *__restrict fp)
{
diff --git a/newlib/libc/stdio/fseek.c b/newlib/libc/stdio/fseek.c
index 4b8a1e099..9b3ea986c 100644
--- a/newlib/libc/stdio/fseek.c
+++ b/newlib/libc/stdio/fseek.c
@@ -81,8 +81,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include "local.h"
int
-_DEFUN(_fseek_r, (ptr, fp, offset, whence),
- struct _reent *ptr,
+_fseek_r (struct _reent *ptr,
register FILE *fp,
long offset,
int whence)
@@ -93,8 +92,7 @@ _DEFUN(_fseek_r, (ptr, fp, offset, whence),
#ifndef _REENT_ONLY
int
-_DEFUN(fseek, (fp, offset, whence),
- register FILE *fp,
+fseek (register FILE *fp,
long offset,
int whence)
{
diff --git a/newlib/libc/stdio/fseeko.c b/newlib/libc/stdio/fseeko.c
index a2ed1b5b5..7ca86161c 100644
--- a/newlib/libc/stdio/fseeko.c
+++ b/newlib/libc/stdio/fseeko.c
@@ -93,8 +93,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
*/
int
-_DEFUN(_fseeko_r, (ptr, fp, offset, whence),
- struct _reent *ptr,
+_fseeko_r (struct _reent *ptr,
register FILE *fp,
_off_t offset,
int whence)
@@ -359,8 +358,7 @@ dumb:
#ifndef _REENT_ONLY
int
-_DEFUN(fseeko, (fp, offset, whence),
- register FILE *fp,
+fseeko (register FILE *fp,
_off_t offset,
int whence)
{
diff --git a/newlib/libc/stdio/fsetlocking.c b/newlib/libc/stdio/fsetlocking.c
index e27aa42fc..062b93a92 100644
--- a/newlib/libc/stdio/fsetlocking.c
+++ b/newlib/libc/stdio/fsetlocking.c
@@ -65,8 +65,7 @@ No supporting OS subroutines are required.
#include "local.h"
int
-_DEFUN(__fsetlocking, (fp, type),
- FILE * fp,
+__fsetlocking (FILE * fp,
int type)
{
int result;
diff --git a/newlib/libc/stdio/fsetpos.c b/newlib/libc/stdio/fsetpos.c
index d765081a6..b5334e251 100644
--- a/newlib/libc/stdio/fsetpos.c
+++ b/newlib/libc/stdio/fsetpos.c
@@ -59,8 +59,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include <stdio.h>
int
-_DEFUN(_fsetpos_r, (ptr, iop, pos),
- struct _reent * ptr,
+_fsetpos_r (struct _reent * ptr,
FILE * iop,
const _fpos_t * pos)
{
@@ -74,8 +73,7 @@ _DEFUN(_fsetpos_r, (ptr, iop, pos),
#ifndef _REENT_ONLY
int
-_DEFUN(fsetpos, (iop, pos),
- FILE * iop,
+fsetpos (FILE * iop,
const _fpos_t * pos)
{
return _fsetpos_r (_REENT, iop, pos);
diff --git a/newlib/libc/stdio/ftell.c b/newlib/libc/stdio/ftell.c
index 1260d5ef4..e4a246199 100644
--- a/newlib/libc/stdio/ftell.c
+++ b/newlib/libc/stdio/ftell.c
@@ -83,8 +83,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#include "local.h"
long
-_DEFUN(_ftell_r, (ptr, fp),
- struct _reent *ptr,
+_ftell_r (struct _reent *ptr,
register FILE * fp)
{
_fpos_t pos;
@@ -101,8 +100,7 @@ _DEFUN(_ftell_r, (ptr, fp),
#ifndef _REENT_ONLY
long
-_DEFUN(ftell, (fp),
- register FILE * fp)
+ftell (register FILE * fp)
{
return _ftell_r (_REENT, fp);
}
diff --git a/newlib/libc/stdio/ftello.c b/newlib/libc/stdio/ftello.c
index 19299c3ad..22af82de8 100644
--- a/newlib/libc/stdio/ftello.c
+++ b/newlib/libc/stdio/ftello.c
@@ -83,8 +83,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#include "local.h"
_off_t
-_DEFUN(_ftello_r, (ptr, fp),
- struct _reent * ptr,
+_ftello_r (struct _reent * ptr,
register FILE * fp)
{
_fpos_t pos;
@@ -147,8 +146,7 @@ _DEFUN(_ftello_r, (ptr, fp),
#ifndef _REENT_ONLY
_off_t
-_DEFUN(ftello, (fp),
- register FILE * fp)
+ftello (register FILE * fp)
{
return _ftello_r (_REENT, fp);
}
diff --git a/newlib/libc/stdio/funopen.c b/newlib/libc/stdio/funopen.c
index 23bed7b8e..a1c0d767d 100644
--- a/newlib/libc/stdio/funopen.c
+++ b/newlib/libc/stdio/funopen.c
@@ -104,8 +104,7 @@ typedef struct funcookie {
} funcookie;
static _READ_WRITE_RETURN_TYPE
-_DEFUN(funreader, (ptr, cookie, buf, n),
- struct _reent *ptr,
+funreader (struct _reent *ptr,
void *cookie,
char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
@@ -119,8 +118,7 @@ _DEFUN(funreader, (ptr, cookie, buf, n),
}
static _READ_WRITE_RETURN_TYPE
-_DEFUN(funwriter, (ptr, cookie, buf, n),
- struct _reent *ptr,
+funwriter (struct _reent *ptr,
void *cookie,
const char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
@@ -134,8 +132,7 @@ _DEFUN(funwriter, (ptr, cookie, buf, n),
}
static _fpos_t
-_DEFUN(funseeker, (ptr, cookie, off, whence),
- struct _reent *ptr,
+funseeker (struct _reent *ptr,
void *cookie,
_fpos_t off,
int whence)
@@ -162,8 +159,7 @@ _DEFUN(funseeker, (ptr, cookie, off, whence),
#ifdef __LARGE64_FILES
static _fpos64_t
-_DEFUN(funseeker64, (ptr, cookie, off, whence),
- struct _reent *ptr,
+funseeker64 (struct _reent *ptr,
void *cookie,
_fpos64_t off,
int whence)
@@ -178,8 +174,7 @@ _DEFUN(funseeker64, (ptr, cookie, off, whence),
#endif /* __LARGE64_FILES */
static int
-_DEFUN(funcloser, (ptr, cookie),
- struct _reent *ptr,
+funcloser (struct _reent *ptr,
void *cookie)
{
int result = 0;
@@ -195,8 +190,7 @@ _DEFUN(funcloser, (ptr, cookie),
}
FILE *
-_DEFUN(_funopen_r, (ptr, cookie, readfn, writefn, seekfn, closefn),
- struct _reent *ptr,
+_funopen_r (struct _reent *ptr,
const void *cookie,
funread readfn,
funwrite writefn,
@@ -267,8 +261,7 @@ _DEFUN(_funopen_r, (ptr, cookie, readfn, writefn, seekfn, closefn),
#ifndef _REENT_ONLY
FILE *
-_DEFUN(funopen, (cookie, readfn, writefn, seekfn, closefn),
- const void *cookie,
+funopen (const void *cookie,
funread readfn,
funwrite writefn,
funseek seekfn,
diff --git a/newlib/libc/stdio/fvwrite.c b/newlib/libc/stdio/fvwrite.c
index d742784e5..3e3a0c6a2 100644
--- a/newlib/libc/stdio/fvwrite.c
+++ b/newlib/libc/stdio/fvwrite.c
@@ -45,8 +45,7 @@
*/
int
-_DEFUN(__sfvwrite_r, (ptr, fp, uio),
- struct _reent *ptr,
+__sfvwrite_r (struct _reent *ptr,
register FILE *fp,
register struct __suio *uio)
{
diff --git a/newlib/libc/stdio/fwalk.c b/newlib/libc/stdio/fwalk.c
index 8b7b5b0e3..b4b285a64 100644
--- a/newlib/libc/stdio/fwalk.c
+++ b/newlib/libc/stdio/fwalk.c
@@ -28,8 +28,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#include "local.h"
int
-_DEFUN(_fwalk, (ptr, function),
- struct _reent *ptr,
+_fwalk (struct _reent *ptr,
register int (*function) (FILE *))
{
register FILE *fp;
@@ -55,8 +54,7 @@ _DEFUN(_fwalk, (ptr, function),
/* Special version of __fwalk where the function pointer is a reentrant
I/O function (e.g. _fclose_r). */
int
-_DEFUN(_fwalk_reent, (ptr, reent_function),
- struct _reent *ptr,
+_fwalk_reent (struct _reent *ptr,
register int (*reent_function) (struct _reent *, FILE *))
{
register FILE *fp;
diff --git a/newlib/libc/stdio/fwide.c b/newlib/libc/stdio/fwide.c
index 719a58acd..9b5a3d12a 100644
--- a/newlib/libc/stdio/fwide.c
+++ b/newlib/libc/stdio/fwide.c
@@ -48,8 +48,7 @@ C99, POSIX.1-2001.
#include "local.h"
int
-_DEFUN(_fwide_r, (ptr, fp, mode),
- struct _reent *ptr,
+_fwide_r (struct _reent *ptr,
FILE *fp,
int mode)
{
@@ -70,8 +69,7 @@ _DEFUN(_fwide_r, (ptr, fp, mode),
}
int
-_DEFUN(fwide, (fp, mode),
- FILE *fp,
+fwide (FILE *fp,
int mode)
{
return _fwide_r (_REENT, fp, mode);
diff --git a/newlib/libc/stdio/fwprintf.c b/newlib/libc/stdio/fwprintf.c
index b7604aafe..d4047dcc4 100644
--- a/newlib/libc/stdio/fwprintf.c
+++ b/newlib/libc/stdio/fwprintf.c
@@ -23,8 +23,7 @@
#include <stdarg.h>
int
-_DEFUN(_fwprintf_r, (ptr, fp, fmt),
- struct _reent *ptr,
+_fwprintf_r (struct _reent *ptr,
FILE *fp,
const wchar_t *fmt, ...)
{
@@ -40,8 +39,7 @@ _DEFUN(_fwprintf_r, (ptr, fp, fmt),
#ifndef _REENT_ONLY
int
-_DEFUN(fwprintf, (fp, fmt),
- FILE *__restrict fp,
+fwprintf (FILE *__restrict fp,
const wchar_t *__restrict fmt, ...)
{
int ret;
diff --git a/newlib/libc/stdio/fwrite.c b/newlib/libc/stdio/fwrite.c
index 7dec80c1a..aa14421db 100644
--- a/newlib/libc/stdio/fwrite.c
+++ b/newlib/libc/stdio/fwrite.c
@@ -108,8 +108,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
*/
size_t
-_DEFUN(_fwrite_r, (ptr, buf, size, count, fp),
- struct _reent * ptr,
+_fwrite_r (struct _reent * ptr,
const void *__restrict buf,
size_t size,
size_t count,
@@ -170,8 +169,7 @@ ret:
#ifndef _REENT_ONLY
size_t
-_DEFUN(fwrite, (buf, size, count, fp),
- const void *__restrict buf,
+fwrite (const void *__restrict buf,
size_t size,
size_t count,
FILE * fp)
diff --git a/newlib/libc/stdio/getc.c b/newlib/libc/stdio/getc.c
index 269bfb1d3..3c62f0bd9 100644
--- a/newlib/libc/stdio/getc.c
+++ b/newlib/libc/stdio/getc.c
@@ -76,8 +76,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#undef getc
int
-_DEFUN(_getc_r, (ptr, fp),
- struct _reent *ptr,
+_getc_r (struct _reent *ptr,
register FILE *fp)
{
int result;
@@ -91,8 +90,7 @@ _DEFUN(_getc_r, (ptr, fp),
#ifndef _REENT_ONLY
int
-_DEFUN(getc, (fp),
- register FILE *fp)
+getc (register FILE *fp)
{
int result;
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/getc_u.c b/newlib/libc/stdio/getc_u.c
index 2f9f0e818..fb37ba4b1 100644
--- a/newlib/libc/stdio/getc_u.c
+++ b/newlib/libc/stdio/getc_u.c
@@ -69,8 +69,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#undef getc_unlocked
int
-_DEFUN(_getc_unlocked_r, (ptr, fp),
- struct _reent *ptr,
+_getc_unlocked_r (struct _reent *ptr,
register FILE *fp)
{
/* CHECK_INIT is called (eventually) by __srefill_r. */
@@ -81,8 +80,7 @@ _DEFUN(_getc_unlocked_r, (ptr, fp),
#ifndef _REENT_ONLY
int
-_DEFUN(getc_unlocked, (fp),
- register FILE *fp)
+getc_unlocked (register FILE *fp)
{
return __sgetc_r (_REENT, fp);
}
diff --git a/newlib/libc/stdio/getchar.c b/newlib/libc/stdio/getchar.c
index b3ca289ba..7e0b74848 100644
--- a/newlib/libc/stdio/getchar.c
+++ b/newlib/libc/stdio/getchar.c
@@ -72,8 +72,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#undef getchar
int
-_DEFUN(_getchar_r, (reent),
- struct _reent *reent)
+_getchar_r (struct _reent *reent)
{
_REENT_SMALL_CHECK_INIT (reent);
return _getc_r (reent, _stdin_r (reent));
diff --git a/newlib/libc/stdio/getchar_u.c b/newlib/libc/stdio/getchar_u.c
index 5848d47ac..e45176dfa 100644
--- a/newlib/libc/stdio/getchar_u.c
+++ b/newlib/libc/stdio/getchar_u.c
@@ -70,8 +70,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#undef getchar_unlocked
int
-_DEFUN(_getchar_unlocked_r, (ptr),
- struct _reent *ptr)
+_getchar_unlocked_r (struct _reent *ptr)
{
return _getc_unlocked_r (ptr, _stdin_r (ptr));
}
diff --git a/newlib/libc/stdio/getdelim.c b/newlib/libc/stdio/getdelim.c
index 4164be5c5..90cd5d47f 100644
--- a/newlib/libc/stdio/getdelim.c
+++ b/newlib/libc/stdio/getdelim.c
@@ -40,8 +40,7 @@ No supporting OS subroutines are directly required.
#define DEFAULT_LINE_SIZE 128
ssize_t
-_DEFUN(__getdelim, (bufptr, n, delim, fp),
- char **bufptr,
+__getdelim (char **bufptr,
size_t *n,
int delim,
FILE *fp)
diff --git a/newlib/libc/stdio/getline.c b/newlib/libc/stdio/getline.c
index b212a8c8f..857e980ad 100644
--- a/newlib/libc/stdio/getline.c
+++ b/newlib/libc/stdio/getline.c
@@ -37,8 +37,7 @@ No supporting OS subroutines are directly required.
extern ssize_t _EXFUN(__getdelim, (char **, size_t *, int, FILE *));
ssize_t
-_DEFUN(__getline, (lptr, n, fp),
- char **lptr,
+__getline (char **lptr,
size_t *n,
FILE *fp)
{
diff --git a/newlib/libc/stdio/gets.c b/newlib/libc/stdio/gets.c
index 4e951efe3..a510ec0f0 100644
--- a/newlib/libc/stdio/gets.c
+++ b/newlib/libc/stdio/gets.c
@@ -63,8 +63,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include "local.h"
char *
-_DEFUN(_gets_r, (ptr, buf),
- struct _reent *ptr,
+_gets_r (struct _reent *ptr,
char *buf)
{
register int c;
@@ -94,8 +93,7 @@ _DEFUN(_gets_r, (ptr, buf),
#ifndef _REENT_ONLY
char *
-_DEFUN(gets, (buf),
- char *buf)
+gets (char *buf)
{
return _gets_r (_REENT, buf);
}
diff --git a/newlib/libc/stdio/getw.c b/newlib/libc/stdio/getw.c
index 4585d9f37..a1b72e482 100644
--- a/newlib/libc/stdio/getw.c
+++ b/newlib/libc/stdio/getw.c
@@ -54,8 +54,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#include <stdio.h>
int
-_DEFUN(getw, (fp),
- register FILE *fp)
+getw (register FILE *fp)
{
int result;
if (fread ((char*)&result, sizeof (result), 1, fp) != 1)
diff --git a/newlib/libc/stdio/getwc.c b/newlib/libc/stdio/getwc.c
index db9a43768..15b397455 100644
--- a/newlib/libc/stdio/getwc.c
+++ b/newlib/libc/stdio/getwc.c
@@ -33,8 +33,7 @@
#undef getwc
wint_t
-_DEFUN(_getwc_r, (ptr, fp),
- struct _reent *ptr,
+_getwc_r (struct _reent *ptr,
FILE *fp)
{
return _fgetwc_r (ptr, fp);
@@ -45,8 +44,7 @@ _DEFUN(_getwc_r, (ptr, fp),
* macro, may evaluate `fp' more than once.
*/
wint_t
-_DEFUN(getwc, (fp),
- FILE *fp)
+getwc (FILE *fp)
{
return fgetwc(fp);
}
diff --git a/newlib/libc/stdio/getwc_u.c b/newlib/libc/stdio/getwc_u.c
index 913c3e08b..366ab0f36 100644
--- a/newlib/libc/stdio/getwc_u.c
+++ b/newlib/libc/stdio/getwc_u.c
@@ -34,8 +34,7 @@
#undef getwc_unlocked
wint_t
-_DEFUN(_getwc_unlocked_r, (ptr, fp),
- struct _reent *ptr,
+_getwc_unlocked_r (struct _reent *ptr,
FILE *fp)
{
return _fgetwc_unlocked_r (ptr, fp);
@@ -46,8 +45,7 @@ _DEFUN(_getwc_unlocked_r, (ptr, fp),
* a macro, may evaluate `fp' more than once.
*/
wint_t
-_DEFUN(getwc_unlocked, (fp),
- FILE *fp)
+getwc_unlocked (FILE *fp)
{
return fgetwc_unlocked(fp);
}
diff --git a/newlib/libc/stdio/getwchar.c b/newlib/libc/stdio/getwchar.c
index f432755a0..148539241 100644
--- a/newlib/libc/stdio/getwchar.c
+++ b/newlib/libc/stdio/getwchar.c
@@ -93,8 +93,7 @@ PORTABILITY
#undef getwchar
wint_t
-_DEFUN (_getwchar_r, (ptr),
- struct _reent *ptr)
+_getwchar_r (struct _reent *ptr)
{
return _fgetwc_r (ptr, stdin);
}
diff --git a/newlib/libc/stdio/getwchar_u.c b/newlib/libc/stdio/getwchar_u.c
index 4c854f213..c1f8d2da5 100644
--- a/newlib/libc/stdio/getwchar_u.c
+++ b/newlib/libc/stdio/getwchar_u.c
@@ -34,8 +34,7 @@
#undef getwchar_unlocked
wint_t
-_DEFUN (_getwchar_unlocked_r, (ptr),
- struct _reent *ptr)
+_getwchar_unlocked_r (struct _reent *ptr)
{
return _fgetwc_unlocked_r (ptr, stdin);
}
diff --git a/newlib/libc/stdio/iprintf.c b/newlib/libc/stdio/iprintf.c
index 571d826e5..507d15415 100644
--- a/newlib/libc/stdio/iprintf.c
+++ b/newlib/libc/stdio/iprintf.c
@@ -25,8 +25,7 @@
#ifndef _REENT_ONLY
int
-_DEFUN(iprintf, (fmt),
- const char *fmt, ...)
+iprintf (const char *fmt, ...)
{
int ret;
va_list ap;
@@ -42,8 +41,7 @@ _DEFUN(iprintf, (fmt),
#endif /* ! _REENT_ONLY */
int
-_DEFUN(_iprintf_r, (ptr, fmt),
- struct _reent *ptr,
+_iprintf_r (struct _reent *ptr,
const char *fmt, ...)
{
int ret;
diff --git a/newlib/libc/stdio/makebuf.c b/newlib/libc/stdio/makebuf.c
index 37a50d47d..f2da70ad6 100644
--- a/newlib/libc/stdio/makebuf.c
+++ b/newlib/libc/stdio/makebuf.c
@@ -35,8 +35,7 @@
*/
void
-_DEFUN(__smakebuf_r, (ptr, fp),
- struct _reent *ptr,
+__smakebuf_r (struct _reent *ptr,
register FILE *fp)
{
register void *p;
@@ -76,8 +75,7 @@ _DEFUN(__smakebuf_r, (ptr, fp),
* Internal routine to determine `proper' buffering for a file.
*/
int
-_DEFUN(__swhatbuf_r, (ptr, fp, bufsize, couldbetty),
- struct _reent *ptr,
+__swhatbuf_r (struct _reent *ptr,
FILE *fp,
size_t *bufsize,
int *couldbetty)
diff --git a/newlib/libc/stdio/mktemp.c b/newlib/libc/stdio/mktemp.c
index 37092496b..9b85eb93e 100644
--- a/newlib/libc/stdio/mktemp.c
+++ b/newlib/libc/stdio/mktemp.c
@@ -139,8 +139,7 @@ Supporting OS subroutines required: <<getpid>>, <<mkdir>>, <<open>>, <<stat>>.
#include <ctype.h>
static int
-_DEFUN(_gettemp, (ptr, path, doopen, domkdir, suffixlen, flags),
- struct _reent *ptr,
+_gettemp (struct _reent *ptr,
char *path,
register int *doopen,
int domkdir,
@@ -263,8 +262,7 @@ _DEFUN(_gettemp, (ptr, path, doopen, domkdir, suffixlen, flags),
#endif
int
-_DEFUN(_mkstemp_r, (ptr, path),
- struct _reent *ptr,
+_mkstemp_r (struct _reent *ptr,
char *path)
{
int fd;
@@ -274,16 +272,14 @@ _DEFUN(_mkstemp_r, (ptr, path),
#if !defined _ELIX_LEVEL || _ELIX_LEVEL >= 4
char *
-_DEFUN(_mkdtemp_r, (ptr, path),
- struct _reent *ptr,
+_mkdtemp_r (struct _reent *ptr,
char *path)
{
return (_gettemp (ptr, path, (int *) NULL, 1, 0, 0) ? path : NULL);
}
int
-_DEFUN(_mkstemps_r, (ptr, path, len),
- struct _reent *ptr,
+_mkstemps_r (struct _reent *ptr,
char *path,
int len)
{
@@ -293,8 +289,7 @@ _DEFUN(_mkstemps_r, (ptr, path, len),
}
int
-_DEFUN(_mkostemp_r, (ptr, path, flags),
- struct _reent *ptr,
+_mkostemp_r (struct _reent *ptr,
char *path,
int flags)
{
@@ -304,8 +299,7 @@ _DEFUN(_mkostemp_r, (ptr, path, flags),
}
int
-_DEFUN(_mkostemps_r, (ptr, path, len, flags),
- struct _reent *ptr,
+_mkostemps_r (struct _reent *ptr,
char *path,
int len,
int flags)
@@ -317,8 +311,7 @@ _DEFUN(_mkostemps_r, (ptr, path, len, flags),
#endif /* _ELIX_LEVEL */
char *
-_DEFUN(_mktemp_r, (ptr, path),
- struct _reent *ptr,
+_mktemp_r (struct _reent *ptr,
char *path)
{
return (_gettemp (ptr, path, (int *) NULL, 0, 0, 0) ? path : (char *) NULL);
@@ -327,8 +320,7 @@ _DEFUN(_mktemp_r, (ptr, path),
#ifndef _REENT_ONLY
int
-_DEFUN(mkstemp, (path),
- char *path)
+mkstemp (char *path)
{
int fd;
@@ -337,15 +329,13 @@ _DEFUN(mkstemp, (path),
# if !defined _ELIX_LEVEL || _ELIX_LEVEL >= 4
char *
-_DEFUN(mkdtemp, (path),
- char *path)
+mkdtemp (char *path)
{
return (_gettemp (_REENT, path, (int *) NULL, 1, 0, 0) ? path : NULL);
}
int
-_DEFUN(mkstemps, (path, len),
- char *path,
+mkstemps (char *path,
int len)
{
int fd;
@@ -354,8 +344,7 @@ _DEFUN(mkstemps, (path, len),
}
int
-_DEFUN(mkostemp, (path, flags),
- char *path,
+mkostemp (char *path,
int flags)
{
int fd;
@@ -364,8 +353,7 @@ _DEFUN(mkostemp, (path, flags),
}
int
-_DEFUN(mkostemps, (path, len, flags),
- char *path,
+mkostemps (char *path,
int len,
int flags)
{
@@ -376,8 +364,7 @@ _DEFUN(mkostemps, (path, len, flags),
# endif /* _ELIX_LEVEL */
char *
-_DEFUN(mktemp, (path),
- char *path)
+mktemp (char *path)
{
return (_gettemp (_REENT, path, (int *) NULL, 0, 0, 0) ? path : (char *) NULL);
}
diff --git a/newlib/libc/stdio/nano-vfprintf.c b/newlib/libc/stdio/nano-vfprintf.c
index 58359dd4a..623afb732 100644
--- a/newlib/libc/stdio/nano-vfprintf.c
+++ b/newlib/libc/stdio/nano-vfprintf.c
@@ -172,8 +172,7 @@ static char *rcsid = "$Id$";
and vfwprintf. */
#ifdef STRING_ONLY
int
-_DEFUN(__ssputs_r, (ptr, fp, buf, len),
- struct _reent *ptr,
+__ssputs_r (struct _reent *ptr,
FILE *fp,
const char *buf,
size_t len)
@@ -243,8 +242,7 @@ err:
char output, but __ssprint_r cannot be discarded because it is used
by a serial of functions like svfwprintf for wide char output. */
int
-_DEFUN(__ssprint_r, (ptr, fp, uio),
- struct _reent *ptr,
+__ssprint_r (struct _reent *ptr,
FILE *fp,
register struct __suio *uio)
{
@@ -347,8 +345,7 @@ err:
/* Flush out all the vectors defined by the given uio,
then reset it so that it can be reused. */
int
-_DEFUN(__sprint_r, (ptr, fp, uio),
- struct _reent *ptr,
+__sprint_r (struct _reent *ptr,
FILE *fp,
register struct __suio *uio)
{
@@ -392,8 +389,7 @@ out:
}
_NOINLINE_STATIC int
-_DEFUN(__sfputc_r, (ptr, c, fp),
- struct _reent *ptr,
+__sfputc_r (struct _reent *ptr,
int c,
FILE *fp)
{
@@ -404,8 +400,7 @@ _DEFUN(__sfputc_r, (ptr, c, fp),
}
int
-_DEFUN(__sfputs_r, (ptr, fp, buf, len),
- struct _reent *ptr,
+__sfputs_r (struct _reent *ptr,
FILE *fp,
const char *buf,
size_t len)
@@ -442,8 +437,7 @@ int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, const char *, va_list));
#ifndef STRING_ONLY
int
-_DEFUN(VFPRINTF, (fp, fmt0, ap),
- FILE * fp,
+VFPRINTF (FILE * fp,
const char *fmt0,
va_list ap)
{
@@ -471,8 +465,7 @@ _EXFUN(vfiprintf, (FILE *, const char *, __VALIST)
#endif
int
-_DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
- struct _reent *data,
+_VFPRINTF_R (struct _reent *data,
FILE * fp,
const char *fmt0,
va_list ap)
diff --git a/newlib/libc/stdio/nano-vfscanf.c b/newlib/libc/stdio/nano-vfscanf.c
index 553fc22cb..fe4845264 100644
--- a/newlib/libc/stdio/nano-vfscanf.c
+++ b/newlib/libc/stdio/nano-vfscanf.c
@@ -135,8 +135,7 @@ Supporting OS subroutines required:
#ifndef _REENT_ONLY
int
-_DEFUN(VFSCANF, (fp, fmt, ap),
- register FILE *fp,
+VFSCANF (register FILE *fp,
const char *fmt,
va_list ap)
{
@@ -149,8 +148,7 @@ _EXFUN(vfiscanf, (FILE *, const char *, __VALIST)
_ATTRIBUTE ((__alias__("vfscanf"))));
int
-_DEFUN(__SVFSCANF, (fp, fmt0, ap),
- register FILE *fp,
+__SVFSCANF (register FILE *fp,
char const *fmt0,
va_list ap)
{
@@ -160,8 +158,7 @@ _DEFUN(__SVFSCANF, (fp, fmt0, ap),
#endif
int
-_DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
- struct _reent *data,
+_VFSCANF_R (struct _reent *data,
register FILE *fp,
const char *fmt,
va_list ap)
@@ -180,8 +177,7 @@ _EXFUN(_vfiscanf_r, (struct _reent *, FILE *, const char *, __VALIST)
regular ungetc which will drag in file I/O items we don't need.
So, we create our own trimmed-down version. */
int
-_DEFUN(_sungetc_r, (data, fp, ch),
- struct _reent *data,
+_sungetc_r (struct _reent *data,
int c,
register FILE *fp)
{
@@ -229,8 +225,7 @@ _DEFUN(_sungetc_r, (data, fp, ch),
/* String only version of __srefill_r for sscanf family. */
int
-_DEFUN(__ssrefill_r, (ptr, fp),
- struct _reent * ptr,
+__ssrefill_r (struct _reent * ptr,
register FILE * fp)
{
/* Our only hope of further input is the ungetc buffer.
@@ -259,8 +254,7 @@ size_t _EXFUN (_sfread_r, (struct _reent *, void *buf, size_t, size_t, FILE *));
#endif /* !STRING_ONLY. */
int
-_DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
- struct _reent *rptr,
+__SVFSCANF_R (struct _reent *rptr,
register FILE *fp,
char const *fmt0,
va_list ap)
diff --git a/newlib/libc/stdio/open_memstream.c b/newlib/libc/stdio/open_memstream.c
index 5dd64115b..afa4a6d62 100644
--- a/newlib/libc/stdio/open_memstream.c
+++ b/newlib/libc/stdio/open_memstream.c
@@ -93,8 +93,7 @@ typedef struct memstream {
/* Write up to non-zero N bytes of BUF into the stream described by COOKIE,
returning the number of bytes written or EOF on failure. */
static _READ_WRITE_RETURN_TYPE
-_DEFUN(memwriter, (ptr, cookie, buf, n),
- struct _reent *ptr,
+memwriter (struct _reent *ptr,
void *cookie,
const char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
@@ -147,8 +146,7 @@ _DEFUN(memwriter, (ptr, cookie, buf, n),
/* Seek to position POS relative to WHENCE within stream described by
COOKIE; return resulting position or fail with EOF. */
static _fpos_t
-_DEFUN(memseeker, (ptr, cookie, pos, whence),
- struct _reent *ptr,
+memseeker (struct _reent *ptr,
void *cookie,
_fpos_t pos,
int whence)
@@ -215,8 +213,7 @@ _DEFUN(memseeker, (ptr, cookie, pos, whence),
COOKIE; return resulting position or fail with EOF. */
#ifdef __LARGE64_FILES
static _fpos64_t
-_DEFUN(memseeker64, (ptr, cookie, pos, whence),
- struct _reent *ptr,
+memseeker64 (struct _reent *ptr,
void *cookie,
_fpos64_t pos,
int whence)
@@ -275,8 +272,7 @@ _DEFUN(memseeker64, (ptr, cookie, pos, whence),
/* Reclaim resources used by stream described by COOKIE. */
static int
-_DEFUN(memcloser, (ptr, cookie),
- struct _reent *ptr,
+memcloser (struct _reent *ptr,
void *cookie)
{
memstream *c = (memstream *) cookie;
@@ -295,8 +291,7 @@ _DEFUN(memcloser, (ptr, cookie),
/* Open a memstream that tracks a dynamic buffer in BUF and SIZE.
Return the new stream, or fail with NULL. */
static FILE *
-_DEFUN(internal_open_memstream_r, (ptr, buf, size, wide),
- struct _reent *ptr,
+internal_open_memstream_r (struct _reent *ptr,
char **buf,
size_t *size,
int wide)
@@ -378,8 +373,7 @@ _DEFUN(internal_open_memstream_r, (ptr, buf, size, wide),
}
FILE *
-_DEFUN(_open_memstream_r, (ptr, buf, size),
- struct _reent *ptr,
+_open_memstream_r (struct _reent *ptr,
char **buf,
size_t *size)
{
@@ -387,8 +381,7 @@ _DEFUN(_open_memstream_r, (ptr, buf, size),
}
FILE *
-_DEFUN(_open_wmemstream_r, (ptr, buf, size),
- struct _reent *ptr,
+_open_wmemstream_r (struct _reent *ptr,
wchar_t **buf,
size_t *size)
{
@@ -397,16 +390,14 @@ _DEFUN(_open_wmemstream_r, (ptr, buf, size),
#ifndef _REENT_ONLY
FILE *
-_DEFUN(open_memstream, (buf, size),
- char **buf,
+open_memstream (char **buf,
size_t *size)
{
return _open_memstream_r (_REENT, buf, size);
}
FILE *
-_DEFUN(open_wmemstream, (buf, size),
- wchar_t **buf,
+open_wmemstream (wchar_t **buf,
size_t *size)
{
return _open_wmemstream_r (_REENT, buf, size);
diff --git a/newlib/libc/stdio/perror.c b/newlib/libc/stdio/perror.c
index e3e70a6f1..d98e17e19 100644
--- a/newlib/libc/stdio/perror.c
+++ b/newlib/libc/stdio/perror.c
@@ -59,8 +59,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include "local.h"
void
-_DEFUN(_perror_r, (ptr, s),
- struct _reent *ptr,
+_perror_r (struct _reent *ptr,
const char *s)
{
char *error;
@@ -82,8 +81,7 @@ _DEFUN(_perror_r, (ptr, s),
#ifndef _REENT_ONLY
void
-_DEFUN(perror, (s),
- const char *s)
+perror (const char *s)
{
_perror_r (_REENT, s);
}
diff --git a/newlib/libc/stdio/printf.c b/newlib/libc/stdio/printf.c
index 73986776b..a323f5ad0 100644
--- a/newlib/libc/stdio/printf.c
+++ b/newlib/libc/stdio/printf.c
@@ -23,8 +23,7 @@
#include "local.h"
int
-_DEFUN(_printf_r, (ptr, fmt),
- struct _reent *ptr,
+_printf_r (struct _reent *ptr,
const char *__restrict fmt, ...)
{
int ret;
@@ -46,8 +45,7 @@ _EXFUN(_iprintf_r, (struct _reent *, const char *, ...)
#ifndef _REENT_ONLY
int
-_DEFUN(printf, (fmt),
- const char *__restrict fmt, ...)
+printf (const char *__restrict fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio/putc.c b/newlib/libc/stdio/putc.c
index e69841d17..d4adc5a50 100644
--- a/newlib/libc/stdio/putc.c
+++ b/newlib/libc/stdio/putc.c
@@ -78,8 +78,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#undef putc
int
-_DEFUN(_putc_r, (ptr, c, fp),
- struct _reent *ptr,
+_putc_r (struct _reent *ptr,
int c,
register FILE *fp)
{
@@ -93,8 +92,7 @@ _DEFUN(_putc_r, (ptr, c, fp),
#ifndef _REENT_ONLY
int
-_DEFUN(putc, (c, fp),
- int c,
+putc (int c,
register FILE *fp)
{
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/stdio/putc_u.c b/newlib/libc/stdio/putc_u.c
index b53060bed..de4ac2833 100644
--- a/newlib/libc/stdio/putc_u.c
+++ b/newlib/libc/stdio/putc_u.c
@@ -70,8 +70,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#undef putc_unlocked
int
-_DEFUN(_putc_unlocked_r, (ptr, c, fp),
- struct _reent *ptr,
+_putc_unlocked_r (struct _reent *ptr,
int c,
register FILE *fp)
{
@@ -82,8 +81,7 @@ _DEFUN(_putc_unlocked_r, (ptr, c, fp),
#ifndef _REENT_ONLY
int
-_DEFUN(putc_unlocked, (c, fp),
- int c,
+putc_unlocked (int c,
register FILE *fp)
{
/* CHECK_INIT is (eventually) called by __swbuf. */
diff --git a/newlib/libc/stdio/putchar.c b/newlib/libc/stdio/putchar.c
index 813144a2b..c52d38799 100644
--- a/newlib/libc/stdio/putchar.c
+++ b/newlib/libc/stdio/putchar.c
@@ -67,8 +67,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#undef putchar
int
-_DEFUN(_putchar_r, (ptr, c),
- struct _reent *ptr,
+_putchar_r (struct _reent *ptr,
int c)
{
_REENT_SMALL_CHECK_INIT (ptr);
@@ -78,8 +77,7 @@ _DEFUN(_putchar_r, (ptr, c),
#ifndef _REENT_ONLY
int
-_DEFUN(putchar, (c),
- int c)
+putchar (int c)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/putchar_u.c b/newlib/libc/stdio/putchar_u.c
index e0ed8f7d7..8f16bfbc6 100644
--- a/newlib/libc/stdio/putchar_u.c
+++ b/newlib/libc/stdio/putchar_u.c
@@ -61,8 +61,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#undef putchar_unlocked
int
-_DEFUN(_putchar_unlocked_r, (ptr, c),
- struct _reent *ptr,
+_putchar_unlocked_r (struct _reent *ptr,
int c)
{
return putc_unlocked (c, _stdout_r (ptr));
@@ -71,8 +70,7 @@ _DEFUN(_putchar_unlocked_r, (ptr, c),
#ifndef _REENT_ONLY
int
-_DEFUN(putchar_unlocked, (c),
- int c)
+putchar_unlocked (int c)
{
/* CHECK_INIT is (eventually) called by __swbuf. */
diff --git a/newlib/libc/stdio/puts.c b/newlib/libc/stdio/puts.c
index 89a9485bb..f612ece6d 100644
--- a/newlib/libc/stdio/puts.c
+++ b/newlib/libc/stdio/puts.c
@@ -65,8 +65,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
*/
int
-_DEFUN(_puts_r, (ptr, s),
- struct _reent *ptr,
+_puts_r (struct _reent *ptr,
const char * s)
{
#ifdef _FVWRITE_IN_STREAMIO
@@ -125,8 +124,7 @@ err:
#ifndef _REENT_ONLY
int
-_DEFUN(puts, (s),
- char const * s)
+puts (char const * s)
{
return _puts_r (_REENT, s);
}
diff --git a/newlib/libc/stdio/putw.c b/newlib/libc/stdio/putw.c
index 5377d87d3..a7907bef7 100644
--- a/newlib/libc/stdio/putw.c
+++ b/newlib/libc/stdio/putw.c
@@ -49,8 +49,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#include <stdio.h>
int
-_DEFUN(putw, (w, fp),
- int w,
+putw (int w,
register FILE *fp)
{
if (fwrite ((const char*)&w, sizeof (w), 1, fp) != 1)
diff --git a/newlib/libc/stdio/putwc.c b/newlib/libc/stdio/putwc.c
index 7c31d23d8..a6c3100d7 100644
--- a/newlib/libc/stdio/putwc.c
+++ b/newlib/libc/stdio/putwc.c
@@ -33,8 +33,7 @@
#undef putwc
wint_t
-_DEFUN(_putwc_r, (ptr, wc, fp),
- struct _reent *ptr,
+_putwc_r (struct _reent *ptr,
wchar_t wc,
FILE *fp)
{
@@ -45,8 +44,7 @@ _DEFUN(_putwc_r, (ptr, wc, fp),
* macro, may evaluate `fp' more than once.
*/
wint_t
-_DEFUN(putwc, (wc, fp),
- wchar_t wc,
+putwc (wchar_t wc,
FILE *fp)
{
return fputwc (wc, fp);
diff --git a/newlib/libc/stdio/putwc_u.c b/newlib/libc/stdio/putwc_u.c
index cb09fd2db..0ec11f04e 100644
--- a/newlib/libc/stdio/putwc_u.c
+++ b/newlib/libc/stdio/putwc_u.c
@@ -34,8 +34,7 @@
#undef putwc_unlocked
wint_t
-_DEFUN(_putwc_unlocked_r, (ptr, wc, fp),
- struct _reent *ptr,
+_putwc_unlocked_r (struct _reent *ptr,
wchar_t wc,
FILE *fp)
{
@@ -46,8 +45,7 @@ _DEFUN(_putwc_unlocked_r, (ptr, wc, fp),
* if it is a macro, may evaluate `fp' more than once.
*/
wint_t
-_DEFUN(putwc_unlocked, (wc, fp),
- wchar_t wc,
+putwc_unlocked (wchar_t wc,
FILE *fp)
{
return fputwc_unlocked (wc, fp);
diff --git a/newlib/libc/stdio/putwchar.c b/newlib/libc/stdio/putwchar.c
index 66ed30ac0..238cb5016 100644
--- a/newlib/libc/stdio/putwchar.c
+++ b/newlib/libc/stdio/putwchar.c
@@ -87,8 +87,7 @@ PORTABILITY
#undef putwchar
wint_t
-_DEFUN(_putwchar_r, (ptr, wc),
- struct _reent *ptr,
+_putwchar_r (struct _reent *ptr,
wchar_t wc)
{
return _fputwc_r (ptr, wc, stdout);
@@ -98,8 +97,7 @@ _DEFUN(_putwchar_r, (ptr, wc),
* Synonym for fputwc(wc, stdout).
*/
wint_t
-_DEFUN(putwchar, (wc),
- wchar_t wc)
+putwchar (wchar_t wc)
{
_REENT_SMALL_CHECK_INIT (_REENT);
return fputwc (wc, stdout);
diff --git a/newlib/libc/stdio/putwchar_u.c b/newlib/libc/stdio/putwchar_u.c
index 68c5abe26..a5e6a57da 100644
--- a/newlib/libc/stdio/putwchar_u.c
+++ b/newlib/libc/stdio/putwchar_u.c
@@ -34,8 +34,7 @@
#undef putwchar_unlocked
wint_t
-_DEFUN(_putwchar_unlocked_r, (ptr, wc),
- struct _reent *ptr,
+_putwchar_unlocked_r (struct _reent *ptr,
wchar_t wc)
{
return _fputwc_unlocked_r (ptr, wc, stdout);
@@ -45,8 +44,7 @@ _DEFUN(_putwchar_unlocked_r, (ptr, wc),
* Synonym for fputwc_unlocked(wc, stdout).
*/
wint_t
-_DEFUN(putwchar_unlocked, (wc),
- wchar_t wc)
+putwchar_unlocked (wchar_t wc)
{
_REENT_SMALL_CHECK_INIT (_REENT);
return fputwc_unlocked (wc, stdout);
diff --git a/newlib/libc/stdio/refill.c b/newlib/libc/stdio/refill.c
index 6158f3ec0..87a715b84 100644
--- a/newlib/libc/stdio/refill.c
+++ b/newlib/libc/stdio/refill.c
@@ -23,8 +23,7 @@
#include "local.h"
static int
-_DEFUN(lflush, (fp),
- FILE *fp)
+lflush (FILE *fp)
{
if ((fp->_flags & (__SLBF | __SWR)) == (__SLBF | __SWR))
return fflush (fp);
@@ -37,8 +36,7 @@ _DEFUN(lflush, (fp),
*/
int
-_DEFUN(__srefill_r, (ptr, fp),
- struct _reent * ptr,
+__srefill_r (struct _reent * ptr,
register FILE * fp)
{
/* make sure stdio is set up */
diff --git a/newlib/libc/stdio/remove.c b/newlib/libc/stdio/remove.c
index 810b282ac..a10582832 100644
--- a/newlib/libc/stdio/remove.c
+++ b/newlib/libc/stdio/remove.c
@@ -59,8 +59,7 @@ Supporting OS subroutine required: <<unlink>>.
#include <stdio.h>
int
-_DEFUN(_remove_r, (ptr, filename),
- struct _reent *ptr,
+_remove_r (struct _reent *ptr,
const char *filename)
{
if (_unlink_r (ptr, filename) == -1)
@@ -72,8 +71,7 @@ _DEFUN(_remove_r, (ptr, filename),
#ifndef _REENT_ONLY
int
-_DEFUN(remove, (filename),
- const char *filename)
+remove (const char *filename)
{
return _remove_r (_REENT, filename);
}
diff --git a/newlib/libc/stdio/rename.c b/newlib/libc/stdio/rename.c
index a32770846..b3c745a10 100644
--- a/newlib/libc/stdio/rename.c
+++ b/newlib/libc/stdio/rename.c
@@ -54,8 +54,7 @@ Supporting OS subroutines required: <<link>>, <<unlink>>, or <<rename>>.
#ifndef _REENT_ONLY
int
-_DEFUN(rename, (old, new),
- const char *old,
+rename (const char *old,
const char *new)
{
return _rename_r (_REENT, old, new);
diff --git a/newlib/libc/stdio/rewind.c b/newlib/libc/stdio/rewind.c
index 745c93974..a65847d5e 100644
--- a/newlib/libc/stdio/rewind.c
+++ b/newlib/libc/stdio/rewind.c
@@ -52,8 +52,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#include <stdio.h>
void
-_DEFUN(_rewind_r, (ptr, fp),
- struct _reent * ptr,
+_rewind_r (struct _reent * ptr,
register FILE * fp)
{
(void) _fseek_r (ptr, fp, 0L, SEEK_SET);
@@ -63,8 +62,7 @@ _DEFUN(_rewind_r, (ptr, fp),
#ifndef _REENT_ONLY
void
-_DEFUN(rewind, (fp),
- register FILE * fp)
+rewind (register FILE * fp)
{
_rewind_r (_REENT, fp);
}
diff --git a/newlib/libc/stdio/rget.c b/newlib/libc/stdio/rget.c
index d76f307d7..656e5661b 100644
--- a/newlib/libc/stdio/rget.c
+++ b/newlib/libc/stdio/rget.c
@@ -32,8 +32,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
*/
int
-_DEFUN(__srget_r, (ptr, fp),
- struct _reent *ptr,
+__srget_r (struct _reent *ptr,
register FILE *fp)
{
/* Ensure that any fake std stream is resolved before
@@ -52,8 +51,7 @@ _DEFUN(__srget_r, (ptr, fp),
required for backward compatibility with applications built against
earlier dynamically built newlib libraries. */
int
-_DEFUN(__srget, (fp),
- register FILE *fp)
+__srget (register FILE *fp)
{
return __srget_r (_REENT, fp);
}
diff --git a/newlib/libc/stdio/sccl.c b/newlib/libc/stdio/sccl.c
index d0bdfd936..c1bf2b189 100644
--- a/newlib/libc/stdio/sccl.c
+++ b/newlib/libc/stdio/sccl.c
@@ -31,8 +31,7 @@
*/
u_char *
-_DEFUN(__sccl, (tab, fmt),
- register char *tab,
+__sccl (register char *tab,
register u_char *fmt)
{
register int c, n, v;
diff --git a/newlib/libc/stdio/setbuf.c b/newlib/libc/stdio/setbuf.c
index 1538762a1..f5471866d 100644
--- a/newlib/libc/stdio/setbuf.c
+++ b/newlib/libc/stdio/setbuf.c
@@ -65,8 +65,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include "local.h"
void
-_DEFUN(setbuf, (fp, buf),
- FILE *__restrict fp,
+setbuf (FILE *__restrict fp,
char *__restrict buf)
{
(void) setvbuf (fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
diff --git a/newlib/libc/stdio/setbuffer.c b/newlib/libc/stdio/setbuffer.c
index 2b93e7df3..35d17da3b 100644
--- a/newlib/libc/stdio/setbuffer.c
+++ b/newlib/libc/stdio/setbuffer.c
@@ -65,8 +65,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include "local.h"
void
-_DEFUN(setbuffer, (fp, buf, size),
- FILE * fp,
+setbuffer (FILE * fp,
char *buf,
int size)
{
diff --git a/newlib/libc/stdio/setlinebuf.c b/newlib/libc/stdio/setlinebuf.c
index d8cb013d9..d623b3014 100644
--- a/newlib/libc/stdio/setlinebuf.c
+++ b/newlib/libc/stdio/setlinebuf.c
@@ -56,8 +56,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include "local.h"
int
-_DEFUN(setlinebuf, (fp),
- FILE * fp)
+setlinebuf (FILE * fp)
{
return (setvbuf (fp, (char *) NULL, _IOLBF, (size_t) 0));
}
diff --git a/newlib/libc/stdio/setvbuf.c b/newlib/libc/stdio/setvbuf.c
index 6ce0ee1fe..63c9970e4 100644
--- a/newlib/libc/stdio/setvbuf.c
+++ b/newlib/libc/stdio/setvbuf.c
@@ -88,8 +88,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
*/
int
-_DEFUN(setvbuf, (fp, buf, mode, size),
- register FILE * fp,
+setvbuf (register FILE * fp,
char *buf,
register int mode,
register size_t size)
diff --git a/newlib/libc/stdio/siprintf.c b/newlib/libc/stdio/siprintf.c
index 2251e0912..6ec24777e 100644
--- a/newlib/libc/stdio/siprintf.c
+++ b/newlib/libc/stdio/siprintf.c
@@ -104,8 +104,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
#ifdef _HAVE_STDC
-_DEFUN(_siprintf_r, (ptr, str, fmt),
- struct _reent *ptr,
+_siprintf_r (struct _reent *ptr,
char *str,
const char *fmt, ...)
#else
@@ -139,8 +138,7 @@ _siprintf_r(ptr, str, fmt, va_alist)
int
#ifdef _HAVE_STDC
-_DEFUN(siprintf, (str, fmt),
- char *str,
+siprintf (char *str,
const char *fmt, ...)
#else
siprintf(str, fmt, va_alist)
diff --git a/newlib/libc/stdio/siscanf.c b/newlib/libc/stdio/siscanf.c
index bd1528b04..9b45ecdbb 100644
--- a/newlib/libc/stdio/siscanf.c
+++ b/newlib/libc/stdio/siscanf.c
@@ -87,8 +87,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifdef _HAVE_STDC
int
-_DEFUN(siscanf, (str, fmt),
- const char *str,
+siscanf (const char *str,
const char *fmt, ...)
#else
int
@@ -123,8 +122,7 @@ siscanf(str, fmt, va_alist)
#ifdef _HAVE_STDC
int
-_DEFUN(_siscanf_r, (ptr, str, fmt),
- struct _reent *ptr,
+_siscanf_r (struct _reent *ptr,
const char *str,
const char *fmt, ...)
#else
diff --git a/newlib/libc/stdio/sniprintf.c b/newlib/libc/stdio/sniprintf.c
index d7bb9a40e..d13278437 100644
--- a/newlib/libc/stdio/sniprintf.c
+++ b/newlib/libc/stdio/sniprintf.c
@@ -32,8 +32,7 @@
int
#ifdef _HAVE_STDC
-_DEFUN (_sniprintf_r, (ptr, str, size, fmt),
- struct _reent *ptr,
+_sniprintf_r (struct _reent *ptr,
char *str,
size_t size,
const char *fmt, ...)
@@ -77,8 +76,7 @@ _sniprintf_r (ptr, str, size, fmt, va_alist)
int
#ifdef _HAVE_STDC
-_DEFUN (sniprintf, (str, size, fmt),
- char *str,
+sniprintf (char *str,
size_t size,
const char *fmt, ...)
#else
diff --git a/newlib/libc/stdio/snprintf.c b/newlib/libc/stdio/snprintf.c
index ab33dfb47..d5ba7085c 100644
--- a/newlib/libc/stdio/snprintf.c
+++ b/newlib/libc/stdio/snprintf.c
@@ -31,8 +31,7 @@
int
#ifdef _HAVE_STDC
-_DEFUN(_snprintf_r, (ptr, str, size, fmt),
- struct _reent *ptr,
+_snprintf_r (struct _reent *ptr,
char *__restrict str,
size_t size,
const char *__restrict fmt, ...)
@@ -82,8 +81,7 @@ _EXFUN(_sniprintf_r, (struct _reent *, char *, size_t, const char *, ...)
int
#ifdef _HAVE_STDC
-_DEFUN(snprintf, (str, size, fmt),
- char *__restrict str,
+snprintf (char *__restrict str,
size_t size,
const char *__restrict fmt, ...)
#else
diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index 35d39618f..bbb9753b9 100644
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -580,8 +580,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
#ifdef _HAVE_STDC
-_DEFUN(_sprintf_r, (ptr, str, fmt),
- struct _reent *ptr,
+_sprintf_r (struct _reent *ptr,
char *__restrict str,
const char *__restrict fmt, ...)
#else
@@ -621,8 +620,7 @@ _EXFUN(_siprintf_r, (struct _reent *, char *, const char *, ...)
int
#ifdef _HAVE_STDC
-_DEFUN(sprintf, (str, fmt),
- char *__restrict str,
+sprintf (char *__restrict str,
const char *__restrict fmt, ...)
#else
sprintf(str, fmt, va_alist)
diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index 92983b1ec..a04f9b65c 100644
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -426,8 +426,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifdef _HAVE_STDC
int
-_DEFUN(sscanf, (str, fmt),
- const char *__restrict str,
+sscanf (const char *__restrict str,
const char * fmt, ...)
#else
int
@@ -468,8 +467,7 @@ _EXFUN(siscanf, (const char *, const char *, ...)
#ifdef _HAVE_STDC
int
-_DEFUN(_sscanf_r, (ptr, str, fmt),
- struct _reent *ptr,
+_sscanf_r (struct _reent *ptr,
const char *__restrict str,
const char *__restrict fmt, ...)
#else
diff --git a/newlib/libc/stdio/stdio.c b/newlib/libc/stdio/stdio.c
index 0e8016b12..a72fb74d0 100644
--- a/newlib/libc/stdio/stdio.c
+++ b/newlib/libc/stdio/stdio.c
@@ -30,8 +30,7 @@
*/
_READ_WRITE_RETURN_TYPE
-_DEFUN(__sread, (ptr, cookie, buf, n),
- struct _reent *ptr,
+__sread (struct _reent *ptr,
void *cookie,
char *buf,
_READ_WRITE_BUFSIZE_TYPE n)
@@ -63,8 +62,7 @@ _DEFUN(__sread, (ptr, cookie, buf, n),
/* Dummy function used in sscanf/swscanf. */
_READ_WRITE_RETURN_TYPE
-_DEFUN(__seofread, (ptr, cookie, buf, len),
- struct _reent *_ptr,
+__seofread (struct _reent *_ptr,
void *cookie,
char *buf,
_READ_WRITE_BUFSIZE_TYPE len)
@@ -73,8 +71,7 @@ _DEFUN(__seofread, (ptr, cookie, buf, len),
}
_READ_WRITE_RETURN_TYPE
-_DEFUN(__swrite, (ptr, cookie, buf, n),
- struct _reent *ptr,
+__swrite (struct _reent *ptr,
void *cookie,
char const *buf,
_READ_WRITE_BUFSIZE_TYPE n)
@@ -105,8 +102,7 @@ _DEFUN(__swrite, (ptr, cookie, buf, n),
}
_fpos_t
-_DEFUN(__sseek, (ptr, cookie, offset, whence),
- struct _reent *ptr,
+__sseek (struct _reent *ptr,
void *cookie,
_fpos_t offset,
int whence)
@@ -126,8 +122,7 @@ _DEFUN(__sseek, (ptr, cookie, offset, whence),
}
int
-_DEFUN(__sclose, (ptr, cookie),
- struct _reent *ptr,
+__sclose (struct _reent *ptr,
void *cookie)
{
FILE *fp = (FILE *) cookie;
@@ -137,8 +132,7 @@ _DEFUN(__sclose, (ptr, cookie),
#ifdef __SCLE
int
-_DEFUN(__stextmode, (fd),
- int fd)
+__stextmode (int fd)
{
#ifdef __CYGWIN__
extern int _cygwin_istext_for_stdio (int);
diff --git a/newlib/libc/stdio/stdio_ext.c b/newlib/libc/stdio/stdio_ext.c
index 98f2ccaa9..857091fd7 100644
--- a/newlib/libc/stdio/stdio_ext.c
+++ b/newlib/libc/stdio/stdio_ext.c
@@ -62,50 +62,43 @@ No supporting OS subroutines are required.
/* Subroutine versions of the inline or macro functions. */
size_t
-_DEFUN(__fbufsize, (fp),
- FILE * fp)
+__fbufsize (FILE * fp)
{
return (size_t) fp->_bf._size;
}
size_t
-_DEFUN(__fpending, (fp),
- FILE * fp)
+__fpending (FILE * fp)
{
return fp->_p - fp->_bf._base;
}
int
-_DEFUN(__flbf, (fp),
- FILE * fp)
+__flbf (FILE * fp)
{
return (fp->_flags & __SLBF) != 0;
}
int
-_DEFUN(__freadable, (fp),
- FILE * fp)
+__freadable (FILE * fp)
{
return (fp->_flags & (__SRD | __SRW)) != 0;
}
int
-_DEFUN(__fwritable, (fp),
- FILE * fp)
+__fwritable (FILE * fp)
{
return (fp->_flags & (__SWR | __SRW)) != 0;
}
int
-_DEFUN(__freading, (fp),
- FILE * fp)
+__freading (FILE * fp)
{
return (fp->_flags & __SRD) != 0;
}
int
-_DEFUN(__fwriting, (fp),
- FILE * fp)
+__fwriting (FILE * fp)
{
return (fp->_flags & __SWR) != 0;
}
diff --git a/newlib/libc/stdio/swprintf.c b/newlib/libc/stdio/swprintf.c
index 427e03ed5..fa3b43e7a 100644
--- a/newlib/libc/stdio/swprintf.c
+++ b/newlib/libc/stdio/swprintf.c
@@ -553,8 +553,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
* a variable set to _REENT. */
int
-_DEFUN(_swprintf_r, (ptr, str, size, fmt),
- struct _reent *ptr,
+_swprintf_r (struct _reent *ptr,
wchar_t *str,
size_t size,
const wchar_t *fmt, ...)
@@ -594,8 +593,7 @@ _DEFUN(_swprintf_r, (ptr, str, size, fmt),
#ifndef _REENT_ONLY
int
-_DEFUN(swprintf, (str, size, fmt),
- wchar_t *__restrict str,
+swprintf (wchar_t *__restrict str,
size_t size,
const wchar_t *__restrict fmt, ...)
{
diff --git a/newlib/libc/stdio/tmpfile.c b/newlib/libc/stdio/tmpfile.c
index ee30523ab..f209a3edf 100644
--- a/newlib/libc/stdio/tmpfile.c
+++ b/newlib/libc/stdio/tmpfile.c
@@ -50,8 +50,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<getpid>>,
#endif
FILE *
-_DEFUN(_tmpfile_r, (ptr),
- struct _reent *ptr)
+_tmpfile_r (struct _reent *ptr)
{
FILE *fp;
int e;
diff --git a/newlib/libc/stdio/tmpnam.c b/newlib/libc/stdio/tmpnam.c
index d794a988e..3bd5b6a58 100644
--- a/newlib/libc/stdio/tmpnam.c
+++ b/newlib/libc/stdio/tmpnam.c
@@ -86,8 +86,7 @@ The global pointer <<environ>> is also required.
another one. Return nonzero if successful, otherwise zero. */
static int
-_DEFUN(worker, (ptr, result, part1, part2, part3, part4),
- struct _reent *ptr,
+worker (struct _reent *ptr,
char *result,
const char *part1,
const char *part2,
@@ -118,8 +117,7 @@ _DEFUN(worker, (ptr, result, part1, part2, part3, part4),
}
char *
-_DEFUN(_tmpnam_r, (p, s),
- struct _reent *p,
+_tmpnam_r (struct _reent *p,
char *s)
{
char *result;
@@ -147,8 +145,7 @@ _DEFUN(_tmpnam_r, (p, s),
}
char *
-_DEFUN(_tempnam_r, (p, dir, pfx),
- struct _reent *p,
+_tempnam_r (struct _reent *p,
const char *dir,
const char *pfx)
{
@@ -174,16 +171,14 @@ _DEFUN(_tempnam_r, (p, dir, pfx),
#ifndef _REENT_ONLY
char *
-_DEFUN(tempnam, (dir, pfx),
- const char *dir,
+tempnam (const char *dir,
const char *pfx)
{
return _tempnam_r (_REENT, dir, pfx);
}
char *
-_DEFUN(tmpnam, (s),
- char *s)
+tmpnam (char *s)
{
return _tmpnam_r (_REENT, s);
}
diff --git a/newlib/libc/stdio/ungetc.c b/newlib/libc/stdio/ungetc.c
index c673365b1..444577585 100644
--- a/newlib/libc/stdio/ungetc.c
+++ b/newlib/libc/stdio/ungetc.c
@@ -77,8 +77,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
/*static*/
int
-_DEFUN(__submore, (rptr, fp),
- struct _reent *rptr,
+__submore (struct _reent *rptr,
register FILE *fp)
{
register int i;
@@ -111,8 +110,7 @@ _DEFUN(__submore, (rptr, fp),
}
int
-_DEFUN(_ungetc_r, (rptr, c, fp),
- struct _reent *rptr,
+_ungetc_r (struct _reent *rptr,
int c,
register FILE *fp)
{
@@ -208,8 +206,7 @@ _DEFUN(_ungetc_r, (rptr, c, fp),
#ifndef _REENT_ONLY
int
-_DEFUN(ungetc, (c, fp),
- int c,
+ungetc (int c,
register FILE *fp)
{
return _ungetc_r (_REENT, c, fp);
diff --git a/newlib/libc/stdio/ungetwc.c b/newlib/libc/stdio/ungetwc.c
index 60f3e5b49..16d37f2d1 100644
--- a/newlib/libc/stdio/ungetwc.c
+++ b/newlib/libc/stdio/ungetwc.c
@@ -74,8 +74,7 @@ C99
#include "local.h"
wint_t
-_DEFUN(_ungetwc_r, (ptr, wc, fp),
- struct _reent *ptr,
+_ungetwc_r (struct _reent *ptr,
wint_t wc,
register FILE *fp)
{
@@ -106,8 +105,7 @@ _DEFUN(_ungetwc_r, (ptr, wc, fp),
* MT-safe version.
*/
wint_t
-_DEFUN(ungetwc, (wint_t wc, FILE *fp),
- wint_t wc,
+ungetwc (wint_t wc,
FILE *fp)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/vasiprintf.c b/newlib/libc/stdio/vasiprintf.c
index 259d44b0e..c7c5e35e4 100644
--- a/newlib/libc/stdio/vasiprintf.c
+++ b/newlib/libc/stdio/vasiprintf.c
@@ -31,8 +31,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#ifndef _REENT_ONLY
int
-_DEFUN(vasiprintf, (strp, fmt, ap),
- char **strp,
+vasiprintf (char **strp,
const char *fmt,
va_list ap)
{
@@ -42,8 +41,7 @@ _DEFUN(vasiprintf, (strp, fmt, ap),
#endif /* !_REENT_ONLY */
int
-_DEFUN(_vasiprintf_r, (ptr, strp, fmt, ap),
- struct _reent *ptr,
+_vasiprintf_r (struct _reent *ptr,
char **strp,
const char *fmt,
va_list ap)
diff --git a/newlib/libc/stdio/vasniprintf.c b/newlib/libc/stdio/vasniprintf.c
index 9bbe30c59..edfbd2242 100644
--- a/newlib/libc/stdio/vasniprintf.c
+++ b/newlib/libc/stdio/vasniprintf.c
@@ -14,8 +14,7 @@
#include "local.h"
char *
-_DEFUN(_vasniprintf_r, (ptr, buf, lenp, fmt, ap),
- struct _reent *ptr,
+_vasniprintf_r (struct _reent *ptr,
char *buf,
size_t *lenp,
const char *fmt,
@@ -59,8 +58,7 @@ _DEFUN(_vasniprintf_r, (ptr, buf, lenp, fmt, ap),
#ifndef _REENT_ONLY
char *
-_DEFUN(vasniprintf, (buf, lenp, fmt, ap),
- char *buf,
+vasniprintf (char *buf,
size_t *lenp,
const char *fmt,
va_list ap)
diff --git a/newlib/libc/stdio/vasnprintf.c b/newlib/libc/stdio/vasnprintf.c
index 6edb47398..5bc0ec634 100644
--- a/newlib/libc/stdio/vasnprintf.c
+++ b/newlib/libc/stdio/vasnprintf.c
@@ -14,8 +14,7 @@
#include "local.h"
char *
-_DEFUN(_vasnprintf_r, (ptr, buf, lenp, fmt, ap),
- struct _reent *ptr,
+_vasnprintf_r (struct _reent *ptr,
char *buf,
size_t *lenp,
const char *fmt,
@@ -66,8 +65,7 @@ _EXFUN(_vasniprintf_r, (struct _reent*, char *, size_t *,
#ifndef _REENT_ONLY
char *
-_DEFUN(vasnprintf, (buf, lenp, fmt, ap),
- char *buf,
+vasnprintf (char *buf,
size_t *lenp,
const char *fmt,
va_list ap)
diff --git a/newlib/libc/stdio/vasprintf.c b/newlib/libc/stdio/vasprintf.c
index c0961de01..4acbc0479 100644
--- a/newlib/libc/stdio/vasprintf.c
+++ b/newlib/libc/stdio/vasprintf.c
@@ -31,8 +31,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#ifndef _REENT_ONLY
int
-_DEFUN(vasprintf, (strp, fmt, ap),
- char **strp,
+vasprintf (char **strp,
const char *fmt,
va_list ap)
{
@@ -48,8 +47,7 @@ _EXFUN(vasiprintf, (char **, const char *, __VALIST)
#endif /* !_REENT_ONLY */
int
-_DEFUN(_vasprintf_r, (ptr, strp, fmt, ap),
- struct _reent *ptr,
+_vasprintf_r (struct _reent *ptr,
char **strp,
const char *fmt,
va_list ap)
diff --git a/newlib/libc/stdio/vdiprintf.c b/newlib/libc/stdio/vdiprintf.c
index 73a3b19d1..22a71b326 100644
--- a/newlib/libc/stdio/vdiprintf.c
+++ b/newlib/libc/stdio/vdiprintf.c
@@ -13,8 +13,7 @@
#include "local.h"
int
-_DEFUN(_vdiprintf_r, (ptr, fd, format, ap),
- struct _reent *ptr,
+_vdiprintf_r (struct _reent *ptr,
int fd,
const char *format,
va_list ap)
@@ -36,8 +35,7 @@ _DEFUN(_vdiprintf_r, (ptr, fd, format, ap),
#ifndef _REENT_ONLY
int
-_DEFUN(vdiprintf, (fd, format, ap),
- int fd,
+vdiprintf (int fd,
const char *format,
va_list ap)
{
diff --git a/newlib/libc/stdio/vdprintf.c b/newlib/libc/stdio/vdprintf.c
index 1b50e8833..6261f6217 100644
--- a/newlib/libc/stdio/vdprintf.c
+++ b/newlib/libc/stdio/vdprintf.c
@@ -13,8 +13,7 @@
#include "local.h"
int
-_DEFUN(_vdprintf_r, (ptr, fd, format, ap),
- struct _reent *ptr,
+_vdprintf_r (struct _reent *ptr,
int fd,
const char *__restrict format,
va_list ap)
@@ -42,8 +41,7 @@ _EXFUN(_vdiprintf_r, (struct _reent *, int, const char *, __VALIST)
#ifndef _REENT_ONLY
int
-_DEFUN(vdprintf, (fd, format, ap),
- int fd,
+vdprintf (int fd,
const char *__restrict format,
va_list ap)
{
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index f2d052b13..c2e59fc4a 100644
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -198,8 +198,7 @@ static char *rcsid = "$Id$";
#ifdef INTEGER_ONLY
#ifndef _FVWRITE_IN_STREAMIO
int
-_DEFUN(__ssputs_r, (ptr, fp, buf, len),
- struct _reent *ptr,
+__ssputs_r (struct _reent *ptr,
FILE *fp,
const char *buf,
size_t len)
@@ -267,8 +266,7 @@ err:
#endif
int
-_DEFUN(__ssprint_r, (ptr, fp, uio),
- struct _reent *ptr,
+__ssprint_r (struct _reent *ptr,
FILE *fp,
register struct __suio *uio)
{
@@ -369,8 +367,7 @@ int __ssprint_r (struct _reent *, FILE *, register struct __suio *);
#ifndef _FVWRITE_IN_STREAMIO
int
-_DEFUN(__sfputs_r, (ptr, fp, buf, len),
- struct _reent *ptr,
+__sfputs_r (struct _reent *ptr,
FILE *fp,
const char *buf,
size_t len)
@@ -403,8 +400,7 @@ _DEFUN(__sfputs_r, (ptr, fp, buf, len),
* then reset it so that it can be reused.
*/
int
-_DEFUN(__sprint_r, (ptr, fp, uio),
- struct _reent *ptr,
+__sprint_r (struct _reent *ptr,
FILE *fp,
register struct __suio *uio)
{
@@ -456,8 +452,7 @@ int __sprint_r (struct _reent *, FILE *, register struct __suio *);
* Make sure to avoid inlining.
*/
_NOINLINE_STATIC int
-_DEFUN(__sbprintf, (rptr, fp, fmt, ap),
- struct _reent *rptr,
+__sbprintf (struct _reent *rptr,
register FILE *fp,
const char *fmt,
va_list ap)
@@ -648,8 +643,7 @@ int _EXFUN(_VFPRINTF_R, (struct _reent *, FILE *, const char *, va_list));
#ifndef STRING_ONLY
int
-_DEFUN(VFPRINTF, (fp, fmt0, ap),
- FILE * fp,
+VFPRINTF (FILE * fp,
const char *fmt0,
va_list ap)
{
@@ -660,8 +654,7 @@ _DEFUN(VFPRINTF, (fp, fmt0, ap),
#endif /* STRING_ONLY */
int
-_DEFUN(_VFPRINTF_R, (data, fp, fmt0, ap),
- struct _reent *data,
+_VFPRINTF_R (struct _reent *data,
FILE * fp,
const char *fmt0,
va_list ap)
@@ -2043,8 +2036,7 @@ const __ACTION __action_table[MAX_STATE][MAX_CH_CLASS] = {
/* function to get positional parameter N where n = N - 1 */
static union arg_val *
-_DEFUN(get_arg, (data, n, fmt, ap, numargs_p, args, arg_type, last_fmt),
- struct _reent *data,
+get_arg (struct _reent *data,
int n,
char *fmt,
va_list *ap,
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index d76d94b8c..097fd801c 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -224,8 +224,7 @@ typedef unsigned long long u_long_long;
#ifndef _REENT_ONLY
int
-_DEFUN(VFSCANF, (fp, fmt, ap),
- register FILE *fp,
+VFSCANF (register FILE *fp,
const char *fmt,
va_list ap)
{
@@ -236,8 +235,7 @@ _DEFUN(VFSCANF, (fp, fmt, ap),
}
int
-_DEFUN(__SVFSCANF, (fp, fmt0, ap),
- register FILE *fp,
+__SVFSCANF (register FILE *fp,
char const *fmt0,
va_list ap)
{
@@ -247,8 +245,7 @@ _DEFUN(__SVFSCANF, (fp, fmt0, ap),
#endif /* !_REENT_ONLY */
int
-_DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
- struct _reent *data,
+_VFSCANF_R (struct _reent *data,
register FILE *fp,
const char *fmt,
va_list ap)
@@ -263,8 +260,7 @@ _DEFUN(_VFSCANF_R, (data, fp, fmt, ap),
* regular ungetc which will drag in file I/O items we don't need.
* So, we create our own trimmed-down version. */
int
-_DEFUN(_sungetc_r, (data, fp, ch),
- struct _reent *data,
+_sungetc_r (struct _reent *data,
int c,
register FILE *fp)
{
@@ -321,8 +317,7 @@ _DEFUN(_sungetc_r, (data, fp, ch),
/* String only version of __srefill_r for sscanf family. */
int
-_DEFUN(__ssrefill_r, (ptr, fp),
- struct _reent * ptr,
+__ssrefill_r (struct _reent * ptr,
register FILE * fp)
{
/*
@@ -347,8 +342,7 @@ _DEFUN(__ssrefill_r, (ptr, fp),
}
size_t
-_DEFUN(_sfread_r, (ptr, buf, size, count, fp),
- struct _reent * ptr,
+_sfread_r (struct _reent * ptr,
void *buf,
size_t size,
size_t count,
@@ -402,8 +396,7 @@ __wctob (struct _reent *rptr, wint_t wc)
}
int
-_DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
- struct _reent *rptr,
+__SVFSCANF_R (struct _reent *rptr,
register FILE *fp,
char const *fmt0,
va_list ap)
diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
index 449b628db..dd78eb015 100644
--- a/newlib/libc/stdio/vfwprintf.c
+++ b/newlib/libc/stdio/vfwprintf.c
@@ -174,8 +174,7 @@ int _EXFUN(__SPRINT, (struct _reent *, FILE *, const char *, size_t));
* worries about ungetc buffers and so forth.
*/
static int
-_DEFUN(__sbwprintf, (rptr, fp, fmt, ap),
- struct _reent *rptr,
+__sbwprintf (struct _reent *rptr,
register FILE *fp,
const wchar_t *fmt,
va_list ap)
@@ -366,8 +365,7 @@ _EXFUN(get_arg, (struct _reent *data, int n, wchar_t *fmt,
#ifndef STRING_ONLY
int
-_DEFUN(VFWPRINTF, (fp, fmt0, ap),
- FILE *__restrict fp,
+VFWPRINTF (FILE *__restrict fp,
const wchar_t *__restrict fmt0,
va_list ap)
{
@@ -378,8 +376,7 @@ _DEFUN(VFWPRINTF, (fp, fmt0, ap),
#endif /* STRING_ONLY */
int
-_DEFUN(_VFWPRINTF_R, (data, fp, fmt0, ap),
- struct _reent *data,
+_VFWPRINTF_R (struct _reent *data,
FILE * fp,
const wchar_t *fmt0,
va_list ap)
@@ -1734,8 +1731,7 @@ wexponent(wchar_t *p0, int exp, int fmtch)
/* function to get positional parameter N where n = N - 1 */
static union arg_val *
-_DEFUN(get_arg, (data, n, fmt, ap, numargs_p, args, arg_type, last_fmt),
- struct _reent *data,
+get_arg (struct _reent *data,
int n,
wchar_t *fmt,
va_list *ap,
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
index 3ac6ecc07..c3470a15c 100644
--- a/newlib/libc/stdio/vfwscanf.c
+++ b/newlib/libc/stdio/vfwscanf.c
@@ -226,8 +226,7 @@ static void * get_arg (int, va_list *, int *, void **);
#ifndef _REENT_ONLY
int
-_DEFUN(VFWSCANF, (fp, fmt, ap),
- register FILE *__restrict fp,
+VFWSCANF (register FILE *__restrict fp,
const wchar_t *__restrict fmt,
va_list ap)
{
@@ -238,8 +237,7 @@ _DEFUN(VFWSCANF, (fp, fmt, ap),
}
int
-_DEFUN(__SVFWSCANF, (fp, fmt0, ap),
- register FILE *fp,
+__SVFWSCANF (register FILE *fp,
wchar_t const *fmt0,
va_list ap)
{
@@ -249,8 +247,7 @@ _DEFUN(__SVFWSCANF, (fp, fmt0, ap),
#endif /* !_REENT_ONLY */
int
-_DEFUN(_VFWSCANF_R, (data, fp, fmt, ap),
- struct _reent *data,
+_VFWSCANF_R (struct _reent *data,
register FILE *fp,
const wchar_t *fmt,
va_list ap)
@@ -265,8 +262,7 @@ _DEFUN(_VFWSCANF_R, (data, fp, fmt, ap),
* regular ungetwc which will drag in file I/O items we don't need.
* So, we create our own trimmed-down version. */
static wint_t
-_DEFUN(_sungetwc_r, (data, fp, ch),
- struct _reent *data,
+_sungetwc_r (struct _reent *data,
wint_t wc,
register FILE *fp)
{
@@ -325,8 +321,7 @@ _DEFUN(_sungetwc_r, (data, fp, ch),
extern int __ssrefill_r (struct _reent *ptr, register FILE * fp);
static size_t
-_DEFUN(_sfgetwc_r, (ptr, fp),
- struct _reent * ptr,
+_sfgetwc_r (struct _reent * ptr,
FILE * fp)
{
wchar_t wc;
@@ -341,8 +336,7 @@ _DEFUN(_sfgetwc_r, (ptr, fp),
#endif /* STRING_ONLY */
int
-_DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap),
- struct _reent *rptr,
+__SVFWSCANF_R (struct _reent *rptr,
register FILE *fp,
wchar_t const *fmt0,
va_list ap)
diff --git a/newlib/libc/stdio/viprintf.c b/newlib/libc/stdio/viprintf.c
index 950009d4a..9678815f1 100644
--- a/newlib/libc/stdio/viprintf.c
+++ b/newlib/libc/stdio/viprintf.c
@@ -105,8 +105,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifndef _REENT_ONLY
int
-_DEFUN(viprintf, (fmt, ap),
- const char *fmt,
+viprintf (const char *fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -118,8 +117,7 @@ _DEFUN(viprintf, (fmt, ap),
#endif /* !_REENT_ONLY */
int
-_DEFUN(_viprintf_r, (ptr, fmt, ap),
- struct _reent *ptr,
+_viprintf_r (struct _reent *ptr,
const char *fmt,
va_list ap)
{
diff --git a/newlib/libc/stdio/viscanf.c b/newlib/libc/stdio/viscanf.c
index 0c9b13f58..e5ad1dbbd 100644
--- a/newlib/libc/stdio/viscanf.c
+++ b/newlib/libc/stdio/viscanf.c
@@ -89,8 +89,7 @@ Supporting OS subroutines required:
#ifndef _REENT_ONLY
int
-_DEFUN(viscanf, (fmt, ap),
- const char *fmt,
+viscanf (const char *fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -102,8 +101,7 @@ _DEFUN(viscanf, (fmt, ap),
#endif /* !_REENT_ONLY */
int
-_DEFUN(_viscanf_r, (ptr, fmt, ap),
- struct _reent *ptr,
+_viscanf_r (struct _reent *ptr,
const char *fmt,
va_list ap)
{
diff --git a/newlib/libc/stdio/vprintf.c b/newlib/libc/stdio/vprintf.c
index 289c46cd0..79c324d55 100644
--- a/newlib/libc/stdio/vprintf.c
+++ b/newlib/libc/stdio/vprintf.c
@@ -29,8 +29,7 @@
#ifndef _REENT_ONLY
int
-_DEFUN(vprintf, (fmt, ap),
- const char *fmt,
+vprintf (const char *fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -47,8 +46,7 @@ _EXFUN(viprintf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vprintf"))));
#endif /* !_REENT_ONLY */
int
-_DEFUN(_vprintf_r, (ptr, fmt, ap),
- struct _reent *ptr,
+_vprintf_r (struct _reent *ptr,
const char *__restrict fmt,
va_list ap)
{
diff --git a/newlib/libc/stdio/vscanf.c b/newlib/libc/stdio/vscanf.c
index 260359a3e..be329ded4 100644
--- a/newlib/libc/stdio/vscanf.c
+++ b/newlib/libc/stdio/vscanf.c
@@ -30,8 +30,7 @@
#ifndef _REENT_ONLY
int
-_DEFUN(vscanf, (fmt, ap),
- const char *fmt,
+vscanf (const char *fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -48,8 +47,7 @@ _EXFUN(viscanf, (const char *, __VALIST) _ATTRIBUTE ((__alias__("vscanf"))));
#endif /* !_REENT_ONLY */
int
-_DEFUN(_vscanf_r, (ptr, fmt, ap),
- struct _reent *ptr,
+_vscanf_r (struct _reent *ptr,
const char *__restrict fmt,
va_list ap)
{
diff --git a/newlib/libc/stdio/vsiprintf.c b/newlib/libc/stdio/vsiprintf.c
index ff83b7856..74eae0253 100644
--- a/newlib/libc/stdio/vsiprintf.c
+++ b/newlib/libc/stdio/vsiprintf.c
@@ -31,8 +31,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#ifndef _REENT_ONLY
int
-_DEFUN(vsiprintf, (str, fmt, ap),
- char *str,
+vsiprintf (char *str,
const char *fmt,
va_list ap)
{
@@ -42,8 +41,7 @@ _DEFUN(vsiprintf, (str, fmt, ap),
#endif /* !_REENT_ONLY */
int
-_DEFUN(_vsiprintf_r, (ptr, str, fmt, ap),
- struct _reent *ptr,
+_vsiprintf_r (struct _reent *ptr,
char *str,
const char *fmt,
va_list ap)
diff --git a/newlib/libc/stdio/vsiscanf.c b/newlib/libc/stdio/vsiscanf.c
index 6ad0f4a8d..5679df056 100644
--- a/newlib/libc/stdio/vsiscanf.c
+++ b/newlib/libc/stdio/vsiscanf.c
@@ -35,8 +35,7 @@
#ifndef _REENT_ONLY
int
-_DEFUN(vsiscanf, (str, fmt, ap),
- const char *str,
+vsiscanf (const char *str,
const char *fmt,
va_list ap)
{
@@ -46,8 +45,7 @@ _DEFUN(vsiscanf, (str, fmt, ap),
#endif /* !_REENT_ONLY */
int
-_DEFUN(_vsiscanf_r, (ptr, str, fmt, ap),
- struct _reent *ptr,
+_vsiscanf_r (struct _reent *ptr,
const char *str,
const char *fmt,
va_list ap)
diff --git a/newlib/libc/stdio/vsniprintf.c b/newlib/libc/stdio/vsniprintf.c
index e60f779ca..6036c8cb8 100644
--- a/newlib/libc/stdio/vsniprintf.c
+++ b/newlib/libc/stdio/vsniprintf.c
@@ -32,8 +32,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#ifndef _REENT_ONLY
int
-_DEFUN(vsniprintf, (str, size, fmt, ap),
- char *str,
+vsniprintf (char *str,
size_t size,
const char *fmt,
va_list ap)
@@ -44,8 +43,7 @@ _DEFUN(vsniprintf, (str, size, fmt, ap),
#endif /* !_REENT_ONLY */
int
-_DEFUN(_vsniprintf_r, (ptr, str, size, fmt, ap),
- struct _reent *ptr,
+_vsniprintf_r (struct _reent *ptr,
char *str,
size_t size,
const char *fmt,
diff --git a/newlib/libc/stdio/vsnprintf.c b/newlib/libc/stdio/vsnprintf.c
index dda45256a..02b5443bf 100644
--- a/newlib/libc/stdio/vsnprintf.c
+++ b/newlib/libc/stdio/vsnprintf.c
@@ -32,8 +32,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#ifndef _REENT_ONLY
int
-_DEFUN(vsnprintf, (str, size, fmt, ap),
- char *__restrict str,
+vsnprintf (char *__restrict str,
size_t size,
const char *__restrict fmt,
va_list ap)
@@ -50,8 +49,7 @@ _EXFUN(vsniprintf, (char *, size_t, const char *, __VALIST)
#endif /* !_REENT_ONLY */
int
-_DEFUN(_vsnprintf_r, (ptr, str, size, fmt, ap),
- struct _reent *ptr,
+_vsnprintf_r (struct _reent *ptr,
char *__restrict str,
size_t size,
const char *__restrict fmt,
diff --git a/newlib/libc/stdio/vsprintf.c b/newlib/libc/stdio/vsprintf.c
index 4940b974e..7344a3854 100644
--- a/newlib/libc/stdio/vsprintf.c
+++ b/newlib/libc/stdio/vsprintf.c
@@ -31,8 +31,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#ifndef _REENT_ONLY
int
-_DEFUN(vsprintf, (str, fmt, ap),
- char *__restrict str,
+vsprintf (char *__restrict str,
const char *__restrict fmt,
va_list ap)
{
@@ -48,8 +47,7 @@ _EXFUN(vsiprintf, (char *, const char *, __VALIST)
#endif /* !_REENT_ONLY */
int
-_DEFUN(_vsprintf_r, (ptr, str, fmt, ap),
- struct _reent *ptr,
+_vsprintf_r (struct _reent *ptr,
char *__restrict str,
const char *__restrict fmt,
va_list ap)
diff --git a/newlib/libc/stdio/vsscanf.c b/newlib/libc/stdio/vsscanf.c
index 87d4cd161..61c65cd5e 100644
--- a/newlib/libc/stdio/vsscanf.c
+++ b/newlib/libc/stdio/vsscanf.c
@@ -35,8 +35,7 @@
#ifndef _REENT_ONLY
int
-_DEFUN(vsscanf, (str, fmt, ap),
- const char *__restrict str,
+vsscanf (const char *__restrict str,
const char *__restrict fmt,
va_list ap)
{
@@ -52,8 +51,7 @@ _EXFUN(vsiscanf, (const char *, const char *, __VALIST)
#endif /* !_REENT_ONLY */
int
-_DEFUN(_vsscanf_r, (ptr, str, fmt, ap),
- struct _reent *ptr,
+_vsscanf_r (struct _reent *ptr,
const char *__restrict str,
const char *__restrict fmt,
va_list ap)
diff --git a/newlib/libc/stdio/vswprintf.c b/newlib/libc/stdio/vswprintf.c
index 9c9127cd6..5297a27cf 100644
--- a/newlib/libc/stdio/vswprintf.c
+++ b/newlib/libc/stdio/vswprintf.c
@@ -31,8 +31,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#include "local.h"
int
-_DEFUN(_vswprintf_r, (ptr, str, size, fmt, ap),
- struct _reent *ptr,
+_vswprintf_r (struct _reent *ptr,
wchar_t *str,
size_t size,
const wchar_t *fmt,
@@ -70,8 +69,7 @@ _DEFUN(_vswprintf_r, (ptr, str, size, fmt, ap),
#ifndef _REENT_ONLY
int
-_DEFUN(vswprintf, (str, size, fmt, ap),
- wchar_t *__restrict str,
+vswprintf (wchar_t *__restrict str,
size_t size,
const wchar_t *__restrict fmt,
va_list ap)
diff --git a/newlib/libc/stdio/vwprintf.c b/newlib/libc/stdio/vwprintf.c
index 28381363e..d1b7d4cd0 100644
--- a/newlib/libc/stdio/vwprintf.c
+++ b/newlib/libc/stdio/vwprintf.c
@@ -26,8 +26,7 @@
#ifndef _REENT_ONLY
int
-_DEFUN(vwprintf, (fmt, ap),
- const wchar_t *__restrict fmt,
+vwprintf (const wchar_t *__restrict fmt,
va_list ap)
{
struct _reent *reent = _REENT;
@@ -39,8 +38,7 @@ _DEFUN(vwprintf, (fmt, ap),
#endif /* !_REENT_ONLY */
int
-_DEFUN(_vwprintf_r, (ptr, fmt, ap),
- struct _reent *ptr,
+_vwprintf_r (struct _reent *ptr,
const wchar_t *fmt,
va_list ap)
{
diff --git a/newlib/libc/stdio/wbuf.c b/newlib/libc/stdio/wbuf.c
index 13578ea33..034d8ebcc 100644
--- a/newlib/libc/stdio/wbuf.c
+++ b/newlib/libc/stdio/wbuf.c
@@ -33,8 +33,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
*/
int
-_DEFUN(__swbuf_r, (ptr, c, fp),
- struct _reent *ptr,
+__swbuf_r (struct _reent *ptr,
register int c,
register FILE *fp)
{
@@ -88,8 +87,7 @@ _DEFUN(__swbuf_r, (ptr, c, fp),
required for backward compatibility with applications built against
earlier dynamically built newlib libraries. */
int
-_DEFUN(__swbuf, (c, fp),
- register int c,
+__swbuf (register int c,
register FILE *fp)
{
return __swbuf_r (_REENT, c, fp);
diff --git a/newlib/libc/stdio/wprintf.c b/newlib/libc/stdio/wprintf.c
index ef212d851..176b16a20 100644
--- a/newlib/libc/stdio/wprintf.c
+++ b/newlib/libc/stdio/wprintf.c
@@ -24,8 +24,7 @@
#include "local.h"
int
-_DEFUN(_wprintf_r, (ptr, fmt),
- struct _reent *ptr,
+_wprintf_r (struct _reent *ptr,
const wchar_t *fmt, ...)
{
int ret;
@@ -41,8 +40,7 @@ _DEFUN(_wprintf_r, (ptr, fmt),
#ifndef _REENT_ONLY
int
-_DEFUN(wprintf, (fmt),
- const wchar_t *__restrict fmt, ...)
+wprintf (const wchar_t *__restrict fmt, ...)
{
int ret;
va_list ap;
diff --git a/newlib/libc/stdio/wsetup.c b/newlib/libc/stdio/wsetup.c
index 72280d2df..5a4fc0ace 100644
--- a/newlib/libc/stdio/wsetup.c
+++ b/newlib/libc/stdio/wsetup.c
@@ -30,8 +30,7 @@
*/
int
-_DEFUN(__swsetup_r, (ptr, fp),
- struct _reent *ptr,
+__swsetup_r (struct _reent *ptr,
register FILE * fp)
{
/* Make sure stdio is set up. */
diff --git a/newlib/libc/stdio64/fdopen64.c b/newlib/libc/stdio64/fdopen64.c
index 3c8d4fa05..9d9645b36 100644
--- a/newlib/libc/stdio64/fdopen64.c
+++ b/newlib/libc/stdio64/fdopen64.c
@@ -35,8 +35,7 @@ File pointer or <<NULL>>, as for <<fopen>>.
extern int __sflags ();
FILE *
-_DEFUN (_fdopen64_r, (ptr, fd, mode),
- struct _reent *ptr,
+_fdopen64_r (struct _reent *ptr,
int fd,
const char *mode)
{
@@ -108,8 +107,7 @@ _DEFUN (_fdopen64_r, (ptr, fd, mode),
#ifndef _REENT_ONLY
FILE *
-_DEFUN (fdopen64, (fd, mode),
- int fd,
+fdopen64 (int fd,
const char *mode)
{
return _fdopen64_r (_REENT, fd, mode);
diff --git a/newlib/libc/stdio64/fgetpos64.c b/newlib/libc/stdio64/fgetpos64.c
index e2dd28914..52ead9d0d 100644
--- a/newlib/libc/stdio64/fgetpos64.c
+++ b/newlib/libc/stdio64/fgetpos64.c
@@ -45,8 +45,7 @@ No supporting OS subroutines are required.
#ifdef __LARGE64_FILES
int
-_DEFUN (_fgetpos64_r, (ptr, fp, pos),
- struct _reent * ptr,
+_fgetpos64_r (struct _reent * ptr,
FILE * fp,
_fpos64_t * pos)
{
@@ -62,8 +61,7 @@ _DEFUN (_fgetpos64_r, (ptr, fp, pos),
#ifndef _REENT_ONLY
int
-_DEFUN (fgetpos64, (fp, pos),
- FILE * fp,
+fgetpos64 (FILE * fp,
_fpos64_t * pos)
{
return _fgetpos64_r (_REENT, fp, pos);
diff --git a/newlib/libc/stdio64/fopen64.c b/newlib/libc/stdio64/fopen64.c
index 406afa190..8c8df9141 100644
--- a/newlib/libc/stdio64/fopen64.c
+++ b/newlib/libc/stdio64/fopen64.c
@@ -64,8 +64,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#ifdef __LARGE64_FILES
FILE *
-_DEFUN (_fopen64_r, (ptr, file, mode),
- struct _reent *ptr,
+_fopen64_r (struct _reent *ptr,
const char *file,
const char *mode)
{
@@ -117,8 +116,7 @@ _DEFUN (_fopen64_r, (ptr, file, mode),
#ifndef _REENT_ONLY
FILE *
-_DEFUN (fopen64, (file, mode),
- const char *file,
+fopen64 (const char *file,
const char *mode)
{
return _fopen64_r (_REENT, file, mode);
diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c
index d267899c6..17942b74a 100644
--- a/newlib/libc/stdio64/freopen64.c
+++ b/newlib/libc/stdio64/freopen64.c
@@ -75,8 +75,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifdef __LARGE64_FILES
FILE *
-_DEFUN (_freopen64_r, (ptr, file, mode, fp),
- struct _reent *ptr,
+_freopen64_r (struct _reent *ptr,
const char *file,
const char *mode,
register FILE *fp)
@@ -247,8 +246,7 @@ _DEFUN (_freopen64_r, (ptr, file, mode, fp),
#ifndef _REENT_ONLY
FILE *
-_DEFUN (freopen64, (file, mode, fp),
- const char *file,
+freopen64 (const char *file,
const char *mode,
register FILE *fp)
{
diff --git a/newlib/libc/stdio64/fseeko64.c b/newlib/libc/stdio64/fseeko64.c
index 8cd11fa67..085855d4b 100644
--- a/newlib/libc/stdio64/fseeko64.c
+++ b/newlib/libc/stdio64/fseeko64.c
@@ -85,8 +85,7 @@ Supporting OS subroutines required: <<close>>, <<fstat64>>, <<isatty>>,
*/
_off64_t
-_DEFUN (_fseeko64_r, (ptr, fp, offset, whence),
- struct _reent *ptr,
+_fseeko64_r (struct _reent *ptr,
register FILE *fp,
_off64_t offset,
int whence)
@@ -342,8 +341,7 @@ dumb:
#ifndef _REENT_ONLY
_off64_t
-_DEFUN (fseeko64, (fp, offset, whence),
- register FILE *fp,
+fseeko64 (register FILE *fp,
_off64_t offset,
int whence)
{
diff --git a/newlib/libc/stdio64/fsetpos64.c b/newlib/libc/stdio64/fsetpos64.c
index f5f6bdacf..254eb53d7 100644
--- a/newlib/libc/stdio64/fsetpos64.c
+++ b/newlib/libc/stdio64/fsetpos64.c
@@ -41,8 +41,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifdef __LARGE64_FILES
int
-_DEFUN (_fsetpos64_r, (ptr, iop, pos),
- struct _reent *ptr,
+_fsetpos64_r (struct _reent *ptr,
FILE * iop,
const _fpos64_t * pos)
{
@@ -56,8 +55,7 @@ _DEFUN (_fsetpos64_r, (ptr, iop, pos),
#ifndef _REENT_ONLY
int
-_DEFUN (fsetpos64, (iop, pos),
- FILE * iop,
+fsetpos64 (FILE * iop,
const _fpos64_t * pos)
{
return _fsetpos64_r (_REENT, iop, pos);
diff --git a/newlib/libc/stdio64/ftello64.c b/newlib/libc/stdio64/ftello64.c
index 3c4663ba4..c1179348a 100644
--- a/newlib/libc/stdio64/ftello64.c
+++ b/newlib/libc/stdio64/ftello64.c
@@ -76,8 +76,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#ifdef __LARGE64_FILES
_off64_t
-_DEFUN (_ftello64_r, (ptr, fp),
- struct _reent *ptr,
+_ftello64_r (struct _reent *ptr,
register FILE * fp)
{
_fpos64_t pos;
@@ -144,8 +143,7 @@ _DEFUN (_ftello64_r, (ptr, fp),
#ifndef _REENT_ONLY
_off64_t
-_DEFUN (ftello64, (fp),
- register FILE * fp)
+ftello64 (register FILE * fp)
{
return _ftello64_r (_REENT, fp);
}
diff --git a/newlib/libc/stdio64/stdio64.c b/newlib/libc/stdio64/stdio64.c
index 813b919bf..8e5efc8b0 100644
--- a/newlib/libc/stdio64/stdio64.c
+++ b/newlib/libc/stdio64/stdio64.c
@@ -26,8 +26,7 @@
#ifdef __LARGE64_FILES
_fpos64_t
-_DEFUN(__sseek64, (ptr, cookie, offset, whence),
- struct _reent *ptr,
+__sseek64 (struct _reent *ptr,
void *cookie,
_fpos64_t offset,
int whence)
@@ -47,8 +46,7 @@ _DEFUN(__sseek64, (ptr, cookie, offset, whence),
}
_READ_WRITE_RETURN_TYPE
-_DEFUN(__swrite64, (ptr, cookie, buf, n),
- struct _reent *ptr,
+__swrite64 (struct _reent *ptr,
void *cookie,
char const *buf,
_READ_WRITE_BUFSIZE_TYPE n)
diff --git a/newlib/libc/stdio64/tmpfile64.c b/newlib/libc/stdio64/tmpfile64.c
index 2012417fb..18a38d65c 100644
--- a/newlib/libc/stdio64/tmpfile64.c
+++ b/newlib/libc/stdio64/tmpfile64.c
@@ -53,8 +53,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<getpid>>,
#ifdef __LARGE64_FILES
FILE *
-_DEFUN (_tmpfile64_r, (ptr),
- struct _reent *ptr)
+_tmpfile64_r (struct _reent *ptr)
{
FILE *fp;
int e;
diff --git a/newlib/libc/stdlib/_Exit.c b/newlib/libc/stdlib/_Exit.c
index b07559acb..8e205a0c3 100644
--- a/newlib/libc/stdlib/_Exit.c
+++ b/newlib/libc/stdlib/_Exit.c
@@ -34,8 +34,7 @@ Supporting OS subroutines required: <<_exit>>.
#include <reent.h>
void
-_DEFUN (_Exit, (code),
- int code)
+_Exit (int code)
{
_exit (code);
}
diff --git a/newlib/libc/stdlib/__adjust.c b/newlib/libc/stdlib/__adjust.c
index 7627cc7ac..4c478f30b 100644
--- a/newlib/libc/stdlib/__adjust.c
+++ b/newlib/libc/stdlib/__adjust.c
@@ -9,8 +9,7 @@
#define abs(x) (((x) < 0) ? -(x) : (x))
double
-_DEFUN (__adjust, (ptr, acc, dexp, sign),
- struct _reent *ptr,
+__adjust (struct _reent *ptr,
double *acc,
int dexp,
int sign)
diff --git a/newlib/libc/stdlib/__atexit.c b/newlib/libc/stdlib/__atexit.c
index cb4a2682e..18e47dc95 100644
--- a/newlib/libc/stdlib/__atexit.c
+++ b/newlib/libc/stdlib/__atexit.c
@@ -63,9 +63,7 @@ static struct _atexit _global_atexit0 = _ATEXIT_INIT;
*/
int
-_DEFUN (__register_exitproc,
- (type, fn, arg, d),
- int type,
+__register_exitproc (int type,
void (*fn) (void),
void *arg,
void *d)
diff --git a/newlib/libc/stdlib/__call_atexit.c b/newlib/libc/stdlib/__call_atexit.c
index ad70fcd33..d8e72993e 100644
--- a/newlib/libc/stdlib/__call_atexit.c
+++ b/newlib/libc/stdlib/__call_atexit.c
@@ -65,8 +65,7 @@ register_fini(void)
*/
void
-_DEFUN (__call_exitprocs, (code, d),
- int code, void *d)
+__call_exitprocs (int code, void *d)
{
register struct _atexit *p;
struct _atexit **lastp;
diff --git a/newlib/libc/stdlib/__exp10.c b/newlib/libc/stdlib/__exp10.c
index 1ff81a680..cf223742b 100644
--- a/newlib/libc/stdlib/__exp10.c
+++ b/newlib/libc/stdlib/__exp10.c
@@ -6,8 +6,7 @@
#include "std.h"
double
-_DEFUN (__exp10, (x),
- unsigned x)
+__exp10 (unsigned x)
{
static const double powtab[] =
{1.0,
diff --git a/newlib/libc/stdlib/__ten_mu.c b/newlib/libc/stdlib/__ten_mu.c
index a7fe70caf..25af8d0c7 100644
--- a/newlib/libc/stdlib/__ten_mu.c
+++ b/newlib/libc/stdlib/__ten_mu.c
@@ -9,8 +9,7 @@
#include "std.h"
int
-_DEFUN (__ten_mul, (acc, digit),
- double *acc,
+__ten_mul (double *acc,
int digit)
{
/*
diff --git a/newlib/libc/stdlib/a64l.c b/newlib/libc/stdlib/a64l.c
index 8d68ed0e9..dcac2e050 100644
--- a/newlib/libc/stdlib/a64l.c
+++ b/newlib/libc/stdlib/a64l.c
@@ -56,8 +56,7 @@ Supporting OS subroutines required: None.
#include <limits.h>
long
-_DEFUN (a64l, (input),
- const char *input)
+a64l (const char *input)
{
const char *ptr;
char ch;
diff --git a/newlib/libc/stdlib/abs.c b/newlib/libc/stdlib/abs.c
index d347265fa..85a3fecd8 100644
--- a/newlib/libc/stdlib/abs.c
+++ b/newlib/libc/stdlib/abs.c
@@ -32,7 +32,7 @@ No supporting OS subroutines are required.
#include <stdlib.h>
int
-_DEFUN (abs, (i), int i)
+abs (int i)
{
return (i < 0) ? -i : i;
}
diff --git a/newlib/libc/stdlib/assert.c b/newlib/libc/stdlib/assert.c
index ba5b46197..46ac92b8c 100644
--- a/newlib/libc/stdlib/assert.c
+++ b/newlib/libc/stdlib/assert.c
@@ -50,8 +50,7 @@ Supporting OS subroutines required (only if enabled): <<close>>, <<fstat>>,
#ifndef HAVE_ASSERT_FUNC
/* func can be NULL, in which case no function information is given. */
void
-_DEFUN (__assert_func, (file, line, func, failedexpr),
- const char *file,
+__assert_func (const char *file,
int line,
const char *func,
const char *failedexpr)
@@ -66,8 +65,7 @@ _DEFUN (__assert_func, (file, line, func, failedexpr),
#endif /* HAVE_ASSERT_FUNC */
void
-_DEFUN (__assert, (file, line, failedexpr),
- const char *file,
+__assert (const char *file,
int line,
const char *failedexpr)
{
diff --git a/newlib/libc/stdlib/atexit.c b/newlib/libc/stdlib/atexit.c
index 1710aff14..1d300bd0f 100644
--- a/newlib/libc/stdlib/atexit.c
+++ b/newlib/libc/stdlib/atexit.c
@@ -53,9 +53,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
*/
int
-_DEFUN (atexit,
- (fn),
- void _EXFNPTR(fn, (void)))
+atexit (void _EXFNPTR(fn, (void)))
{
return __register_exitproc (__et_atexit, fn, NULL, NULL);
}
diff --git a/newlib/libc/stdlib/atof.c b/newlib/libc/stdlib/atof.c
index 7dfbd9c55..17ba0fa52 100644
--- a/newlib/libc/stdlib/atof.c
+++ b/newlib/libc/stdlib/atof.c
@@ -57,8 +57,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include <_ansi.h>
double
-_DEFUN (atof, (s),
- const char *s)
+atof (const char *s)
{
return strtod (s, NULL);
}
diff --git a/newlib/libc/stdlib/atoff.c b/newlib/libc/stdlib/atoff.c
index 2966254be..e25ff2917 100644
--- a/newlib/libc/stdlib/atoff.c
+++ b/newlib/libc/stdlib/atoff.c
@@ -2,8 +2,7 @@
#include <_ansi.h>
float
-_DEFUN (atoff, (s),
- const char *s)
+atoff (const char *s)
{
return strtof (s, NULL);
}
diff --git a/newlib/libc/stdlib/atoi.c b/newlib/libc/stdlib/atoi.c
index 83ad24177..4da53e80a 100644
--- a/newlib/libc/stdlib/atoi.c
+++ b/newlib/libc/stdlib/atoi.c
@@ -47,16 +47,14 @@ No supporting OS subroutines are required.
#ifndef _REENT_ONLY
int
-_DEFUN (atoi, (s),
- const char *s)
+atoi (const char *s)
{
return (int) strtol (s, NULL, 10);
}
#endif /* !_REENT_ONLY */
int
-_DEFUN (_atoi_r, (s),
- struct _reent *ptr,
+_atoi_r (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 cad512fbc..a5c8ee9f4 100644
--- a/newlib/libc/stdlib/atol.c
+++ b/newlib/libc/stdlib/atol.c
@@ -7,14 +7,14 @@
#ifndef _REENT_ONLY
long
-_DEFUN (atol, (s), const char *s)
+atol (const char *s)
{
return strtol (s, NULL, 10);
}
#endif /* !_REENT_ONLY */
long
-_DEFUN (_atol_r, (ptr, s), struct _reent *ptr, const char *s)
+_atol_r (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 e853f25eb..a8c56fe16 100644
--- a/newlib/libc/stdlib/atoll.c
+++ b/newlib/libc/stdlib/atoll.c
@@ -69,16 +69,14 @@ No supporting OS subroutines are required.
#ifndef _REENT_ONLY
long long
-_DEFUN(atoll, (str),
- const char *str)
+atoll (const char *str)
{
return strtoll(str, (char **)NULL, 10);
}
#endif /* !_REENT_ONLY */
long long
-_DEFUN(_atoll_r, (ptr, str),
- struct _reent *ptr,
+_atoll_r (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 f853f4f3c..208e27eb1 100644
--- a/newlib/libc/stdlib/calloc.c
+++ b/newlib/libc/stdlib/calloc.c
@@ -46,8 +46,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#ifndef _REENT_ONLY
void *
-_DEFUN (calloc, (n, size),
- size_t n,
+calloc (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 096add4fa..ae2d21a60 100644
--- a/newlib/libc/stdlib/cxa_atexit.c
+++ b/newlib/libc/stdlib/cxa_atexit.c
@@ -22,9 +22,7 @@ const void * const __cxa_atexit_dummy = &__on_exit_args;
*/
int
-_DEFUN (__cxa_atexit,
- (fn, arg, d),
- void (*fn) (void *),
+__cxa_atexit (void (*fn) (void *),
void *arg,
void *d)
{
diff --git a/newlib/libc/stdlib/cxa_finalize.c b/newlib/libc/stdlib/cxa_finalize.c
index 17d0526a7..467532881 100644
--- a/newlib/libc/stdlib/cxa_finalize.c
+++ b/newlib/libc/stdlib/cxa_finalize.c
@@ -13,8 +13,7 @@
*/
void
-_DEFUN (__cxa_finalize, (d),
- void * d)
+__cxa_finalize (void * d)
{
__call_exitprocs (0, d);
}
diff --git a/newlib/libc/stdlib/div.c b/newlib/libc/stdlib/div.c
index 4d2ffee48..20ad7b865 100644
--- a/newlib/libc/stdlib/div.c
+++ b/newlib/libc/stdlib/div.c
@@ -81,8 +81,7 @@ No supporting OS subroutines are required.
#include <stdlib.h> /* div_t */
div_t
-_DEFUN (div, (num, denom),
- int num,
+div (int num,
int denom)
{
div_t r;
diff --git a/newlib/libc/stdlib/drand48.c b/newlib/libc/stdlib/drand48.c
index 6c4dca1ed..061689448 100644
--- a/newlib/libc/stdlib/drand48.c
+++ b/newlib/libc/stdlib/drand48.c
@@ -14,8 +14,7 @@
#include "rand48.h"
double
-_DEFUN (_drand48_r, (r),
- struct _reent *r)
+_drand48_r (struct _reent *r)
{
_REENT_CHECK_RAND48(r);
return _erand48_r(r, __rand48_seed);
diff --git a/newlib/libc/stdlib/dtoa.c b/newlib/libc/stdlib/dtoa.c
index 3b8976435..c38f37afd 100644
--- a/newlib/libc/stdlib/dtoa.c
+++ b/newlib/libc/stdlib/dtoa.c
@@ -33,9 +33,7 @@
#include "mprec.h"
static int
-_DEFUN (quorem,
- (b, S),
- _Bigint * b, _Bigint * S)
+quorem (_Bigint * b, _Bigint * S)
{
int n;
__Long borrow, y;
@@ -177,9 +175,7 @@ _DEFUN (quorem,
char *
-_DEFUN (_dtoa_r,
- (ptr, _d, mode, ndigits, decpt, sign, rve),
- struct _reent *ptr,
+_dtoa_r (struct _reent *ptr,
double _d,
int mode,
int ndigits,
diff --git a/newlib/libc/stdlib/dtoastub.c b/newlib/libc/stdlib/dtoastub.c
index a857c2452..d1c8a6756 100644
--- a/newlib/libc/stdlib/dtoastub.c
+++ b/newlib/libc/stdlib/dtoastub.c
@@ -8,9 +8,7 @@
#ifndef _REENT_ONLY
char *
-_DEFUN (__dtoa,
- (d, mode, ndigits, decpt, sign, rve),
- double d,
+__dtoa (double d,
int mode,
int ndigits,
int *decpt,
diff --git a/newlib/libc/stdlib/ecvtbuf.c b/newlib/libc/stdlib/ecvtbuf.c
index 2326f55ca..e3d7b55d8 100644
--- a/newlib/libc/stdlib/ecvtbuf.c
+++ b/newlib/libc/stdlib/ecvtbuf.c
@@ -58,8 +58,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include "local.h"
static void
-_DEFUN (print_f, (ptr, buf, invalue, ndigit, type, dot, mode),
- struct _reent *ptr,
+print_f (struct _reent *ptr,
char *buf,
double invalue,
int ndigit,
@@ -126,8 +125,7 @@ _DEFUN (print_f, (ptr, buf, invalue, ndigit, type, dot, mode),
WIDTH is the number of digits of precision after the decimal point. */
static void
-_DEFUN (print_e, (ptr, buf, invalue, width, type, dot),
- struct _reent *ptr,
+print_e (struct _reent *ptr,
char *buf,
double invalue,
int width,
@@ -209,8 +207,7 @@ _DEFUN (print_e, (ptr, buf, invalue, width, type, dot),
support ecvt and fcvt, which aren't ANSI anyway. */
char *
-_DEFUN (fcvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf),
- double invalue,
+fcvtbuf (double invalue,
int ndigit,
int *decpt,
int *sign,
@@ -266,8 +263,7 @@ _DEFUN (fcvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf),
}
char *
-_DEFUN (ecvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf),
- double invalue,
+ecvtbuf (double invalue,
int ndigit,
int *decpt,
int *sign,
@@ -317,8 +313,7 @@ _DEFUN (ecvtbuf, (invalue, ndigit, decpt, sign, fcvt_buf),
#endif
char *
-_DEFUN (_gcvt, (ptr, invalue, ndigit, buf, type, dot),
- struct _reent *ptr,
+_gcvt (struct _reent *ptr,
double invalue,
int ndigit,
char *buf,
@@ -425,8 +420,7 @@ _DEFUN (_gcvt, (ptr, invalue, ndigit, buf, type, dot),
}
char *
-_DEFUN (_dcvt, (ptr, buffer, invalue, precision, width, type, dot),
- struct _reent *ptr,
+_dcvt (struct _reent *ptr,
char *buffer,
double invalue,
int precision,
diff --git a/newlib/libc/stdlib/efgcvt.c b/newlib/libc/stdlib/efgcvt.c
index e354bb170..9314bf361 100644
--- a/newlib/libc/stdlib/efgcvt.c
+++ b/newlib/libc/stdlib/efgcvt.c
@@ -103,8 +103,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include "local.h"
char *
-_DEFUN (fcvt, (d, ndigit, decpt, sign),
- double d,
+fcvt (double d,
int ndigit,
int *decpt,
int *sign)
@@ -113,8 +112,7 @@ _DEFUN (fcvt, (d, ndigit, decpt, sign),
}
char *
-_DEFUN (fcvtf, (d, ndigit, decpt, sign),
- float d,
+fcvtf (float d,
int ndigit,
int *decpt,
int *sign)
@@ -124,8 +122,7 @@ _DEFUN (fcvtf, (d, ndigit, decpt, sign),
char *
-_DEFUN (gcvtf, (d, ndigit, buf),
- float d,
+gcvtf (float d,
int ndigit,
char *buf)
{
@@ -135,8 +132,7 @@ _DEFUN (gcvtf, (d, ndigit, buf),
char *
-_DEFUN (ecvt, (d, ndigit, decpt, sign),
- double d,
+ecvt (double d,
int ndigit,
int *decpt,
int *sign)
@@ -145,8 +141,7 @@ _DEFUN (ecvt, (d, ndigit, decpt, sign),
}
char *
-_DEFUN (ecvtf, (d, ndigit, decpt, sign),
- float d,
+ecvtf (float d,
int ndigit,
int *decpt,
int *sign)
@@ -156,8 +151,7 @@ _DEFUN (ecvtf, (d, ndigit, decpt, sign),
char *
-_DEFUN (gcvt, (d, ndigit, buf),
- double d,
+gcvt (double d,
int ndigit,
char *buf)
{
diff --git a/newlib/libc/stdlib/erand48.c b/newlib/libc/stdlib/erand48.c
index a62ff345a..1be4a953e 100644
--- a/newlib/libc/stdlib/erand48.c
+++ b/newlib/libc/stdlib/erand48.c
@@ -14,8 +14,7 @@
#include "rand48.h"
double
-_DEFUN (_erand48_r, (r, xseed),
- struct _reent *r,
+_erand48_r (struct _reent *r,
unsigned short xseed[3])
{
__dorand48(r, xseed);
@@ -26,8 +25,7 @@ _DEFUN (_erand48_r, (r, xseed),
#ifndef _REENT_ONLY
double
-_DEFUN (erand48, (xseed),
- unsigned short xseed[3])
+erand48 (unsigned short xseed[3])
{
return _erand48_r (_REENT, xseed);
}
diff --git a/newlib/libc/stdlib/exit.c b/newlib/libc/stdlib/exit.c
index 8fa949081..95108ade6 100644
--- a/newlib/libc/stdlib/exit.c
+++ b/newlib/libc/stdlib/exit.c
@@ -50,8 +50,7 @@ Supporting OS subroutines required: <<_exit>>.
*/
void
-_DEFUN (exit, (code),
- int code)
+exit (int code)
{
#ifdef _LITE_EXIT
/* Refer to comments in __atexit.c for more details of lite exit. */
diff --git a/newlib/libc/stdlib/gdtoa-gethex.c b/newlib/libc/stdlib/gdtoa-gethex.c
index 18d9cc172..939e0dd8d 100644
--- a/newlib/libc/stdlib/gdtoa-gethex.c
+++ b/newlib/libc/stdlib/gdtoa-gethex.c
@@ -59,8 +59,7 @@ const unsigned char __hexdig[256]=
};
#else /* !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG) */
unsigned char
-_DEFUN (__hexdig_fun, (c),
- unsigned char c)
+__hexdig_fun (unsigned char c)
{
if(c>='0' && c<='9') return c-'0'+0x10;
else if(c>='a' && c<='f') return c-'a'+0x10+10;
@@ -70,8 +69,7 @@ _DEFUN (__hexdig_fun, (c),
#endif /* !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__) && !defined(_SMALL_HEXDIG) */
static void
-_DEFUN(rshift, (b, k),
- _Bigint *b,
+rshift (_Bigint *b,
int k)
{
__ULong *x, *x1, *xe, y;
@@ -101,8 +99,7 @@ _DEFUN(rshift, (b, k),
}
static _Bigint *
-_DEFUN (increment, (ptr, b),
- struct _reent *ptr,
+increment (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 fa98646f6..a17e5a699 100644
--- a/newlib/libc/stdlib/gdtoa-hexnan.c
+++ b/newlib/libc/stdlib/gdtoa-hexnan.c
@@ -45,8 +45,7 @@ THIS SOFTWARE.
#ifdef INFNAN_CHECK
int
-_DEFUN (match, (sp, t),
- const char **sp,
+match (const char **sp,
char *t)
{
int c, d;
@@ -63,8 +62,7 @@ _DEFUN (match, (sp, t),
}
static void
-_DEFUN (L_shift, (x, x1, i),
- __ULong *x,
+L_shift (__ULong *x,
__ULong *x1,
int i)
{
@@ -80,8 +78,7 @@ _DEFUN (L_shift, (x, x1, i),
}
int
-_DEFUN (hexnan, (sp, fpi, x0),
- const char **sp,
+hexnan (const char **sp,
const FPI *fpi,
__ULong *x0)
{
diff --git a/newlib/libc/stdlib/getenv.c b/newlib/libc/stdlib/getenv.c
index 973a54732..107376bcd 100644
--- a/newlib/libc/stdlib/getenv.c
+++ b/newlib/libc/stdlib/getenv.c
@@ -64,8 +64,7 @@ variables vary from one system to another.
*/
char *
-_DEFUN (_findenv, (name, offset),
- register const char *name,
+_findenv (register const char *name,
int *offset)
{
return _findenv_r (_REENT, name, offset);
@@ -77,8 +76,7 @@ _DEFUN (_findenv, (name, offset),
*/
char *
-_DEFUN (getenv, (name),
- const char *name)
+getenv (const char *name)
{
int offset;
diff --git a/newlib/libc/stdlib/getenv_r.c b/newlib/libc/stdlib/getenv_r.c
index 315d283ea..aac11367c 100644
--- a/newlib/libc/stdlib/getenv_r.c
+++ b/newlib/libc/stdlib/getenv_r.c
@@ -74,8 +74,7 @@ static char ***p_environ = &environ;
*/
char *
-_DEFUN (_findenv_r, (reent_ptr, name, offset),
- struct _reent *reent_ptr,
+_findenv_r (struct _reent *reent_ptr,
register const char *name,
int *offset)
{
@@ -119,8 +118,7 @@ _DEFUN (_findenv_r, (reent_ptr, name, offset),
*/
char *
-_DEFUN (_getenv_r, (reent_ptr, name),
- struct _reent *reent_ptr,
+_getenv_r (struct _reent *reent_ptr,
const char *name)
{
int offset;
diff --git a/newlib/libc/stdlib/itoa.c b/newlib/libc/stdlib/itoa.c
index 25e6c3516..7a7daf0ce 100644
--- a/newlib/libc/stdlib/itoa.c
+++ b/newlib/libc/stdlib/itoa.c
@@ -30,8 +30,7 @@ No supporting OS subroutine calls are required.
#include <stdlib.h>
char *
-_DEFUN (__itoa, (value, str, base),
- int value,
+__itoa (int value,
char *str,
int base)
{
@@ -60,8 +59,7 @@ _DEFUN (__itoa, (value, str, base),
}
char *
-_DEFUN (itoa, (value, str, base),
- int value,
+itoa (int value,
char *str,
int base)
{
diff --git a/newlib/libc/stdlib/jrand48.c b/newlib/libc/stdlib/jrand48.c
index 4f8c12bd1..185e0da90 100644
--- a/newlib/libc/stdlib/jrand48.c
+++ b/newlib/libc/stdlib/jrand48.c
@@ -14,8 +14,7 @@
#include "rand48.h"
long
-_DEFUN (_jrand48_r, (r, xseed),
- struct _reent *r,
+_jrand48_r (struct _reent *r,
unsigned short xseed[3])
{
__dorand48(r, xseed);
@@ -24,8 +23,7 @@ _DEFUN (_jrand48_r, (r, xseed),
#ifndef _REENT_ONLY
long
-_DEFUN (jrand48, (xseed),
- unsigned short xseed[3])
+jrand48 (unsigned short xseed[3])
{
return _jrand48_r (_REENT, xseed);
}
diff --git a/newlib/libc/stdlib/l64a.c b/newlib/libc/stdlib/l64a.c
index 607842723..45282e32d 100644
--- a/newlib/libc/stdlib/l64a.c
+++ b/newlib/libc/stdlib/l64a.c
@@ -27,15 +27,13 @@
static const char R64_ARRAY[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
char *
-_DEFUN (l64a, (value),
- long value)
+l64a (long value)
{
return _l64a_r (_REENT, value);
}
char *
-_DEFUN (_l64a_r, (rptr, value),
- struct _reent *rptr,
+_l64a_r (struct _reent *rptr,
long value)
{
char *ptr;
diff --git a/newlib/libc/stdlib/labs.c b/newlib/libc/stdlib/labs.c
index 712f56c37..f6761d0cc 100644
--- a/newlib/libc/stdlib/labs.c
+++ b/newlib/libc/stdlib/labs.c
@@ -33,8 +33,7 @@ No supporting OS subroutine calls are required.
#include <stdlib.h>
long
-_DEFUN (labs, (x),
- long x)
+labs (long x)
{
if (x < 0)
{
diff --git a/newlib/libc/stdlib/lcong48.c b/newlib/libc/stdlib/lcong48.c
index a16d49ecc..78e9e5746 100644
--- a/newlib/libc/stdlib/lcong48.c
+++ b/newlib/libc/stdlib/lcong48.c
@@ -14,8 +14,7 @@
#include "rand48.h"
void
-_DEFUN (_lcong48_r, (r, p),
- struct _reent *r,
+_lcong48_r (struct _reent *r,
unsigned short p[7])
{
_REENT_CHECK_RAND48(r);
@@ -30,8 +29,7 @@ _DEFUN (_lcong48_r, (r, p),
#ifndef _REENT_ONLY
void
-_DEFUN (lcong48, (p),
- unsigned short p[7])
+lcong48 (unsigned short p[7])
{
_lcong48_r (_REENT, p);
}
diff --git a/newlib/libc/stdlib/ldiv.c b/newlib/libc/stdlib/ldiv.c
index 00bca6286..294cc8602 100644
--- a/newlib/libc/stdlib/ldiv.c
+++ b/newlib/libc/stdlib/ldiv.c
@@ -82,8 +82,7 @@ No supporting OS subroutines are required.
#include <stdlib.h> /* ldiv_t */
ldiv_t
-_DEFUN (ldiv, (num, denom),
- long num,
+ldiv (long num,
long denom)
{
ldiv_t r;
diff --git a/newlib/libc/stdlib/llabs.c b/newlib/libc/stdlib/llabs.c
index c2a561c38..a020deadf 100644
--- a/newlib/libc/stdlib/llabs.c
+++ b/newlib/libc/stdlib/llabs.c
@@ -54,8 +54,7 @@ No supporting OS subroutines are required.
#include <stdlib.h>
long long
-_DEFUN(llabs, (j),
- long long j)
+llabs (long long j)
{
return (j < 0 ? -j : j);
}
diff --git a/newlib/libc/stdlib/lldiv.c b/newlib/libc/stdlib/lldiv.c
index 8433e76bd..2dadf0e1e 100644
--- a/newlib/libc/stdlib/lldiv.c
+++ b/newlib/libc/stdlib/lldiv.c
@@ -94,8 +94,7 @@ No supporting OS subroutines are required.
* subtract denom from r.rem.
*/
lldiv_t
-_DEFUN (lldiv, (number, denom),
- long long numer, long long denom)
+lldiv (long long numer, long long denom)
{
lldiv_t retval;
diff --git a/newlib/libc/stdlib/lrand48.c b/newlib/libc/stdlib/lrand48.c
index bb3289c83..a28284e61 100644
--- a/newlib/libc/stdlib/lrand48.c
+++ b/newlib/libc/stdlib/lrand48.c
@@ -14,8 +14,7 @@
#include "rand48.h"
long
-_DEFUN (_lrand48_r, (r),
- struct _reent *r)
+_lrand48_r (struct _reent *r)
{
_REENT_CHECK_RAND48(r);
__dorand48(r, __rand48_seed);
diff --git a/newlib/libc/stdlib/malign.c b/newlib/libc/stdlib/malign.c
index e7d56bb51..480060c43 100644
--- a/newlib/libc/stdlib/malign.c
+++ b/newlib/libc/stdlib/malign.c
@@ -9,8 +9,7 @@
#ifndef _REENT_ONLY
void *
-_DEFUN (memalign, (align, nbytes),
- size_t align,
+memalign (size_t align,
size_t nbytes)
{
return _memalign_r (_REENT, align, nbytes);
diff --git a/newlib/libc/stdlib/malloc.c b/newlib/libc/stdlib/malloc.c
index 5acaa85d3..f5ac29208 100644
--- a/newlib/libc/stdlib/malloc.c
+++ b/newlib/libc/stdlib/malloc.c
@@ -159,15 +159,13 @@ Supporting OS subroutines required: <<sbrk>>. */
#ifndef _REENT_ONLY
void *
-_DEFUN (malloc, (nbytes),
- size_t nbytes) /* get a block */
+malloc (size_t nbytes) /* get a block */
{
return _malloc_r (_REENT, nbytes);
}
void
-_DEFUN (free, (aptr),
- void *aptr)
+free (void *aptr)
{
_free_r (_REENT, aptr);
}
diff --git a/newlib/libc/stdlib/mblen.c b/newlib/libc/stdlib/mblen.c
index 3ea91f4ba..3753d3673 100644
--- a/newlib/libc/stdlib/mblen.c
+++ b/newlib/libc/stdlib/mblen.c
@@ -43,8 +43,7 @@ effects vary with the locale.
#include "local.h"
int
-_DEFUN (mblen, (s, n),
- const char *s,
+mblen (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 1456ceae2..ff1737002 100644
--- a/newlib/libc/stdlib/mblen_r.c
+++ b/newlib/libc/stdlib/mblen_r.c
@@ -41,8 +41,7 @@ effects vary with the locale.
#include "local.h"
int
-_DEFUN (_mblen_r, (r, s, n, state),
- struct _reent *r,
+_mblen_r (struct _reent *r,
const char *s,
size_t n,
mbstate_t *state)
diff --git a/newlib/libc/stdlib/mbrtowc.c b/newlib/libc/stdlib/mbrtowc.c
index 4ca2143cf..65284a0eb 100644
--- a/newlib/libc/stdlib/mbrtowc.c
+++ b/newlib/libc/stdlib/mbrtowc.c
@@ -8,8 +8,7 @@
#include "local.h"
size_t
-_DEFUN (_mbrtowc_r, (ptr, pwc, s, n, ps),
- struct _reent *ptr,
+_mbrtowc_r (struct _reent *ptr,
wchar_t *pwc,
const char *s,
size_t n,
@@ -42,8 +41,7 @@ _DEFUN (_mbrtowc_r, (ptr, pwc, s, n, ps),
#ifndef _REENT_ONLY
size_t
-_DEFUN (mbrtowc, (pwc, s, n, ps),
- wchar_t *__restrict pwc,
+mbrtowc (wchar_t *__restrict pwc,
const char *__restrict s,
size_t n,
mbstate_t *__restrict ps)
diff --git a/newlib/libc/stdlib/mbsnrtowcs.c b/newlib/libc/stdlib/mbsnrtowcs.c
index 206a0623e..d3ce25084 100644
--- a/newlib/libc/stdlib/mbsnrtowcs.c
+++ b/newlib/libc/stdlib/mbsnrtowcs.c
@@ -71,8 +71,7 @@ PORTABILITY
#include <errno.h>
size_t
-_DEFUN (_mbsnrtowcs_r, (r, dst, src, nms, len, ps),
- struct _reent *r,
+_mbsnrtowcs_r (struct _reent *r,
wchar_t *dst,
const char **src,
size_t nms,
@@ -137,8 +136,7 @@ _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,
+mbsnrtowcs (wchar_t *__restrict dst,
const char **__restrict src,
size_t nms,
size_t len,
diff --git a/newlib/libc/stdlib/mbsrtowcs.c b/newlib/libc/stdlib/mbsrtowcs.c
index 48d36d028..82589c606 100644
--- a/newlib/libc/stdlib/mbsrtowcs.c
+++ b/newlib/libc/stdlib/mbsrtowcs.c
@@ -8,8 +8,7 @@
#include <errno.h>
size_t
-_DEFUN (_mbsrtowcs_r, (r, dst, src, len, ps),
- struct _reent *r,
+_mbsrtowcs_r (struct _reent *r,
wchar_t *dst,
const char **src,
size_t len,
@@ -20,8 +19,7 @@ _DEFUN (_mbsrtowcs_r, (r, dst, src, len, ps),
#ifndef _REENT_ONLY
size_t
-_DEFUN (mbsrtowcs, (dst, src, len, ps),
- wchar_t *__restrict dst,
+mbsrtowcs (wchar_t *__restrict dst,
const char **__restrict src,
size_t len,
mbstate_t *__restrict ps)
diff --git a/newlib/libc/stdlib/mbstowcs.c b/newlib/libc/stdlib/mbstowcs.c
index 41ad7b67a..253059cf8 100644
--- a/newlib/libc/stdlib/mbstowcs.c
+++ b/newlib/libc/stdlib/mbstowcs.c
@@ -47,8 +47,7 @@ effects vary with the locale.
#include <wchar.h>
size_t
-_DEFUN (mbstowcs, (pwcs, s, n),
- wchar_t *__restrict pwcs,
+mbstowcs (wchar_t *__restrict pwcs,
const char *__restrict s,
size_t n)
{
diff --git a/newlib/libc/stdlib/mbstowcs_r.c b/newlib/libc/stdlib/mbstowcs_r.c
index 7c95e4aba..43aea2cdf 100644
--- a/newlib/libc/stdlib/mbstowcs_r.c
+++ b/newlib/libc/stdlib/mbstowcs_r.c
@@ -3,8 +3,7 @@
#include "local.h"
size_t
-_DEFUN (_mbstowcs_r, (reent, pwcs, s, n, state),
- struct _reent *r,
+_mbstowcs_r (struct _reent *r,
wchar_t *__restrict pwcs,
const char *__restrict s,
size_t n,
diff --git a/newlib/libc/stdlib/mbtowc.c b/newlib/libc/stdlib/mbtowc.c
index 182884aab..2dc413f2d 100644
--- a/newlib/libc/stdlib/mbtowc.c
+++ b/newlib/libc/stdlib/mbtowc.c
@@ -50,8 +50,7 @@ effects vary with the locale.
#include "local.h"
int
-_DEFUN (mbtowc, (pwc, s, n),
- wchar_t *__restrict pwc,
+mbtowc (wchar_t *__restrict pwc,
const char *__restrict s,
size_t n)
{
diff --git a/newlib/libc/stdlib/mbtowc_r.c b/newlib/libc/stdlib/mbtowc_r.c
index cbc534a7b..920a7ea3c 100644
--- a/newlib/libc/stdlib/mbtowc_r.c
+++ b/newlib/libc/stdlib/mbtowc_r.c
@@ -8,8 +8,7 @@
#include "local.h"
int
-_DEFUN (_mbtowc_r, (r, pwc, s, n, state),
- struct _reent *r,
+_mbtowc_r (struct _reent *r,
wchar_t *__restrict pwc,
const char *__restrict s,
size_t n,
@@ -19,8 +18,7 @@ _DEFUN (_mbtowc_r, (r, pwc, s, n, state),
}
int
-_DEFUN (__ascii_mbtowc, (r, pwc, s, n, state),
- struct _reent *r,
+__ascii_mbtowc (struct _reent *r,
wchar_t *pwc,
const char *s,
size_t n,
@@ -528,8 +526,7 @@ __cp_mbtowc (int val)
#endif /* _MB_EXTENDED_CHARSETS_WINDOWS */
int
-_DEFUN (__utf8_mbtowc, (r, pwc, s, n, state),
- struct _reent *r,
+__utf8_mbtowc (struct _reent *r,
wchar_t *pwc,
const char *s,
size_t n,
@@ -730,8 +727,7 @@ _DEFUN (__utf8_mbtowc, (r, pwc, s, n, state),
because the underlying OS requires wchar_t == UTF-16. */
#ifndef __CYGWIN__
int
-_DEFUN (__sjis_mbtowc, (r, pwc, s, n, state),
- struct _reent *r,
+__sjis_mbtowc (struct _reent *r,
wchar_t *pwc,
const char *s,
size_t n,
@@ -787,8 +783,7 @@ _DEFUN (__sjis_mbtowc, (r, pwc, s, n, state),
}
int
-_DEFUN (__eucjp_mbtowc, (r, pwc, s, n, state),
- struct _reent *r,
+__eucjp_mbtowc (struct _reent *r,
wchar_t *pwc,
const char *s,
size_t n,
@@ -870,8 +865,7 @@ _DEFUN (__eucjp_mbtowc, (r, pwc, s, n, state),
}
int
-_DEFUN (__jis_mbtowc, (r, pwc, s, n, state),
- struct _reent *r,
+__jis_mbtowc (struct _reent *r,
wchar_t *pwc,
const char *s,
size_t n,
diff --git a/newlib/libc/stdlib/mprec.c b/newlib/libc/stdlib/mprec.c
index bd1c691d9..e433fa8c1 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, int k)
+Balloc (struct _reent *ptr, int k)
{
int x;
_Bigint *rv ;
@@ -133,7 +133,7 @@ _DEFUN (Balloc, (ptr, k), struct _reent *ptr, int k)
}
void
-_DEFUN (Bfree, (ptr, v), struct _reent *ptr, _Bigint * v)
+Bfree (struct _reent *ptr, _Bigint * v)
{
_REENT_CHECK_MP(ptr);
if (v)
@@ -144,8 +144,7 @@ _DEFUN (Bfree, (ptr, v), struct _reent *ptr, _Bigint * v)
}
_Bigint *
-_DEFUN (multadd, (ptr, b, m, a),
- struct _reent *ptr,
+multadd (struct _reent *ptr,
_Bigint * b,
int m,
int a)
@@ -191,8 +190,7 @@ _DEFUN (multadd, (ptr, b, m, a),
}
_Bigint *
-_DEFUN (s2b, (ptr, s, nd0, nd, y9),
- struct _reent * ptr,
+s2b (struct _reent * ptr,
const char *s,
int nd0,
int nd,
@@ -231,8 +229,7 @@ _DEFUN (s2b, (ptr, s, nd0, nd, y9),
}
int
-_DEFUN (hi0bits,
- (x), register __ULong x)
+hi0bits (register __ULong x)
{
register int k = 0;
@@ -266,7 +263,7 @@ _DEFUN (hi0bits,
}
int
-_DEFUN (lo0bits, (y), __ULong *y)
+lo0bits (__ULong *y)
{
register int k;
register __ULong x = *y;
@@ -316,7 +313,7 @@ _DEFUN (lo0bits, (y), __ULong *y)
}
_Bigint *
-_DEFUN (i2b, (ptr, i), struct _reent * ptr, int i)
+i2b (struct _reent * ptr, int i)
{
_Bigint *b;
@@ -327,7 +324,7 @@ _DEFUN (i2b, (ptr, i), struct _reent * ptr, int i)
}
_Bigint *
-_DEFUN (mult, (ptr, a, b), struct _reent * ptr, _Bigint * a, _Bigint * b)
+mult (struct _reent * ptr, _Bigint * a, _Bigint * b)
{
_Bigint *c;
int k, wa, wb, wc;
@@ -419,8 +416,7 @@ _DEFUN (mult, (ptr, a, b), struct _reent * ptr, _Bigint * a, _Bigint * b)
}
_Bigint *
-_DEFUN (pow5mult,
- (ptr, b, k), struct _reent * ptr, _Bigint * b, int k)
+pow5mult (struct _reent * ptr, _Bigint * b, int k)
{
_Bigint *b1, *p5, *p51;
int i;
@@ -459,7 +455,7 @@ _DEFUN (pow5mult,
}
_Bigint *
-_DEFUN (lshift, (ptr, b, k), struct _reent * ptr, _Bigint * b, int k)
+lshift (struct _reent * ptr, _Bigint * b, int k)
{
int i, k1, n, n1;
_Bigint *b1;
@@ -519,7 +515,7 @@ _DEFUN (lshift, (ptr, b, k), struct _reent * ptr, _Bigint * b, int k)
}
int
-_DEFUN (cmp, (a, b), _Bigint * a, _Bigint * b)
+cmp (_Bigint * a, _Bigint * b)
{
__ULong *xa, *xa0, *xb, *xb0;
int i, j;
@@ -549,7 +545,7 @@ _DEFUN (cmp, (a, b), _Bigint * a, _Bigint * b)
}
_Bigint *
-_DEFUN (diff, (ptr, a, b), struct _reent * ptr,
+diff (struct _reent * ptr,
_Bigint * a, _Bigint * b)
{
_Bigint *c;
@@ -633,7 +629,7 @@ _DEFUN (diff, (ptr, a, b), struct _reent * ptr,
}
double
-_DEFUN (ulp, (_x), double _x)
+ulp (double _x)
{
union double_union x, a;
register __Long L;
@@ -679,8 +675,7 @@ _DEFUN (ulp, (_x), double _x)
}
double
-_DEFUN (b2d, (a, e),
- _Bigint * a, int *e)
+b2d (_Bigint * a, int *e)
{
__ULong *xa, *xa0, w, y, z;
int k;
@@ -756,9 +751,7 @@ ret_d:
}
_Bigint *
-_DEFUN (d2b,
- (ptr, _d, e, bits),
- struct _reent * ptr,
+d2b (struct _reent * ptr,
double _d,
int *e,
int *bits)
@@ -911,7 +904,7 @@ _DEFUN (d2b,
#undef d1
double
-_DEFUN (ratio, (a, b), _Bigint * a, _Bigint * b)
+ratio (_Bigint * a, _Bigint * b)
{
union double_union da, db;
@@ -976,8 +969,7 @@ const double tinytens[] =
double
-_DEFUN (_mprec_log10, (dig),
- int dig)
+_mprec_log10 (int dig)
{
double v = 1.0;
if (dig < 24)
@@ -991,8 +983,7 @@ _DEFUN (_mprec_log10, (dig),
}
void
-_DEFUN (copybits, (c, n, b),
- __ULong *c,
+copybits (__ULong *c,
int n,
_Bigint *b)
{
@@ -1020,8 +1011,7 @@ _DEFUN (copybits, (c, n, b),
}
__ULong
-_DEFUN (any_on, (b, k),
- _Bigint *b,
+any_on (_Bigint *b,
int k)
{
int n, nwds;
diff --git a/newlib/libc/stdlib/mrand48.c b/newlib/libc/stdlib/mrand48.c
index 62b44edc9..bb1e454c9 100644
--- a/newlib/libc/stdlib/mrand48.c
+++ b/newlib/libc/stdlib/mrand48.c
@@ -14,8 +14,7 @@
#include "rand48.h"
long
-_DEFUN (_mrand48_r, (r),
- struct _reent *r)
+_mrand48_r (struct _reent *r)
{
_REENT_CHECK_RAND48(r);
__dorand48(r, __rand48_seed);
diff --git a/newlib/libc/stdlib/msize.c b/newlib/libc/stdlib/msize.c
index 8c2b221e4..108550dcd 100644
--- a/newlib/libc/stdlib/msize.c
+++ b/newlib/libc/stdlib/msize.c
@@ -9,8 +9,7 @@
#ifndef _REENT_ONLY
size_t
-_DEFUN (malloc_usable_size, (ptr),
- void *ptr)
+malloc_usable_size (void *ptr)
{
return _malloc_usable_size_r (_REENT, ptr);
}
diff --git a/newlib/libc/stdlib/mstats.c b/newlib/libc/stdlib/mstats.c
index 92f9fb792..85c20f1bc 100644
--- a/newlib/libc/stdlib/mstats.c
+++ b/newlib/libc/stdlib/mstats.c
@@ -97,8 +97,7 @@ malloc_stats (void)
}
int
-_DEFUN (mallopt, (p, v),
- int p,
+mallopt (int p,
int v)
{
return _mallopt_r (_REENT, p, v);
@@ -115,8 +114,7 @@ _DEFUN (mallopt, (p, v),
malloc_stats. */
void
-_DEFUN (_mstats_r, (ptr, s),
- struct _reent *ptr,
+_mstats_r (struct _reent *ptr,
char *s)
{
_REENT_SMALL_CHECK_INIT(ptr);
@@ -126,8 +124,7 @@ _DEFUN (_mstats_r, (ptr, s),
#ifndef _REENT_ONLY
void
-_DEFUN (mstats, (s),
- char *s)
+mstats (char *s)
{
_mstats_r (_REENT, s);
}
diff --git a/newlib/libc/stdlib/mtrim.c b/newlib/libc/stdlib/mtrim.c
index 328eb715e..bf927fa84 100644
--- a/newlib/libc/stdlib/mtrim.c
+++ b/newlib/libc/stdlib/mtrim.c
@@ -9,8 +9,7 @@
#ifndef _REENT_ONLY
int
-_DEFUN (malloc_trim, (pad),
- size_t pad)
+malloc_trim (size_t pad)
{
return _malloc_trim_r (_REENT, pad);
}
diff --git a/newlib/libc/stdlib/nrand48.c b/newlib/libc/stdlib/nrand48.c
index 43a6d0cfb..cca0e5f7a 100644
--- a/newlib/libc/stdlib/nrand48.c
+++ b/newlib/libc/stdlib/nrand48.c
@@ -14,8 +14,7 @@
#include "rand48.h"
long
-_DEFUN (_nrand48_r, (r, xseed),
- struct _reent *r,
+_nrand48_r (struct _reent *r,
unsigned short xseed[3])
{
__dorand48 (r, xseed);
@@ -25,8 +24,7 @@ _DEFUN (_nrand48_r, (r, xseed),
#ifndef _REENT_ONLY
long
-_DEFUN (nrand48, (xseed),
- unsigned short xseed[3])
+nrand48 (unsigned short xseed[3])
{
return _nrand48_r (_REENT, xseed);
}
diff --git a/newlib/libc/stdlib/on_exit.c b/newlib/libc/stdlib/on_exit.c
index 97d107e7d..ce6bac68e 100644
--- a/newlib/libc/stdlib/on_exit.c
+++ b/newlib/libc/stdlib/on_exit.c
@@ -66,9 +66,7 @@ const void * const __on_exit_dummy = &__on_exit_args;
*/
int
-_DEFUN (on_exit,
- (fn, arg),
- void _EXFNPTR(fn, (int, void *)),
+on_exit (void _EXFNPTR(fn, (int, void *)),
void *arg)
{
return __register_exitproc (__et_onexit, (void (*)(void)) fn, arg, NULL);
diff --git a/newlib/libc/stdlib/putenv.c b/newlib/libc/stdlib/putenv.c
index 978f7c5d6..7a8d7f7d3 100644
--- a/newlib/libc/stdlib/putenv.c
+++ b/newlib/libc/stdlib/putenv.c
@@ -23,8 +23,7 @@
#include <string.h>
int
-_DEFUN (putenv, (str),
- char *str)
+putenv (char *str)
{
return _putenv_r (_REENT, str);
}
diff --git a/newlib/libc/stdlib/putenv_r.c b/newlib/libc/stdlib/putenv_r.c
index a780a149e..8c23a823d 100644
--- a/newlib/libc/stdlib/putenv_r.c
+++ b/newlib/libc/stdlib/putenv_r.c
@@ -31,8 +31,7 @@
or replaces the environment variable "name"
with "value" which is specified by str as "name=value". */
int
-_DEFUN (_putenv_r, (reent_ptr, str),
- struct _reent *reent_ptr,
+_putenv_r (struct _reent *reent_ptr,
char *str)
{
register char *p, *equal;
diff --git a/newlib/libc/stdlib/rand.c b/newlib/libc/stdlib/rand.c
index e6ef7a1f6..209cb32ff 100644
--- a/newlib/libc/stdlib/rand.c
+++ b/newlib/libc/stdlib/rand.c
@@ -59,7 +59,7 @@ on two different systems.
#include <reent.h>
void
-_DEFUN (srand, (seed), unsigned int seed)
+srand (unsigned int seed)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdlib/rand48.c b/newlib/libc/stdlib/rand48.c
index 0fc5cc0a9..626b3ef84 100644
--- a/newlib/libc/stdlib/rand48.c
+++ b/newlib/libc/stdlib/rand48.c
@@ -130,8 +130,7 @@ No supporting OS subroutines are required.
#include "rand48.h"
void
-_DEFUN (__dorand48, (r, xseed),
- struct _reent *r,
+__dorand48 (struct _reent *r,
unsigned short xseed[3])
{
unsigned long accu;
diff --git a/newlib/libc/stdlib/rand_r.c b/newlib/libc/stdlib/rand_r.c
index 437739ef5..0670285a0 100644
--- a/newlib/libc/stdlib/rand_r.c
+++ b/newlib/libc/stdlib/rand_r.c
@@ -22,7 +22,7 @@
*/
int
-_DEFUN (rand_r, (seed), unsigned int *seed)
+rand_r (unsigned int *seed)
{
long k;
long s = (long)(*seed);
diff --git a/newlib/libc/stdlib/random.c b/newlib/libc/stdlib/random.c
index b3b0ca305..131dc056c 100644
--- a/newlib/libc/stdlib/random.c
+++ b/newlib/libc/stdlib/random.c
@@ -57,7 +57,7 @@ algorithm as <<rand>>.
#include <reent.h>
void
-_DEFUN (srandom, (seed), unsigned int seed)
+srandom (unsigned int seed)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdlib/realloc.c b/newlib/libc/stdlib/realloc.c
index 00a88a5a2..999e8e00b 100644
--- a/newlib/libc/stdlib/realloc.c
+++ b/newlib/libc/stdlib/realloc.c
@@ -11,8 +11,7 @@ int _dummy_realloc = 1;
#ifndef _REENT_ONLY
void *
-_DEFUN (realloc, (ap, nbytes),
- void *ap,
+realloc (void *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 c4aaeaeaa..d62752a80 100644
--- a/newlib/libc/stdlib/reallocf.c
+++ b/newlib/libc/stdlib/reallocf.c
@@ -31,8 +31,7 @@
#include <stdlib.h>
void *
-_DEFUN (_reallocf_r, (reentptr, ptr, size),
- struct _reent *reentptr,
+_reallocf_r (struct _reent *reentptr,
void *ptr,
size_t size)
{
@@ -46,8 +45,7 @@ _DEFUN (_reallocf_r, (reentptr, ptr, size),
#ifndef _REENT_ONLY
void *
-_DEFUN (reallocf, (ptr, size),
- void *ptr,
+reallocf (void *ptr,
size_t size)
{
return _reallocf_r(_REENT, ptr, size);
diff --git a/newlib/libc/stdlib/rpmatch.c b/newlib/libc/stdlib/rpmatch.c
index 93d2c3f11..42a351343 100644
--- a/newlib/libc/stdlib/rpmatch.c
+++ b/newlib/libc/stdlib/rpmatch.c
@@ -59,8 +59,7 @@ No supporting OS subroutines are required.
#include <stdlib.h>
int
-_DEFUN(rpmatch, (response),
- const char *response)
+rpmatch (const char *response)
{
regex_t yes, no;
int ret;
diff --git a/newlib/libc/stdlib/seed48.c b/newlib/libc/stdlib/seed48.c
index 5f3ae2e95..25f0e501e 100644
--- a/newlib/libc/stdlib/seed48.c
+++ b/newlib/libc/stdlib/seed48.c
@@ -14,8 +14,7 @@
#include "rand48.h"
unsigned short *
-_DEFUN (_seed48_r, (r, xseed),
- struct _reent *r,
+_seed48_r (struct _reent *r,
unsigned short xseed[3])
{
static unsigned short sseed[3];
@@ -36,8 +35,7 @@ _DEFUN (_seed48_r, (r, xseed),
#ifndef _REENT_ONLY
unsigned short *
-_DEFUN (seed48, (xseed),
- unsigned short xseed[3])
+seed48 (unsigned short xseed[3])
{
return _seed48_r (_REENT, xseed);
}
diff --git a/newlib/libc/stdlib/setenv.c b/newlib/libc/stdlib/setenv.c
index e68e91d14..b0c1585d4 100644
--- a/newlib/libc/stdlib/setenv.c
+++ b/newlib/libc/stdlib/setenv.c
@@ -32,8 +32,7 @@ extern int _unsetenv_r (struct _reent *, const char *);
*/
int
-_DEFUN (setenv, (name, value, rewrite),
- const char *name,
+setenv (const char *name,
const char *value,
int rewrite)
{
@@ -45,8 +44,7 @@ _DEFUN (setenv, (name, value, rewrite),
* Delete environmental variable "name".
*/
int
-_DEFUN (unsetenv, (name),
- const char *name)
+unsetenv (const char *name)
{
return _unsetenv_r (_REENT, name);
}
diff --git a/newlib/libc/stdlib/setenv_r.c b/newlib/libc/stdlib/setenv_r.c
index 31d4fc70d..f1f885789 100644
--- a/newlib/libc/stdlib/setenv_r.c
+++ b/newlib/libc/stdlib/setenv_r.c
@@ -49,8 +49,7 @@ extern char *_findenv_r (struct _reent *, const char *, int *);
*/
int
-_DEFUN (_setenv_r, (reent_ptr, name, value, rewrite),
- struct _reent *reent_ptr,
+_setenv_r (struct _reent *reent_ptr,
const char *name,
const char *value,
int rewrite)
@@ -133,8 +132,7 @@ _DEFUN (_setenv_r, (reent_ptr, name, value, rewrite),
* Delete environmental variable "name".
*/
int
-_DEFUN (_unsetenv_r, (reent_ptr, name),
- struct _reent *reent_ptr,
+_unsetenv_r (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 1eac2a11f..573f62018 100644
--- a/newlib/libc/stdlib/srand48.c
+++ b/newlib/libc/stdlib/srand48.c
@@ -14,8 +14,7 @@
#include "rand48.h"
void
-_DEFUN (_srand48_r, (r, seed),
- struct _reent *r,
+_srand48_r (struct _reent *r,
long seed)
{
_REENT_CHECK_RAND48(r);
@@ -30,8 +29,7 @@ _DEFUN (_srand48_r, (r, seed),
#ifndef _REENT_ONLY
void
-_DEFUN (srand48, (seed),
- long seed)
+srand48 (long seed)
{
_srand48_r (_REENT, seed);
}
diff --git a/newlib/libc/stdlib/strtod.c b/newlib/libc/stdlib/strtod.c
index 1abff4fe2..402510cdf 100644
--- a/newlib/libc/stdlib/strtod.c
+++ b/newlib/libc/stdlib/strtod.c
@@ -174,8 +174,7 @@ static const double tinytens[] = { 1e-16, 1e-32,
#ifdef Avoid_Underflow /*{*/
static double
-_DEFUN (sulp, (x, scale),
- U x,
+sulp (U x,
int scale)
{
U u;
@@ -197,8 +196,7 @@ _DEFUN (sulp, (x, scale),
#ifndef NO_HEX_FP
static void
-_DEFUN (ULtod, (L, bits, exp, k),
- __ULong *L,
+ULtod (__ULong *L,
__ULong *bits,
Long exp,
int k)
@@ -1252,8 +1250,7 @@ _strtod_l (struct _reent *ptr, const char *__restrict s00, char **__restrict se,
}
double
-_DEFUN (_strtod_r, (ptr, s00, se),
- struct _reent *ptr,
+_strtod_r (struct _reent *ptr,
const char *__restrict s00,
char **__restrict se)
{
@@ -1269,8 +1266,7 @@ strtod_l (const char *__restrict s00, char **__restrict se, locale_t loc)
}
double
-_DEFUN (strtod, (s00, se),
- const char *__restrict s00, char **__restrict se)
+strtod (const char *__restrict s00, char **__restrict se)
{
return _strtod_l (_REENT, s00, se, __get_current_locale ());
}
@@ -1290,8 +1286,7 @@ strtof_l (const char *__restrict s00, char **__restrict se, locale_t loc)
}
float
-_DEFUN (strtof, (s00, se),
- const char *__restrict s00,
+strtof (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 a366680e4..f7572b169 100644
--- a/newlib/libc/stdlib/strtol.c
+++ b/newlib/libc/stdlib/strtol.c
@@ -212,8 +212,7 @@ _strtol_l (struct _reent *rptr, const char *__restrict nptr,
}
long
-_DEFUN (_strtol_r, (rptr, nptr, endptr, base),
- struct _reent *rptr,
+_strtol_r (struct _reent *rptr,
const char *__restrict nptr,
char **__restrict endptr,
int base)
@@ -231,8 +230,7 @@ strtol_l (const char *__restrict s, char **__restrict ptr, int base,
}
long
-_DEFUN (strtol, (s, ptr, base),
- const char *__restrict s,
+strtol (const char *__restrict s,
char **__restrict ptr,
int base)
{
diff --git a/newlib/libc/stdlib/strtoll.c b/newlib/libc/stdlib/strtoll.c
index 9fc832393..295886e8f 100644
--- a/newlib/libc/stdlib/strtoll.c
+++ b/newlib/libc/stdlib/strtoll.c
@@ -214,8 +214,7 @@ _strtoll_l (struct _reent *rptr, const char *__restrict nptr,
}
long long
-_DEFUN (_strtoll_r, (rptr, nptr, endptr, base),
- struct _reent *rptr,
+_strtoll_r (struct _reent *rptr,
const char *__restrict nptr,
char **__restrict endptr,
int base)
@@ -233,8 +232,7 @@ strtoll_l (const char *__restrict s, char **__restrict ptr, int base,
}
long long
-_DEFUN (strtoll, (s, ptr, base),
- const char *__restrict s,
+strtoll (const char *__restrict s,
char **__restrict ptr,
int base)
{
diff --git a/newlib/libc/stdlib/strtoul.c b/newlib/libc/stdlib/strtoul.c
index 5a816dab1..f2fba37f2 100644
--- a/newlib/libc/stdlib/strtoul.c
+++ b/newlib/libc/stdlib/strtoul.c
@@ -191,8 +191,7 @@ _strtoul_l (struct _reent *rptr, const char *__restrict nptr,
}
unsigned long
-_DEFUN (_strtoul_r, (rptr, nptr, endptr, base),
- struct _reent *rptr,
+_strtoul_r (struct _reent *rptr,
const char *__restrict nptr,
char **__restrict endptr,
int base)
@@ -210,8 +209,7 @@ strtoul_l (const char *__restrict s, char **__restrict ptr, int base,
}
unsigned long
-_DEFUN (strtoul, (s, ptr, base),
- const char *__restrict s,
+strtoul (const char *__restrict s,
char **__restrict ptr,
int base)
{
diff --git a/newlib/libc/stdlib/strtoull.c b/newlib/libc/stdlib/strtoull.c
index 0f7c9e385..ce4de6e7e 100644
--- a/newlib/libc/stdlib/strtoull.c
+++ b/newlib/libc/stdlib/strtoull.c
@@ -189,8 +189,7 @@ _strtoull_l (struct _reent *rptr, const char *__restrict nptr,
}
unsigned long long
-_DEFUN (_strtoull_r, (rptr, nptr, endptr, base),
- struct _reent *rptr,
+_strtoull_r (struct _reent *rptr,
const char *__restrict nptr,
char **__restrict endptr,
int base)
@@ -208,8 +207,7 @@ strtoull_l (const char *__restrict s, char **__restrict ptr, int base,
}
unsigned long long
-_DEFUN (strtoull, (s, ptr, base),
- const char *__restrict s,
+strtoull (const char *__restrict s,
char **__restrict ptr,
int base)
{
diff --git a/newlib/libc/stdlib/system.c b/newlib/libc/stdlib/system.c
index 0df7d60d3..34be6cd8f 100644
--- a/newlib/libc/stdlib/system.c
+++ b/newlib/libc/stdlib/system.c
@@ -57,8 +57,7 @@ static int _EXFUN(do_system, (struct _reent *ptr, const char *s));
#endif
int
-_DEFUN(_system_r, (ptr, s),
- struct _reent *ptr,
+_system_r (struct _reent *ptr,
const char *s)
{
#if defined(HAVE_SYSTEM)
@@ -93,8 +92,7 @@ _DEFUN(_system_r, (ptr, s),
#ifndef _REENT_ONLY
int
-_DEFUN(system, (s),
- const char *s)
+system (const char *s)
{
return _system_r (_REENT, s);
}
@@ -110,8 +108,7 @@ extern char **environ;
static char ***p_environ = &environ;
static int
-_DEFUN(do_system, (ptr, s),
- struct _reent *ptr,
+do_system (struct _reent *ptr,
const char *s)
{
char *argv[4];
@@ -142,8 +139,7 @@ _DEFUN(do_system, (ptr, s),
#if defined (__CYGWIN__)
static int
-_DEFUN(do_system, (ptr, s),
- struct _reent *ptr,
+do_system (struct _reent *ptr,
const char *s)
{
char *argv[4];
diff --git a/newlib/libc/stdlib/utoa.c b/newlib/libc/stdlib/utoa.c
index cc5440783..5ef304ce4 100644
--- a/newlib/libc/stdlib/utoa.c
+++ b/newlib/libc/stdlib/utoa.c
@@ -28,8 +28,7 @@ No supporting OS subroutine calls are required.
#include <stdlib.h>
char *
-_DEFUN (__utoa, (value, str, base),
- unsigned value,
+__utoa (unsigned value,
char *str,
int base)
{
@@ -67,8 +66,7 @@ _DEFUN (__utoa, (value, str, base),
}
char *
-_DEFUN (utoa, (value, str, base),
- unsigned value,
+utoa (unsigned value,
char *str,
int base)
{
diff --git a/newlib/libc/stdlib/valloc.c b/newlib/libc/stdlib/valloc.c
index 83a839e31..025386663 100644
--- a/newlib/libc/stdlib/valloc.c
+++ b/newlib/libc/stdlib/valloc.c
@@ -9,15 +9,13 @@
#ifndef _REENT_ONLY
void *
-_DEFUN (valloc, (nbytes),
- size_t nbytes)
+valloc (size_t nbytes)
{
return _valloc_r (_REENT, nbytes);
}
void *
-_DEFUN (pvalloc, (nbytes),
- size_t nbytes)
+pvalloc (size_t nbytes)
{
return _pvalloc_r (_REENT, nbytes);
}
diff --git a/newlib/libc/stdlib/wcrtomb.c b/newlib/libc/stdlib/wcrtomb.c
index 3b6cbd62c..97436cb74 100644
--- a/newlib/libc/stdlib/wcrtomb.c
+++ b/newlib/libc/stdlib/wcrtomb.c
@@ -7,8 +7,7 @@
#include "local.h"
size_t
-_DEFUN (_wcrtomb_r, (ptr, s, wc, ps),
- struct _reent *ptr,
+_wcrtomb_r (struct _reent *ptr,
char *s,
wchar_t wc,
mbstate_t *ps)
@@ -41,8 +40,7 @@ _DEFUN (_wcrtomb_r, (ptr, s, wc, ps),
#ifndef _REENT_ONLY
size_t
-_DEFUN (wcrtomb, (s, wc, ps),
- char *__restrict s,
+wcrtomb (char *__restrict s,
wchar_t wc,
mbstate_t *__restrict ps)
{
diff --git a/newlib/libc/stdlib/wcsnrtombs.c b/newlib/libc/stdlib/wcsnrtombs.c
index 3561257cb..43dd2f3e6 100644
--- a/newlib/libc/stdlib/wcsnrtombs.c
+++ b/newlib/libc/stdlib/wcsnrtombs.c
@@ -138,8 +138,7 @@ _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,
+_wcsnrtombs_r (struct _reent *r,
char *dst,
const wchar_t **src,
size_t nwc,
@@ -152,8 +151,7 @@ _DEFUN (_wcsnrtombs_r, (r, dst, src, nwc, len, ps),
#ifndef _REENT_ONLY
size_t
-_DEFUN (wcsnrtombs, (dst, src, nwc, len, ps),
- char *__restrict dst,
+wcsnrtombs (char *__restrict dst,
const wchar_t **__restrict src,
size_t nwc,
size_t len,
diff --git a/newlib/libc/stdlib/wcsrtombs.c b/newlib/libc/stdlib/wcsrtombs.c
index ac0c9dece..dc4807d2a 100644
--- a/newlib/libc/stdlib/wcsrtombs.c
+++ b/newlib/libc/stdlib/wcsrtombs.c
@@ -5,8 +5,7 @@
#include <wchar.h>
size_t
-_DEFUN (_wcsrtombs_r, (r, dst, src, len, ps),
- struct _reent *r,
+_wcsrtombs_r (struct _reent *r,
char *dst,
const wchar_t **src,
size_t len,
@@ -17,8 +16,7 @@ _DEFUN (_wcsrtombs_r, (r, dst, src, len, ps),
#ifndef _REENT_ONLY
size_t
-_DEFUN (wcsrtombs, (dst, src, len, ps),
- char *__restrict dst,
+wcsrtombs (char *__restrict dst,
const wchar_t **__restrict src,
size_t len,
mbstate_t *__restrict ps)
diff --git a/newlib/libc/stdlib/wcstod.c b/newlib/libc/stdlib/wcstod.c
index 8a72e6fe3..9e0d563ef 100644
--- a/newlib/libc/stdlib/wcstod.c
+++ b/newlib/libc/stdlib/wcstod.c
@@ -214,8 +214,7 @@ _wcstod_l (struct _reent *ptr, const wchar_t *nptr, wchar_t **endptr,
}
double
-_DEFUN (_wcstod_r, (ptr, nptr, endptr),
- struct _reent *ptr,
+_wcstod_r (struct _reent *ptr,
const wchar_t *nptr,
wchar_t **endptr)
{
@@ -223,8 +222,7 @@ _DEFUN (_wcstod_r, (ptr, nptr, endptr),
}
float
-_DEFUN (_wcstof_r, (ptr, nptr, endptr),
- struct _reent *ptr,
+_wcstof_r (struct _reent *ptr,
const wchar_t *nptr,
wchar_t **endptr)
{
@@ -244,8 +242,7 @@ wcstod_l (const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
}
double
-_DEFUN (wcstod, (nptr, endptr),
- const wchar_t *__restrict nptr, wchar_t **__restrict endptr)
+wcstod (const wchar_t *__restrict nptr, wchar_t **__restrict endptr)
{
return _wcstod_l (_REENT, nptr, endptr, __get_current_locale ());
}
@@ -266,8 +263,7 @@ wcstof_l (const wchar_t *__restrict nptr, wchar_t **__restrict endptr,
}
float
-_DEFUN (wcstof, (nptr, endptr),
- const wchar_t *__restrict nptr,
+wcstof (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 324d75ee1..023a9c45e 100644
--- a/newlib/libc/stdlib/wcstol.c
+++ b/newlib/libc/stdlib/wcstol.c
@@ -213,8 +213,7 @@ _wcstol_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
}
long
-_DEFUN (_wcstol_r, (rptr, nptr, endptr, base),
- struct _reent *rptr,
+_wcstol_r (struct _reent *rptr,
const wchar_t *nptr,
wchar_t **endptr,
int base)
@@ -232,8 +231,7 @@ wcstol_l (const wchar_t *__restrict s, wchar_t **__restrict ptr, int base,
}
long
-_DEFUN (wcstol, (s, ptr, base),
- const wchar_t *__restrict s,
+wcstol (const wchar_t *__restrict s,
wchar_t **__restrict ptr,
int base)
{
diff --git a/newlib/libc/stdlib/wcstoll.c b/newlib/libc/stdlib/wcstoll.c
index 00db2adf0..5fe0b2976 100644
--- a/newlib/libc/stdlib/wcstoll.c
+++ b/newlib/libc/stdlib/wcstoll.c
@@ -213,8 +213,7 @@ _wcstoll_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
}
long long
-_DEFUN (_wcstoll_r, (rptr, nptr, endptr, base),
- struct _reent *rptr,
+_wcstoll_r (struct _reent *rptr,
const wchar_t *nptr,
wchar_t **endptr,
int base)
@@ -232,8 +231,7 @@ 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,
+wcstoll (const wchar_t *__restrict s,
wchar_t **__restrict ptr,
int base)
{
diff --git a/newlib/libc/stdlib/wcstombs.c b/newlib/libc/stdlib/wcstombs.c
index 6df2dac55..42be54055 100644
--- a/newlib/libc/stdlib/wcstombs.c
+++ b/newlib/libc/stdlib/wcstombs.c
@@ -48,8 +48,7 @@ effects vary with the locale.
#include <wchar.h>
size_t
-_DEFUN (wcstombs, (s, pwcs, n),
- char *__restrict s,
+wcstombs (char *__restrict s,
const wchar_t *__restrict pwcs,
size_t n)
{
diff --git a/newlib/libc/stdlib/wcstombs_r.c b/newlib/libc/stdlib/wcstombs_r.c
index d965dc228..c6a06a39a 100644
--- a/newlib/libc/stdlib/wcstombs_r.c
+++ b/newlib/libc/stdlib/wcstombs_r.c
@@ -3,8 +3,7 @@
#include "local.h"
size_t
-_DEFUN (_wcstombs_r, (reent, s, pwcs, n, state),
- struct _reent *r,
+_wcstombs_r (struct _reent *r,
char *__restrict s,
const wchar_t *__restrict pwcs,
size_t n,
diff --git a/newlib/libc/stdlib/wcstoul.c b/newlib/libc/stdlib/wcstoul.c
index 5c54ec591..8e2796587 100644
--- a/newlib/libc/stdlib/wcstoul.c
+++ b/newlib/libc/stdlib/wcstoul.c
@@ -192,8 +192,7 @@ _wcstoul_l (struct _reent *rptr, const wchar_t *nptr, wchar_t **endptr,
}
unsigned long
-_DEFUN (_wcstoul_r, (rptr, nptr, endptr, base),
- struct _reent *rptr,
+_wcstoul_r (struct _reent *rptr,
const wchar_t *nptr,
wchar_t **endptr,
int base)
@@ -211,8 +210,7 @@ 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,
+wcstoul (const wchar_t *__restrict s,
wchar_t **__restrict ptr,
int base)
{
diff --git a/newlib/libc/stdlib/wcstoull.c b/newlib/libc/stdlib/wcstoull.c
index 4724d6150..5a37473e0 100644
--- a/newlib/libc/stdlib/wcstoull.c
+++ b/newlib/libc/stdlib/wcstoull.c
@@ -208,8 +208,7 @@ _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,
+_wcstoull_r (struct _reent *rptr,
const wchar_t *nptr,
wchar_t **endptr,
int base)
@@ -227,8 +226,7 @@ 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,
+wcstoull (const wchar_t *__restrict s,
wchar_t **__restrict ptr,
int base)
{
diff --git a/newlib/libc/stdlib/wctomb.c b/newlib/libc/stdlib/wctomb.c
index b68a43ba7..e908d22c2 100644
--- a/newlib/libc/stdlib/wctomb.c
+++ b/newlib/libc/stdlib/wctomb.c
@@ -46,8 +46,7 @@ effects vary with the locale.
#include "local.h"
int
-_DEFUN (wctomb, (s, wchar),
- char *s,
+wctomb (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 7c4fac1e4..b4799341e 100644
--- a/newlib/libc/stdlib/wctomb_r.c
+++ b/newlib/libc/stdlib/wctomb_r.c
@@ -7,8 +7,7 @@
#include "local.h"
int
-_DEFUN (_wctomb_r, (r, s, wchar, state),
- struct _reent *r,
+_wctomb_r (struct _reent *r,
char *s,
wchar_t _wchar,
mbstate_t *state)
@@ -17,8 +16,7 @@ _DEFUN (_wctomb_r, (r, s, wchar, state),
}
int
-_DEFUN (__ascii_wctomb, (r, s, wchar, state),
- struct _reent *r,
+__ascii_wctomb (struct _reent *r,
char *s,
wchar_t _wchar,
mbstate_t *state)
@@ -50,8 +48,7 @@ _DEFUN (__ascii_wctomb, (r, s, wchar, state),
#define __state __count
int
-_DEFUN (__utf8_wctomb, (r, s, wchar, state),
- struct _reent *r,
+__utf8_wctomb (struct _reent *r,
char *s,
wchar_t _wchar,
mbstate_t *state)
@@ -144,8 +141,7 @@ _DEFUN (__utf8_wctomb, (r, s, wchar, state),
because the underlying OS requires wchar_t == UTF-16. */
#ifndef __CYGWIN__
int
-_DEFUN (__sjis_wctomb, (r, s, wchar, state),
- struct _reent *r,
+__sjis_wctomb (struct _reent *r,
char *s,
wchar_t _wchar,
mbstate_t *state)
@@ -178,8 +174,7 @@ _DEFUN (__sjis_wctomb, (r, s, wchar, state),
}
int
-_DEFUN (__eucjp_wctomb, (r, s, wchar, state),
- struct _reent *r,
+__eucjp_wctomb (struct _reent *r,
char *s,
wchar_t _wchar,
mbstate_t *state)
@@ -218,8 +213,7 @@ _DEFUN (__eucjp_wctomb, (r, s, wchar, state),
}
int
-_DEFUN (__jis_wctomb, (r, s, wchar, state),
- struct _reent *r,
+__jis_wctomb (struct _reent *r,
char *s,
wchar_t _wchar,
mbstate_t *state)
diff --git a/newlib/libc/string/bcmp.c b/newlib/libc/string/bcmp.c
index 29afe828c..747f8af51 100644
--- a/newlib/libc/string/bcmp.c
+++ b/newlib/libc/string/bcmp.c
@@ -32,8 +32,7 @@ QUICKREF
#include <strings.h>
int
-_DEFUN (bcmp, (m1, m2, n),
- const void *m1,
+bcmp (const void *m1,
const void *m2,
size_t n)
diff --git a/newlib/libc/string/bcopy.c b/newlib/libc/string/bcopy.c
index d6cb0c97a..d8bdeb57f 100644
--- a/newlib/libc/string/bcopy.c
+++ b/newlib/libc/string/bcopy.c
@@ -24,8 +24,7 @@ QUICKREF
#include <strings.h>
void
-_DEFUN (bcopy, (b1, b2, length),
- const void *b1,
+bcopy (const void *b1,
void *b2,
size_t length)
{
diff --git a/newlib/libc/string/gnu_basename.c b/newlib/libc/string/gnu_basename.c
index 90e22ccdf..c43542599 100644
--- a/newlib/libc/string/gnu_basename.c
+++ b/newlib/libc/string/gnu_basename.c
@@ -14,8 +14,7 @@
#include <string.h>
char *
-_DEFUN (__gnu_basename, (path),
- const char *path)
+__gnu_basename (const char *path)
{
char *p;
if ((p = strrchr (path, '/')))
diff --git a/newlib/libc/string/index.c b/newlib/libc/string/index.c
index 13519b435..4a6788512 100644
--- a/newlib/libc/string/index.c
+++ b/newlib/libc/string/index.c
@@ -31,8 +31,7 @@ QUICKREF
#include <strings.h>
char *
-_DEFUN (index, (s, c),
- const char *s,
+index (const char *s,
int c)
{
return strchr (s, c);
diff --git a/newlib/libc/string/memccpy.c b/newlib/libc/string/memccpy.c
index 9b94061cb..1f5f55c50 100644
--- a/newlib/libc/string/memccpy.c
+++ b/newlib/libc/string/memccpy.c
@@ -56,8 +56,7 @@ PORTABILITY
void *
-_DEFUN (memccpy, (dst0, src0, endchar, len0),
- void *__restrict dst0,
+memccpy (void *__restrict dst0,
const void *__restrict src0,
int endchar0,
size_t len0)
diff --git a/newlib/libc/string/memchr.c b/newlib/libc/string/memchr.c
index 91f0b3788..21bc4d879 100644
--- a/newlib/libc/string/memchr.c
+++ b/newlib/libc/string/memchr.c
@@ -62,8 +62,7 @@ QUICKREF
#define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
void *
-_DEFUN (memchr, (src_void, c, length),
- const void *src_void,
+memchr (const void *src_void,
int c,
size_t length)
{
diff --git a/newlib/libc/string/memcmp.c b/newlib/libc/string/memcmp.c
index c05cf5745..342fb9fbc 100644
--- a/newlib/libc/string/memcmp.c
+++ b/newlib/libc/string/memcmp.c
@@ -43,8 +43,7 @@ QUICKREF
#define TOO_SMALL(LEN) ((LEN) < LBLOCKSIZE)
int
-_DEFUN (memcmp, (m1, m2, n),
- const void *m1,
+memcmp (const void *m1,
const void *m2,
size_t n)
{
diff --git a/newlib/libc/string/memcpy.c b/newlib/libc/string/memcpy.c
index e1ae0ffe9..a1cff12d9 100644
--- a/newlib/libc/string/memcpy.c
+++ b/newlib/libc/string/memcpy.c
@@ -44,8 +44,7 @@ QUICKREF
#define TOO_SMALL(LEN) ((LEN) < BIGBLOCKSIZE)
void *
-_DEFUN (memcpy, (dst0, src0, len0),
- void *__restrict dst0,
+memcpy (void *__restrict dst0,
const void *__restrict src0,
size_t len0)
{
diff --git a/newlib/libc/string/memmem.c b/newlib/libc/string/memmem.c
index 5588b9f59..5c57eff9c 100644
--- a/newlib/libc/string/memmem.c
+++ b/newlib/libc/string/memmem.c
@@ -46,8 +46,7 @@ QUICKREF
#endif
void *
-_DEFUN (memmem, (haystack_start, haystack_len, needle_start, needle_len),
- const void *haystack_start,
+memmem (const void *haystack_start,
size_t haystack_len,
const void *needle_start,
size_t needle_len)
diff --git a/newlib/libc/string/memmove.c b/newlib/libc/string/memmove.c
index 70adb836c..da5dfdbdd 100644
--- a/newlib/libc/string/memmove.c
+++ b/newlib/libc/string/memmove.c
@@ -50,8 +50,7 @@ QUICKREF
/*SUPPRESS 20*/
void *
__inhibit_loop_to_libcall
-_DEFUN (memmove, (dst_void, src_void, length),
- void *dst_void,
+memmove (void *dst_void,
const void *src_void,
size_t length)
{
diff --git a/newlib/libc/string/mempcpy.c b/newlib/libc/string/mempcpy.c
index babaea006..129165603 100644
--- a/newlib/libc/string/mempcpy.c
+++ b/newlib/libc/string/mempcpy.c
@@ -43,8 +43,7 @@ PORTABILITY
#define TOO_SMALL(LEN) ((LEN) < BIGBLOCKSIZE)
void *
-_DEFUN (mempcpy, (dst0, src0, len0),
- void *dst0,
+mempcpy (void *dst0,
const void *src0,
size_t len0)
{
diff --git a/newlib/libc/string/memrchr.c b/newlib/libc/string/memrchr.c
index 432f46212..652efb359 100644
--- a/newlib/libc/string/memrchr.c
+++ b/newlib/libc/string/memrchr.c
@@ -62,8 +62,7 @@ QUICKREF
#define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
void *
-_DEFUN (memrchr, (src_void, c, length),
- const void *src_void,
+memrchr (const void *src_void,
int c,
size_t length)
{
diff --git a/newlib/libc/string/memset.c b/newlib/libc/string/memset.c
index 5ce15c5aa..e8e667a24 100644
--- a/newlib/libc/string/memset.c
+++ b/newlib/libc/string/memset.c
@@ -35,8 +35,7 @@ QUICKREF
void *
__inhibit_loop_to_libcall
-_DEFUN (memset, (m, c, n),
- void *m,
+memset (void *m,
int c,
size_t n)
{
diff --git a/newlib/libc/string/rawmemchr.c b/newlib/libc/string/rawmemchr.c
index 881bd231a..56e2b5e2d 100644
--- a/newlib/libc/string/rawmemchr.c
+++ b/newlib/libc/string/rawmemchr.c
@@ -61,8 +61,7 @@ QUICKREF
#define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
void *
-_DEFUN (rawmemchr, (src_void, c),
- const void *src_void,
+rawmemchr (const void *src_void,
int c)
{
const unsigned char *src = (const unsigned char *) src_void;
diff --git a/newlib/libc/string/rindex.c b/newlib/libc/string/rindex.c
index 0c7f153cf..39e5aa2da 100644
--- a/newlib/libc/string/rindex.c
+++ b/newlib/libc/string/rindex.c
@@ -31,8 +31,7 @@ QUICKREF
#include <strings.h>
char *
-_DEFUN (rindex, (s, c),
- const char *s,
+rindex (const char *s,
int c)
{
return strrchr (s, c);
diff --git a/newlib/libc/string/stpcpy.c b/newlib/libc/string/stpcpy.c
index 3933036cc..4e2ae9fe0 100644
--- a/newlib/libc/string/stpcpy.c
+++ b/newlib/libc/string/stpcpy.c
@@ -53,8 +53,7 @@ QUICKREF
#endif
char*
-_DEFUN (stpcpy, (dst, src),
- char *__restrict dst,
+stpcpy (char *__restrict dst,
const char *__restrict src)
{
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/stpncpy.c b/newlib/libc/string/stpncpy.c
index 69fa8515a..87fe268cf 100644
--- a/newlib/libc/string/stpncpy.c
+++ b/newlib/libc/string/stpncpy.c
@@ -61,8 +61,7 @@ QUICKREF
#define TOO_SMALL(LEN) ((LEN) < sizeof (long))
char *
-_DEFUN (stpncpy, (dst, src),
- char *__restrict dst,
+stpncpy (char *__restrict dst,
const char *__restrict src,
size_t count)
{
diff --git a/newlib/libc/string/strcasecmp.c b/newlib/libc/string/strcasecmp.c
index 4a48aa69a..c75a3e20d 100644
--- a/newlib/libc/string/strcasecmp.c
+++ b/newlib/libc/string/strcasecmp.c
@@ -36,8 +36,7 @@ QUICKREF
#include <ctype.h>
int
-_DEFUN (strcasecmp, (s1, s2),
- const char *s1,
+strcasecmp (const char *s1,
const char *s2)
{
int d = 0;
diff --git a/newlib/libc/string/strcasestr.c b/newlib/libc/string/strcasestr.c
index 1cc5f6ed7..36e183986 100644
--- a/newlib/libc/string/strcasestr.c
+++ b/newlib/libc/string/strcasestr.c
@@ -90,8 +90,7 @@ QUICKREF
* Find the first occurrence of find in s, ignore case.
*/
char *
-_DEFUN (strcasestr, (s, find),
- const char *s,
+strcasestr (const char *s,
const char *find)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strcat.c b/newlib/libc/string/strcat.c
index ac9bb8e15..92313c492 100644
--- a/newlib/libc/string/strcat.c
+++ b/newlib/libc/string/strcat.c
@@ -54,8 +54,7 @@ QUICKREF
/*SUPPRESS 530*/
char *
-_DEFUN (strcat, (s1, s2),
- char *__restrict s1,
+strcat (char *__restrict s1,
const char *__restrict s2)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strchr.c b/newlib/libc/string/strchr.c
index 05503d178..96f30be04 100644
--- a/newlib/libc/string/strchr.c
+++ b/newlib/libc/string/strchr.c
@@ -52,8 +52,7 @@ QUICKREF
#define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
char *
-_DEFUN (strchr, (s1, i),
- const char *s1,
+strchr (const char *s1,
int i)
{
const unsigned char *s = (const unsigned char *)s1;
diff --git a/newlib/libc/string/strchrnul.c b/newlib/libc/string/strchrnul.c
index 14fd4e2ec..f5c3eb25d 100644
--- a/newlib/libc/string/strchrnul.c
+++ b/newlib/libc/string/strchrnul.c
@@ -31,8 +31,7 @@ QUICKREF
#include <string.h>
char *
-_DEFUN (strchrnul, (s1, i),
- const char *s1,
+strchrnul (const char *s1,
int i)
{
char *s = strchr(s1, i);
diff --git a/newlib/libc/string/strcmp.c b/newlib/libc/string/strcmp.c
index 6c1a0386d..894424a69 100644
--- a/newlib/libc/string/strcmp.c
+++ b/newlib/libc/string/strcmp.c
@@ -52,8 +52,7 @@ QUICKREF
#endif
int
-_DEFUN (strcmp, (s1, s2),
- const char *s1,
+strcmp (const char *s1,
const char *s2)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strcoll.c b/newlib/libc/string/strcoll.c
index fae999a64..7fa8d1373 100644
--- a/newlib/libc/string/strcoll.c
+++ b/newlib/libc/string/strcoll.c
@@ -36,8 +36,7 @@ QUICKREF
#include <string.h>
int
-_DEFUN (strcoll, (a, b),
- const char *a,
+strcoll (const char *a,
const char *b)
{
diff --git a/newlib/libc/string/strcpy.c b/newlib/libc/string/strcpy.c
index 3505b800a..94e16b512 100644
--- a/newlib/libc/string/strcpy.c
+++ b/newlib/libc/string/strcpy.c
@@ -52,8 +52,7 @@ QUICKREF
#endif
char*
-_DEFUN (strcpy, (dst0, src0),
- char *dst0,
+strcpy (char *dst0,
const char *src0)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strcspn.c b/newlib/libc/string/strcspn.c
index 589054bae..abaa93ad6 100644
--- a/newlib/libc/string/strcspn.c
+++ b/newlib/libc/string/strcspn.c
@@ -26,8 +26,7 @@ PORTABILITY
#include <string.h>
size_t
-_DEFUN (strcspn, (s1, s2),
- const char *s1,
+strcspn (const char *s1,
const char *s2)
{
const char *s = s1;
diff --git a/newlib/libc/string/strdup.c b/newlib/libc/string/strdup.c
index 6ea2dd570..3f2a0264c 100644
--- a/newlib/libc/string/strdup.c
+++ b/newlib/libc/string/strdup.c
@@ -5,7 +5,7 @@
#include <string.h>
char *
-_DEFUN (strdup, (str), const char *str)
+strdup (const char *str)
{
return _strdup_r (_REENT, str);
}
diff --git a/newlib/libc/string/strdup_r.c b/newlib/libc/string/strdup_r.c
index 9cdee80f4..14c80f73f 100644
--- a/newlib/libc/string/strdup_r.c
+++ b/newlib/libc/string/strdup_r.c
@@ -3,8 +3,7 @@
#include <string.h>
char *
-_DEFUN (_strdup_r, (reent_ptr, str),
- struct _reent *reent_ptr,
+_strdup_r (struct _reent *reent_ptr,
const char *str)
{
size_t len = strlen (str) + 1;
diff --git a/newlib/libc/string/strerror.c b/newlib/libc/string/strerror.c
index 8d5c188f8..c1b934696 100644
--- a/newlib/libc/string/strerror.c
+++ b/newlib/libc/string/strerror.c
@@ -385,8 +385,7 @@ QUICKREF
#include <string.h>
char *
-_DEFUN (_strerror_r, (ptr, errnum, internal, errptr),
- struct _reent *ptr,
+_strerror_r (struct _reent *ptr,
int errnum,
int internal,
int *errptr)
@@ -893,8 +892,7 @@ _DEFUN (_strerror_r, (ptr, errnum, internal, errptr),
}
char *
-_DEFUN(strerror, (int),
- int errnum)
+strerror (int errnum)
{
return _strerror_r (_REENT, errnum, 0, NULL);
}
diff --git a/newlib/libc/string/strerror_r.c b/newlib/libc/string/strerror_r.c
index c888f9ff3..660fee869 100644
--- a/newlib/libc/string/strerror_r.c
+++ b/newlib/libc/string/strerror_r.c
@@ -65,8 +65,7 @@ a non-empty alternate string without assigning into its third argument.
/* For backwards-compatible linking, this must be the GNU signature;
see xpg_strerror_r.c for the POSIX version. */
char *
-_DEFUN (strerror_r, (errnum, buffer, n),
- int errnum,
+strerror_r (int errnum,
char *buffer,
size_t n)
{
diff --git a/newlib/libc/string/strlcat.c b/newlib/libc/string/strlcat.c
index 2f99294af..a91c297c5 100644
--- a/newlib/libc/string/strlcat.c
+++ b/newlib/libc/string/strlcat.c
@@ -42,8 +42,7 @@ static char *rcsid = "$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp
* If retval >= siz, truncation occurred.
*/
size_t
-_DEFUN (strlcat, (dst, src, siz),
- char *dst,
+strlcat (char *dst,
const char *src,
size_t siz)
{
diff --git a/newlib/libc/string/strlcpy.c b/newlib/libc/string/strlcpy.c
index 2dffed5e3..63ba31ce9 100644
--- a/newlib/libc/string/strlcpy.c
+++ b/newlib/libc/string/strlcpy.c
@@ -40,8 +40,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp
* Returns strlen(src); if retval >= siz, truncation occurred.
*/
size_t
-_DEFUN (strlcpy, (dst, src, siz),
- char *dst,
+strlcpy (char *dst,
const char *src,
size_t siz)
{
diff --git a/newlib/libc/string/strlen.c b/newlib/libc/string/strlen.c
index df76d5fc2..acffa49e1 100644
--- a/newlib/libc/string/strlen.c
+++ b/newlib/libc/string/strlen.c
@@ -49,8 +49,7 @@ QUICKREF
#endif
size_t
-_DEFUN (strlen, (str),
- const char *str)
+strlen (const char *str)
{
const char *start = str;
diff --git a/newlib/libc/string/strlwr.c b/newlib/libc/string/strlwr.c
index c47ff4859..7211c5917 100644
--- a/newlib/libc/string/strlwr.c
+++ b/newlib/libc/string/strlwr.c
@@ -29,8 +29,7 @@ QUICKREF
#include <ctype.h>
char *
-_DEFUN (strlwr, (s),
- char *s)
+strlwr (char *s)
{
unsigned char *ucs = (unsigned char *) s;
for ( ; *ucs != '\0'; ucs++)
diff --git a/newlib/libc/string/strncasecmp.c b/newlib/libc/string/strncasecmp.c
index 2a6f6265d..09dd98bf5 100644
--- a/newlib/libc/string/strncasecmp.c
+++ b/newlib/libc/string/strncasecmp.c
@@ -37,8 +37,7 @@ QUICKREF
#include <ctype.h>
int
-_DEFUN (strncasecmp, (s1, s2, n),
- const char *s1,
+strncasecmp (const char *s1,
const char *s2,
size_t n)
{
diff --git a/newlib/libc/string/strncat.c b/newlib/libc/string/strncat.c
index 2411cf124..7351913f9 100644
--- a/newlib/libc/string/strncat.c
+++ b/newlib/libc/string/strncat.c
@@ -58,8 +58,7 @@ QUICKREF
#endif
char *
-_DEFUN (strncat, (s1, s2, n),
- char *__restrict s1,
+strncat (char *__restrict s1,
const char *__restrict s2,
size_t n)
{
diff --git a/newlib/libc/string/strncmp.c b/newlib/libc/string/strncmp.c
index 685d19290..16f8a7729 100644
--- a/newlib/libc/string/strncmp.c
+++ b/newlib/libc/string/strncmp.c
@@ -52,8 +52,7 @@ QUICKREF
#endif
int
-_DEFUN (strncmp, (s1, s2, n),
- const char *s1,
+strncmp (const char *s1,
const char *s2,
size_t n)
{
diff --git a/newlib/libc/string/strncpy.c b/newlib/libc/string/strncpy.c
index abbe43bc7..e7eb34d72 100644
--- a/newlib/libc/string/strncpy.c
+++ b/newlib/libc/string/strncpy.c
@@ -59,8 +59,7 @@ QUICKREF
#define TOO_SMALL(LEN) ((LEN) < sizeof (long))
char *
-_DEFUN (strncpy, (dst0, src0),
- char *__restrict dst0,
+strncpy (char *__restrict dst0,
const char *__restrict src0,
size_t count)
{
diff --git a/newlib/libc/string/strndup.c b/newlib/libc/string/strndup.c
index c241ca544..3ac890a8c 100644
--- a/newlib/libc/string/strndup.c
+++ b/newlib/libc/string/strndup.c
@@ -6,8 +6,7 @@
#include <string.h>
char *
-_DEFUN (strndup, (str, n),
- const char *str,
+strndup (const char *str,
size_t n)
{
return _strndup_r (_REENT, str, n);
diff --git a/newlib/libc/string/strndup_r.c b/newlib/libc/string/strndup_r.c
index 3c7e8ee4f..1b6cf84e5 100644
--- a/newlib/libc/string/strndup_r.c
+++ b/newlib/libc/string/strndup_r.c
@@ -3,8 +3,7 @@
#include <string.h>
char *
-_DEFUN (_strndup_r, (reent_ptr, str, n),
- struct _reent *reent_ptr,
+_strndup_r (struct _reent *reent_ptr,
const char *str,
size_t n)
{
diff --git a/newlib/libc/string/strnlen.c b/newlib/libc/string/strnlen.c
index 42f460fea..3ee18d1c0 100644
--- a/newlib/libc/string/strnlen.c
+++ b/newlib/libc/string/strnlen.c
@@ -30,8 +30,7 @@ PORTABILITY
#include <string.h>
size_t
-_DEFUN (strnlen, (str, n),
- const char *str,
+strnlen (const char *str,
size_t n)
{
const char *start = str;
diff --git a/newlib/libc/string/strpbrk.c b/newlib/libc/string/strpbrk.c
index f70efc1ea..774db1e6d 100644
--- a/newlib/libc/string/strpbrk.c
+++ b/newlib/libc/string/strpbrk.c
@@ -25,8 +25,7 @@ PORTABILITY
#include <string.h>
char *
-_DEFUN (strpbrk, (s1, s2),
- const char *s1,
+strpbrk (const char *s1,
const char *s2)
{
const char *c = s2;
diff --git a/newlib/libc/string/strrchr.c b/newlib/libc/string/strrchr.c
index 4aafd509a..04897e162 100644
--- a/newlib/libc/string/strrchr.c
+++ b/newlib/libc/string/strrchr.c
@@ -30,8 +30,7 @@ QUICKREF
#include <string.h>
char *
-_DEFUN (strrchr, (s, i),
- const char *s,
+strrchr (const char *s,
int i)
{
const char *last = NULL;
diff --git a/newlib/libc/string/strsep.c b/newlib/libc/string/strsep.c
index e59782795..e1262ac37 100644
--- a/newlib/libc/string/strsep.c
+++ b/newlib/libc/string/strsep.c
@@ -11,8 +11,7 @@
extern char *__strtok_r (char *, const char *, char **, int);
char *
-_DEFUN (strsep, (source_ptr, delim),
- register char **source_ptr,
+strsep (register char **source_ptr,
register const char *delim)
{
return __strtok_r (*source_ptr, delim, source_ptr, 0);
diff --git a/newlib/libc/string/strsignal.c b/newlib/libc/string/strsignal.c
index 86a0e5dd9..544857b14 100644
--- a/newlib/libc/string/strsignal.c
+++ b/newlib/libc/string/strsignal.c
@@ -53,8 +53,7 @@ QUICKREF
#include <reent.h>
char *
-_DEFUN (strsignal, (signal),
- int signal)
+strsignal (int signal)
{
char *buffer;
struct _reent *ptr;
diff --git a/newlib/libc/string/strspn.c b/newlib/libc/string/strspn.c
index 22ccd0bf8..baf239947 100644
--- a/newlib/libc/string/strspn.c
+++ b/newlib/libc/string/strspn.c
@@ -30,8 +30,7 @@ QUICKREF
#include <string.h>
size_t
-_DEFUN (strspn, (s1, s2),
- const char *s1,
+strspn (const char *s1,
const char *s2)
{
const char *s = s1;
diff --git a/newlib/libc/string/strstr.c b/newlib/libc/string/strstr.c
index 749edbce6..580ad6272 100644
--- a/newlib/libc/string/strstr.c
+++ b/newlib/libc/string/strstr.c
@@ -39,8 +39,7 @@ QUICKREF
#endif
char *
-_DEFUN (strstr, (searchee, lookfor),
- const char *searchee,
+strstr (const char *searchee,
const char *lookfor)
{
#if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strtok.c b/newlib/libc/string/strtok.c
index 92c801731..801f51aca 100644
--- a/newlib/libc/string/strtok.c
+++ b/newlib/libc/string/strtok.c
@@ -79,8 +79,7 @@ QUICKREF
extern char *__strtok_r (char *, const char *, char **, int);
char *
-_DEFUN (strtok, (s, delim),
- register char *__restrict s,
+strtok (register char *__restrict s,
register const char *__restrict delim)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/string/strtok_r.c b/newlib/libc/string/strtok_r.c
index 0d01dcaad..d17fd693d 100644
--- a/newlib/libc/string/strtok_r.c
+++ b/newlib/libc/string/strtok_r.c
@@ -30,8 +30,7 @@
#include <string.h>
char *
-_DEFUN (__strtok_r, (s, delim, lasts, skip_leading_delim),
- register char *s,
+__strtok_r (register char *s,
register const char *delim,
char **lasts,
int skip_leading_delim)
@@ -90,8 +89,7 @@ cont:
}
char *
-_DEFUN (strtok_r, (s, delim, lasts),
- register char *__restrict s,
+strtok_r (register char *__restrict s,
register const char *__restrict delim,
char **__restrict lasts)
{
diff --git a/newlib/libc/string/strupr.c b/newlib/libc/string/strupr.c
index dbec79e46..a175d5c57 100644
--- a/newlib/libc/string/strupr.c
+++ b/newlib/libc/string/strupr.c
@@ -29,8 +29,7 @@ QUICKREF
#include <ctype.h>
char *
-_DEFUN (strupr, (s),
- char *s)
+strupr (char *s)
{
unsigned char *ucs = (unsigned char *) s;
for ( ; *ucs != '\0'; ucs++)
diff --git a/newlib/libc/string/strxfrm.c b/newlib/libc/string/strxfrm.c
index 13c51becf..c5df0bcd5 100644
--- a/newlib/libc/string/strxfrm.c
+++ b/newlib/libc/string/strxfrm.c
@@ -46,8 +46,7 @@ QUICKREF
#include <string.h>
size_t
-_DEFUN (strxfrm, (s1, s2, n),
- char *__restrict s1,
+strxfrm (char *__restrict s1,
const char *__restrict s2,
size_t n)
{
diff --git a/newlib/libc/string/swab.c b/newlib/libc/string/swab.c
index 1c14a4c48..28ab978bd 100644
--- a/newlib/libc/string/swab.c
+++ b/newlib/libc/string/swab.c
@@ -18,8 +18,7 @@ PORTABILITY
#include <unistd.h>
void
-_DEFUN (swab, (b1, b2, length),
- const void *b1,
+swab (const void *b1,
void *b2,
ssize_t length)
{
diff --git a/newlib/libc/string/u_strerr.c b/newlib/libc/string/u_strerr.c
index 174d9170f..cde05adb2 100644
--- a/newlib/libc/string/u_strerr.c
+++ b/newlib/libc/string/u_strerr.c
@@ -1,8 +1,7 @@
#include <_ansi.h>
char *
-_DEFUN(_user_strerror, (errnum, internal, errptr),
- int errnum,
+_user_strerror (int errnum,
int internal,
int *errptr)
{
diff --git a/newlib/libc/string/wcpcpy.c b/newlib/libc/string/wcpcpy.c
index 942fad19c..76c5311f1 100644
--- a/newlib/libc/string/wcpcpy.c
+++ b/newlib/libc/string/wcpcpy.c
@@ -26,8 +26,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
wchar_t *
-_DEFUN (wcpcpy, (s1, s2),
- wchar_t *__restrict s1,
+wcpcpy (wchar_t *__restrict s1,
const wchar_t *__restrict s2)
{
while ((*s1++ = *s2++))
diff --git a/newlib/libc/string/wcpncpy.c b/newlib/libc/string/wcpncpy.c
index 11f4d7c1f..d4e8bcfcd 100644
--- a/newlib/libc/string/wcpncpy.c
+++ b/newlib/libc/string/wcpncpy.c
@@ -33,8 +33,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
wchar_t *
-_DEFUN (wcpncpy, (dst, src, count),
- wchar_t *__restrict dst,
+wcpncpy (wchar_t *__restrict dst,
const wchar_t *__restrict src,
size_t count)
{
diff --git a/newlib/libc/string/wcscasecmp.c b/newlib/libc/string/wcscasecmp.c
index 483754997..b8623ba06 100644
--- a/newlib/libc/string/wcscasecmp.c
+++ b/newlib/libc/string/wcscasecmp.c
@@ -36,8 +36,7 @@ QUICKREF
#include <wctype.h>
int
-_DEFUN (wcscasecmp, (s1, s2),
- const wchar_t *s1,
+wcscasecmp (const wchar_t *s1,
const wchar_t *s2)
{
int d = 0;
diff --git a/newlib/libc/string/wcscat.c b/newlib/libc/string/wcscat.c
index 40b7774e5..c6bde4a6e 100644
--- a/newlib/libc/string/wcscat.c
+++ b/newlib/libc/string/wcscat.c
@@ -61,8 +61,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
wchar_t *
-_DEFUN (wcscat, (s1, s2),
- wchar_t *__restrict s1,
+wcscat (wchar_t *__restrict s1,
const wchar_t *__restrict s2)
{
wchar_t *p;
diff --git a/newlib/libc/string/wcschr.c b/newlib/libc/string/wcschr.c
index f883f5443..62b96c344 100644
--- a/newlib/libc/string/wcschr.c
+++ b/newlib/libc/string/wcschr.c
@@ -58,8 +58,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
wchar_t *
-_DEFUN (wcschr, (s, c),
- const wchar_t * s,
+wcschr (const wchar_t * s,
wchar_t c)
{
const wchar_t *p;
diff --git a/newlib/libc/string/wcscmp.c b/newlib/libc/string/wcscmp.c
index 1fb35755c..2784fac16 100644
--- a/newlib/libc/string/wcscmp.c
+++ b/newlib/libc/string/wcscmp.c
@@ -67,8 +67,7 @@ No supporting OS subroutines are required.
* Compare strings.
*/
int
-_DEFUN (wcscmp, (s1, s2),
- const wchar_t * s1,
+wcscmp (const wchar_t * s1,
const wchar_t * s2)
{
diff --git a/newlib/libc/string/wcscoll.c b/newlib/libc/string/wcscoll.c
index 7d6b927f8..4bbf39c9a 100644
--- a/newlib/libc/string/wcscoll.c
+++ b/newlib/libc/string/wcscoll.c
@@ -33,8 +33,7 @@ PORTABILITY
#include <wchar.h>
int
-_DEFUN (wcscoll, (a, b),
- const wchar_t *a,
+wcscoll (const wchar_t *a,
const wchar_t *b)
{
diff --git a/newlib/libc/string/wcscpy.c b/newlib/libc/string/wcscpy.c
index 679e9c543..802d2af1f 100644
--- a/newlib/libc/string/wcscpy.c
+++ b/newlib/libc/string/wcscpy.c
@@ -57,8 +57,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
wchar_t *
-_DEFUN (wcscpy, (s1, s2),
- wchar_t *__restrict s1,
+wcscpy (wchar_t *__restrict s1,
const wchar_t *__restrict s2)
{
wchar_t *p;
diff --git a/newlib/libc/string/wcscspn.c b/newlib/libc/string/wcscspn.c
index 54bca2fa7..4feb6e7c9 100644
--- a/newlib/libc/string/wcscspn.c
+++ b/newlib/libc/string/wcscspn.c
@@ -56,8 +56,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
size_t
-_DEFUN (wcscspn, (s, set),
- const wchar_t * s,
+wcscspn (const wchar_t * s,
const wchar_t * set)
{
const wchar_t *p;
diff --git a/newlib/libc/string/wcslcat.c b/newlib/libc/string/wcslcat.c
index dd96d3049..189a710bd 100644
--- a/newlib/libc/string/wcslcat.c
+++ b/newlib/libc/string/wcslcat.c
@@ -68,8 +68,7 @@ No supporting OS subroutines are required.
* truncation occurred.
*/
size_t
-_DEFUN (wcslcat, (dst, src, siz),
- wchar_t * dst,
+wcslcat (wchar_t * dst,
const wchar_t * src,
size_t siz)
{
diff --git a/newlib/libc/string/wcslcpy.c b/newlib/libc/string/wcslcpy.c
index a21f8c8fc..3d688a943 100644
--- a/newlib/libc/string/wcslcpy.c
+++ b/newlib/libc/string/wcslcpy.c
@@ -62,8 +62,7 @@ No supporting OS subroutines are required.
* Returns wcslen(src); if retval >= siz, truncation occurred.
*/
size_t
-_DEFUN (wcslcpy, (dst, src, siz),
- wchar_t * dst,
+wcslcpy (wchar_t * dst,
const wchar_t * src,
size_t siz)
{
diff --git a/newlib/libc/string/wcslen.c b/newlib/libc/string/wcslen.c
index c92757708..8fa9f723c 100644
--- a/newlib/libc/string/wcslen.c
+++ b/newlib/libc/string/wcslen.c
@@ -55,8 +55,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
size_t
-_DEFUN (wcslen, (s),
- const wchar_t * s)
+wcslen (const wchar_t * s)
{
const wchar_t *p;
diff --git a/newlib/libc/string/wcsncasecmp.c b/newlib/libc/string/wcsncasecmp.c
index 7abb154ee..b77952ac3 100644
--- a/newlib/libc/string/wcsncasecmp.c
+++ b/newlib/libc/string/wcsncasecmp.c
@@ -37,8 +37,7 @@ QUICKREF
#include <wctype.h>
int
-_DEFUN (wcsncasecmp, (s1, s2, n),
- const wchar_t *s1,
+wcsncasecmp (const wchar_t *s1,
const wchar_t *s2,
size_t n)
{
diff --git a/newlib/libc/string/wcsncat.c b/newlib/libc/string/wcsncat.c
index 3c344b46e..4c14e19f3 100644
--- a/newlib/libc/string/wcsncat.c
+++ b/newlib/libc/string/wcsncat.c
@@ -62,8 +62,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
wchar_t *
-_DEFUN (wcsncat, (s1, s2, n),
- wchar_t *__restrict s1,
+wcsncat (wchar_t *__restrict s1,
const wchar_t *__restrict s2,
size_t n)
{
diff --git a/newlib/libc/string/wcsncmp.c b/newlib/libc/string/wcsncmp.c
index 2dc7660f4..aba4f54aa 100644
--- a/newlib/libc/string/wcsncmp.c
+++ b/newlib/libc/string/wcsncmp.c
@@ -63,8 +63,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
int
-_DEFUN (wcsncmp, (s1, s2, n),
- const wchar_t * s1,
+wcsncmp (const wchar_t * s1,
const wchar_t * s2,
size_t n)
{
diff --git a/newlib/libc/string/wcsncpy.c b/newlib/libc/string/wcsncpy.c
index 324dad3a2..9b103b1bd 100644
--- a/newlib/libc/string/wcsncpy.c
+++ b/newlib/libc/string/wcsncpy.c
@@ -35,8 +35,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
wchar_t *
-_DEFUN (wcsncpy, (s1, s2, n),
- wchar_t *__restrict s1,
+wcsncpy (wchar_t *__restrict s1,
const wchar_t *__restrict s2,
size_t n)
{
diff --git a/newlib/libc/string/wcsnlen.c b/newlib/libc/string/wcsnlen.c
index cc7d66e10..fff1a7ec2 100644
--- a/newlib/libc/string/wcsnlen.c
+++ b/newlib/libc/string/wcsnlen.c
@@ -52,8 +52,7 @@ PORTABILITY
#include <wchar.h>
size_t
-_DEFUN(wcsnlen, (s, maxlen),
- const wchar_t *s,
+wcsnlen (const wchar_t *s,
size_t maxlen)
{
const wchar_t *p;
diff --git a/newlib/libc/string/wcspbrk.c b/newlib/libc/string/wcspbrk.c
index ecda7affe..5a3d01ece 100644
--- a/newlib/libc/string/wcspbrk.c
+++ b/newlib/libc/string/wcspbrk.c
@@ -57,8 +57,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
wchar_t *
-_DEFUN (wcspbrk, (s, set),
- const wchar_t * s,
+wcspbrk (const wchar_t * s,
const wchar_t * set)
{
const wchar_t *p;
diff --git a/newlib/libc/string/wcsrchr.c b/newlib/libc/string/wcsrchr.c
index f12ccc202..0e22dc024 100644
--- a/newlib/libc/string/wcsrchr.c
+++ b/newlib/libc/string/wcsrchr.c
@@ -60,8 +60,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
wchar_t *
-_DEFUN (wcsrchr, (s, c),
- const wchar_t * s,
+wcsrchr (const wchar_t * s,
wchar_t c)
{
const wchar_t *p;
diff --git a/newlib/libc/string/wcsspn.c b/newlib/libc/string/wcsspn.c
index 196816821..db64f1f18 100644
--- a/newlib/libc/string/wcsspn.c
+++ b/newlib/libc/string/wcsspn.c
@@ -56,8 +56,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
size_t
-_DEFUN (wcsspn, (s, set),
- const wchar_t * s,
+wcsspn (const wchar_t * s,
const wchar_t * set)
{
const wchar_t *p;
diff --git a/newlib/libc/string/wcsstr.c b/newlib/libc/string/wcsstr.c
index d5a031452..e77e50584 100644
--- a/newlib/libc/string/wcsstr.c
+++ b/newlib/libc/string/wcsstr.c
@@ -61,8 +61,7 @@ PORTABILITY
#include <wchar.h>
wchar_t *
-_DEFUN (wcsstr, (big, little),
- const wchar_t *__restrict big,
+wcsstr (const wchar_t *__restrict big,
const wchar_t *__restrict little)
{
const wchar_t *p;
diff --git a/newlib/libc/string/wcstok.c b/newlib/libc/string/wcstok.c
index 2467704fd..f7d1c5ee9 100644
--- a/newlib/libc/string/wcstok.c
+++ b/newlib/libc/string/wcstok.c
@@ -90,8 +90,7 @@ QUICKREF
#include <wchar.h>
wchar_t *
-_DEFUN (wcstok, (s, delim, lasts),
- register wchar_t *__restrict s,
+wcstok (register wchar_t *__restrict s,
register const wchar_t *__restrict delim,
wchar_t **__restrict lasts)
{
diff --git a/newlib/libc/string/wcswidth.c b/newlib/libc/string/wcswidth.c
index 19abfd92d..4be7b8ae8 100644
--- a/newlib/libc/string/wcswidth.c
+++ b/newlib/libc/string/wcswidth.c
@@ -34,8 +34,7 @@ PORTABILITY
#include "local.h"
int
-_DEFUN (wcswidth, (pwcs, n),
- const wchar_t *pwcs,
+wcswidth (const wchar_t *pwcs,
size_t n)
{
diff --git a/newlib/libc/string/wcsxfrm.c b/newlib/libc/string/wcsxfrm.c
index 78d7da566..72b3c5bd0 100644
--- a/newlib/libc/string/wcsxfrm.c
+++ b/newlib/libc/string/wcsxfrm.c
@@ -36,8 +36,7 @@ PORTABILITY
#include <wchar.h>
size_t
-_DEFUN (wcsxfrm, (a, b, n),
- wchar_t *__restrict a,
+wcsxfrm (wchar_t *__restrict a,
const wchar_t *__restrict b,
size_t n)
diff --git a/newlib/libc/string/wcwidth.c b/newlib/libc/string/wcwidth.c
index a8c73a542..fc40afd21 100644
--- a/newlib/libc/string/wcwidth.c
+++ b/newlib/libc/string/wcwidth.c
@@ -163,8 +163,7 @@ bisearch(wint_t ucs, const struct interval *table, int max)
*/
int
-_DEFUN (__wcwidth, (ucs),
- const wint_t ucs)
+__wcwidth (const wint_t ucs)
{
#ifdef _MB_CAPABLE
/* sorted list of non-overlapping intervals of East Asian Ambiguous
@@ -329,8 +328,7 @@ _DEFUN (__wcwidth, (ucs),
}
int
-_DEFUN (wcwidth, (wc),
- const wchar_t wc)
+wcwidth (const wchar_t wc)
{
wint_t wi = wc;
diff --git a/newlib/libc/string/wmemchr.c b/newlib/libc/string/wmemchr.c
index 8db2f64cc..0353e5449 100644
--- a/newlib/libc/string/wmemchr.c
+++ b/newlib/libc/string/wmemchr.c
@@ -63,8 +63,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
wchar_t *
-_DEFUN (wmemchr, (s, c, n),
- const wchar_t * s,
+wmemchr (const wchar_t * s,
wchar_t c,
size_t n)
{
diff --git a/newlib/libc/string/wmemcmp.c b/newlib/libc/string/wmemcmp.c
index abb9ed6ff..20223a33d 100644
--- a/newlib/libc/string/wmemcmp.c
+++ b/newlib/libc/string/wmemcmp.c
@@ -62,8 +62,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
int
-_DEFUN (wmemcmp, (s1, s2, n),
- const wchar_t * s1,
+wmemcmp (const wchar_t * s1,
const wchar_t * s2,
size_t n)
{
diff --git a/newlib/libc/string/wmemcpy.c b/newlib/libc/string/wmemcpy.c
index ad1aa24bc..d763e2237 100644
--- a/newlib/libc/string/wmemcpy.c
+++ b/newlib/libc/string/wmemcpy.c
@@ -61,8 +61,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
wchar_t *
-_DEFUN (wmemcpy, (d, s, n),
- wchar_t *__restrict d,
+wmemcpy (wchar_t *__restrict d,
const wchar_t *__restrict s,
size_t n)
{
diff --git a/newlib/libc/string/wmemmove.c b/newlib/libc/string/wmemmove.c
index 22b5a987d..399fae4e9 100644
--- a/newlib/libc/string/wmemmove.c
+++ b/newlib/libc/string/wmemmove.c
@@ -66,8 +66,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
wchar_t *
-_DEFUN (wmemmove, (d, s, n),
- wchar_t * d,
+wmemmove (wchar_t * d,
const wchar_t * s,
size_t n)
{
diff --git a/newlib/libc/string/wmempcpy.c b/newlib/libc/string/wmempcpy.c
index 7354e81da..98983f968 100644
--- a/newlib/libc/string/wmempcpy.c
+++ b/newlib/libc/string/wmempcpy.c
@@ -34,8 +34,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
wchar_t *
-_DEFUN (wmempcpy, (d, s, n),
- wchar_t *__restrict d,
+wmempcpy (wchar_t *__restrict d,
const wchar_t *__restrict s,
size_t n)
{
diff --git a/newlib/libc/string/wmemset.c b/newlib/libc/string/wmemset.c
index f9ec361cd..2120b564b 100644
--- a/newlib/libc/string/wmemset.c
+++ b/newlib/libc/string/wmemset.c
@@ -59,8 +59,7 @@ No supporting OS subroutines are required.
#include <wchar.h>
wchar_t *
-_DEFUN(wmemset, (s, c, n),
- wchar_t *s,
+wmemset (wchar_t *s,
wchar_t c,
size_t n)
{
diff --git a/newlib/libc/string/xpg_strerror_r.c b/newlib/libc/string/xpg_strerror_r.c
index bc1858738..66e693611 100644
--- a/newlib/libc/string/xpg_strerror_r.c
+++ b/newlib/libc/string/xpg_strerror_r.c
@@ -4,8 +4,7 @@
#include <string.h>
int
-_DEFUN (__xpg_strerror_r, (errnum, buffer, n),
- int errnum,
+__xpg_strerror_r (int errnum,
char *buffer,
size_t n)
{
diff --git a/newlib/libc/sys/a29khif/kill.c b/newlib/libc/sys/a29khif/kill.c
index 0254367e4..ecb489e38 100644
--- a/newlib/libc/sys/a29khif/kill.c
+++ b/newlib/libc/sys/a29khif/kill.c
@@ -6,8 +6,7 @@
/* The pid argument should be of type pid_t. */
int
-_DEFUN (_kill, (pid, sig),
- int pid,
+_kill (int pid,
int sig)
{
if (pid == 1 || pid < 0)
diff --git a/newlib/libc/sys/h8300hms/misc.c b/newlib/libc/sys/h8300hms/misc.c
index 4869af2d3..159939391 100644
--- a/newlib/libc/sys/h8300hms/misc.c
+++ b/newlib/libc/sys/h8300hms/misc.c
@@ -7,19 +7,17 @@
/* _raise(), getpid(), and kill() are required by abort().
getpid/kill are prefixed with '_' because of MISSING_SYSCALL_NAMES. */
-int _DEFUN(_raise,(sig),
- int sig)
+int _raise (int sig)
{
return 0;
}
-int _DEFUN(_getpid,(),)
+int _getpid (void)
{
return 0;
}
-int _DEFUN(_kill,(pid, sig),
- int pid,
+int _kill (int pid,
int sig)
{
if (pid == 0)
diff --git a/newlib/libc/sys/h8500hms/misc.c b/newlib/libc/sys/h8500hms/misc.c
index d16c797d9..7f98ffceb 100644
--- a/newlib/libc/sys/h8500hms/misc.c
+++ b/newlib/libc/sys/h8500hms/misc.c
@@ -8,19 +8,17 @@
/* _raise(), getpid(), and kill() are required by abort().
getpid/kill are prefixed with '_' because of MISSING_SYSCALL_NAMES. */
-int _DEFUN(_raise,(sig),
- int sig)
+int _raise (int sig)
{
return 0;
}
-int _DEFUN(_getpid,(),)
+int _getpid (void)
{
return 0;
}
-int _DEFUN(_kill,(pid, sig),
- int pid,
+int _kill (int pid,
int sig)
{
if (sig == SIGABRT)
diff --git a/newlib/libc/sys/linux/ctermid.c b/newlib/libc/sys/linux/ctermid.c
index 05914ffad..bcf36f605 100644
--- a/newlib/libc/sys/linux/ctermid.c
+++ b/newlib/libc/sys/linux/ctermid.c
@@ -6,8 +6,7 @@
static char devname[] = "/dev/tty";
char *
-_DEFUN (ctermid, (buf),
- char *buf)
+ctermid (char *buf)
{
if (buf == NULL)
return devname;
diff --git a/newlib/libc/sys/linux/getpwent.c b/newlib/libc/sys/linux/getpwent.c
index adf607e02..5a60cbc53 100644
--- a/newlib/libc/sys/linux/getpwent.c
+++ b/newlib/libc/sys/linux/getpwent.c
@@ -3,8 +3,7 @@
#include <pwd.h>
struct passwd *
-_DEFUN (getpwnam, (name),
- const char *name)
+getpwnam (const char *name)
{
errno = ENOSYS;
return NULL;
@@ -12,8 +11,7 @@ _DEFUN (getpwnam, (name),
/* FIXME: dummy stub for now. */
struct passwd *
-_DEFUN (getpwuid, (uid),
- uid_t uid)
+getpwuid (uid_t uid)
{
errno = ENOSYS;
return NULL;
@@ -21,8 +19,7 @@ _DEFUN (getpwuid, (uid),
/* FIXME: dummy stub for now. */
struct passwd *
-_DEFUN (getpwent, (uid),
- uid_t uid)
+getpwent (uid_t uid)
{
errno = ENOSYS;
return NULL;
diff --git a/newlib/libc/sys/linux/pread.c b/newlib/libc/sys/linux/pread.c
index 8d905598f..2ff30bd08 100644
--- a/newlib/libc/sys/linux/pread.c
+++ b/newlib/libc/sys/linux/pread.c
@@ -6,8 +6,7 @@
#include <machine/weakalias.h>
ssize_t
-_DEFUN (_pread_r, (rptr, fd, buf, n, off),
- struct _reent *rptr,
+_pread_r (struct _reent *rptr,
int fd,
void *buf,
size_t n,
@@ -33,8 +32,7 @@ _DEFUN (_pread_r, (rptr, fd, buf, n, off),
#ifndef _REENT_ONLY
ssize_t
-_DEFUN (__libc_pread, (fd, buf, n, off),
- int fd,
+__libc_pread (int fd,
void *buf,
size_t n,
off_t off)
diff --git a/newlib/libc/sys/linux/pread64.c b/newlib/libc/sys/linux/pread64.c
index 20d1f9c35..bbf743eb5 100644
--- a/newlib/libc/sys/linux/pread64.c
+++ b/newlib/libc/sys/linux/pread64.c
@@ -30,8 +30,7 @@ Supporting OS subroutine required: <<read>>, <<lseek64>>.
#include <machine/weakalias.h>
ssize_t
-_DEFUN (__libc_pread64, (fd, buf, n, off),
- int fd,
+__libc_pread64 (int fd,
void *buf,
size_t n,
loff_t off)
diff --git a/newlib/libc/sys/linux/pwrite.c b/newlib/libc/sys/linux/pwrite.c
index b0ec9c233..341ca6f07 100644
--- a/newlib/libc/sys/linux/pwrite.c
+++ b/newlib/libc/sys/linux/pwrite.c
@@ -6,8 +6,7 @@
#include <machine/weakalias.h>
ssize_t
-_DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
- struct _reent *rptr,
+_pwrite_r (struct _reent *rptr,
int fd,
const void *buf,
size_t n,
@@ -33,8 +32,7 @@ _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
#ifndef _REENT_ONLY
ssize_t
-_DEFUN (__libc_pwrite, (fd, buf, n, off),
- int fd,
+__libc_pwrite (int fd,
const void *buf,
size_t n,
off_t off)
diff --git a/newlib/libc/sys/linux/pwrite64.c b/newlib/libc/sys/linux/pwrite64.c
index c80a3a2d3..864aa75fe 100644
--- a/newlib/libc/sys/linux/pwrite64.c
+++ b/newlib/libc/sys/linux/pwrite64.c
@@ -30,8 +30,7 @@ Supporting OS subroutine required: <<write>>, <<lseek64>>.
#include <machine/weakalias.h>
ssize_t
-_DEFUN (__libc_pwrite64, (fd, buf, n, off),
- int fd,
+__libc_pwrite64 (int fd,
void *buf,
size_t n,
loff_t off)
diff --git a/newlib/libc/sys/sparc64/ieee.c b/newlib/libc/sys/sparc64/ieee.c
index f3298e63d..42c530ba4 100644
--- a/newlib/libc/sys/sparc64/ieee.c
+++ b/newlib/libc/sys/sparc64/ieee.c
@@ -16,8 +16,7 @@ fpgetround (void)
}
fp_rnd
-_DEFUN(fpsetround,(new),
- fp_rnd new)
+fpsetround (fp_rnd new)
{
fp_rnd old = fpgetround();
char *dummy;
@@ -60,8 +59,7 @@ fpgetmask (void)
}
fp_except
-_DEFUN(fpsetmask,(mask),
- fp_except mask)
+fpsetmask (fp_except mask)
{
fp_except old = fpgetmask();
@@ -85,8 +83,7 @@ _DEFUN(fpsetmask,(mask),
}
fp_except
-_DEFUN(fpsetsticky,(mask),
- fp_except mask)
+fpsetsticky (fp_except mask)
{
return fpsetmask(mask);
}
@@ -98,8 +95,7 @@ fpgetsticky (void)
}
int
-_DEFUN(fpsetroundtoi,(rdi_mode),
- fp_rdi rdi_mode)
+fpsetroundtoi (fp_rdi rdi_mode)
{
return 0;
diff --git a/newlib/libc/sys/sun4/ieee.c b/newlib/libc/sys/sun4/ieee.c
index f3298e63d..42c530ba4 100644
--- a/newlib/libc/sys/sun4/ieee.c
+++ b/newlib/libc/sys/sun4/ieee.c
@@ -16,8 +16,7 @@ fpgetround (void)
}
fp_rnd
-_DEFUN(fpsetround,(new),
- fp_rnd new)
+fpsetround (fp_rnd new)
{
fp_rnd old = fpgetround();
char *dummy;
@@ -60,8 +59,7 @@ fpgetmask (void)
}
fp_except
-_DEFUN(fpsetmask,(mask),
- fp_except mask)
+fpsetmask (fp_except mask)
{
fp_except old = fpgetmask();
@@ -85,8 +83,7 @@ _DEFUN(fpsetmask,(mask),
}
fp_except
-_DEFUN(fpsetsticky,(mask),
- fp_except mask)
+fpsetsticky (fp_except mask)
{
return fpsetmask(mask);
}
@@ -98,8 +95,7 @@ fpgetsticky (void)
}
int
-_DEFUN(fpsetroundtoi,(rdi_mode),
- fp_rdi rdi_mode)
+fpsetroundtoi (fp_rdi rdi_mode)
{
return 0;
diff --git a/newlib/libc/sys/sysnec810/misc.c b/newlib/libc/sys/sysnec810/misc.c
index 354ecd81c..348e7195b 100644
--- a/newlib/libc/sys/sysnec810/misc.c
+++ b/newlib/libc/sys/sysnec810/misc.c
@@ -30,8 +30,7 @@ isatty() {
}
int
-_DEFUN(_fstat,(file, st),
- int file,
+_fstat (int file,
struct stat *st)
{
st->st_mode = S_IFCHR;
diff --git a/newlib/libc/sys/sysvi386/fpx.c b/newlib/libc/sys/sysvi386/fpx.c
index c9ff7c314..957a9b8d8 100644
--- a/newlib/libc/sys/sysvi386/fpx.c
+++ b/newlib/libc/sys/sysvi386/fpx.c
@@ -2,8 +2,7 @@
#include <machine/registers.h>
-fp_except _DEFUN(fpsetmask,(newmask),
- fp_except newmask)
+fp_except fpsetmask (fp_except newmask)
{
fp_except oldmask;
@@ -32,8 +31,7 @@ fp_rnd fpgetround (void)
return tkcw.fp_rounding;
}
-fp_rnd _DEFUN(fpsetround,(rnd),
- fp_rnd rnd)
+fp_rnd fpsetround (fp_rnd rnd)
{
fp_rnd oldrnd;
v60_tkcw_type tkcw;
@@ -56,8 +54,7 @@ fp_rdi fpgetroundtoi (void)
return tkcw.integer_rounding;
}
-fp_rdi _DEFUN(fpsetroundtoi,(rnd),
- fp_rdi rnd)
+fp_rdi fpsetroundtoi (fp_rdi rnd)
{
fp_rdi oldrnd;
v60_tkcw_type tkcw;
diff --git a/newlib/libc/sys/sysvnecv70/fpx.c b/newlib/libc/sys/sysvnecv70/fpx.c
index c9ff7c314..957a9b8d8 100644
--- a/newlib/libc/sys/sysvnecv70/fpx.c
+++ b/newlib/libc/sys/sysvnecv70/fpx.c
@@ -2,8 +2,7 @@
#include <machine/registers.h>
-fp_except _DEFUN(fpsetmask,(newmask),
- fp_except newmask)
+fp_except fpsetmask (fp_except newmask)
{
fp_except oldmask;
@@ -32,8 +31,7 @@ fp_rnd fpgetround (void)
return tkcw.fp_rounding;
}
-fp_rnd _DEFUN(fpsetround,(rnd),
- fp_rnd rnd)
+fp_rnd fpsetround (fp_rnd rnd)
{
fp_rnd oldrnd;
v60_tkcw_type tkcw;
@@ -56,8 +54,7 @@ fp_rdi fpgetroundtoi (void)
return tkcw.integer_rounding;
}
-fp_rdi _DEFUN(fpsetroundtoi,(rnd),
- fp_rdi rnd)
+fp_rdi fpsetroundtoi (fp_rdi rnd)
{
fp_rdi oldrnd;
v60_tkcw_type tkcw;
diff --git a/newlib/libc/syscalls/sysclose.c b/newlib/libc/syscalls/sysclose.c
index 946544bed..44ec36eb3 100644
--- a/newlib/libc/syscalls/sysclose.c
+++ b/newlib/libc/syscalls/sysclose.c
@@ -4,8 +4,7 @@
#include <unistd.h>
int
-_DEFUN (close, (fd),
- int fd)
+close (int fd)
{
return _close_r (_REENT, fd);
}
diff --git a/newlib/libc/syscalls/sysexecve.c b/newlib/libc/syscalls/sysexecve.c
index 1a593117d..52dbaddc3 100644
--- a/newlib/libc/syscalls/sysexecve.c
+++ b/newlib/libc/syscalls/sysexecve.c
@@ -4,8 +4,7 @@
#include <unistd.h>
int
-_DEFUN (execve, (name, argv, env),
- const char *name,
+execve (const char *name,
char *const argv[],
char *const env[])
{
diff --git a/newlib/libc/syscalls/sysfcntl.c b/newlib/libc/syscalls/sysfcntl.c
index b063d766f..feccbf072 100644
--- a/newlib/libc/syscalls/sysfcntl.c
+++ b/newlib/libc/syscalls/sysfcntl.c
@@ -5,8 +5,7 @@
#include <errno.h>
int
-_DEFUN (fcntl, (fd, flag, arg),
- int fd,
+fcntl (int fd,
int flag,
int arg)
{
diff --git a/newlib/libc/syscalls/sysfstat.c b/newlib/libc/syscalls/sysfstat.c
index 1ab7d62fa..c95e9aab1 100644
--- a/newlib/libc/syscalls/sysfstat.c
+++ b/newlib/libc/syscalls/sysfstat.c
@@ -5,8 +5,7 @@
#include <unistd.h>
int
-_DEFUN (fstat, (fd, pstat),
- int fd,
+fstat (int fd,
struct stat *pstat)
{
return _fstat_r (_REENT, fd, pstat);
diff --git a/newlib/libc/syscalls/sysgettod.c b/newlib/libc/syscalls/sysgettod.c
index f52f0045f..e050d35e2 100644
--- a/newlib/libc/syscalls/sysgettod.c
+++ b/newlib/libc/syscalls/sysgettod.c
@@ -5,8 +5,7 @@
#include <sys/time.h>
int
-_DEFUN (gettimeofday, (ptimeval, ptimezone),
- struct timeval *ptimeval,
+gettimeofday (struct timeval *ptimeval,
void *ptimezone)
{
return _gettimeofday_r (_REENT, ptimeval, ptimezone);
diff --git a/newlib/libc/syscalls/sysisatty.c b/newlib/libc/syscalls/sysisatty.c
index 5a6b8d455..697c54bc4 100644
--- a/newlib/libc/syscalls/sysisatty.c
+++ b/newlib/libc/syscalls/sysisatty.c
@@ -4,8 +4,7 @@
#include <unistd.h>
int
-_DEFUN (isatty, (fd),
- int fd)
+isatty (int fd)
{
#ifdef REENTRANT_SYSCALLS_PROVIDED
return _isatty_r (_REENT, fd);
diff --git a/newlib/libc/syscalls/syskill.c b/newlib/libc/syscalls/syskill.c
index 03e06c07a..34b9f17de 100644
--- a/newlib/libc/syscalls/syskill.c
+++ b/newlib/libc/syscalls/syskill.c
@@ -4,8 +4,7 @@
#include <signal.h>
int
-_DEFUN (kill, (pid, sig),
- int pid,
+kill (int pid,
int sig)
{
return _kill_r (_REENT, pid, sig);
diff --git a/newlib/libc/syscalls/syslink.c b/newlib/libc/syscalls/syslink.c
index 188040e4e..2f7dec6f9 100644
--- a/newlib/libc/syscalls/syslink.c
+++ b/newlib/libc/syscalls/syslink.c
@@ -4,8 +4,7 @@
#include <unistd.h>
int
-_DEFUN (link, (old, new),
- const char *old,
+link (const char *old,
const char *new)
{
return _link_r (_REENT, old, new);
diff --git a/newlib/libc/syscalls/syslseek.c b/newlib/libc/syscalls/syslseek.c
index 41cfbf745..4d5edd0f3 100644
--- a/newlib/libc/syscalls/syslseek.c
+++ b/newlib/libc/syscalls/syslseek.c
@@ -4,8 +4,7 @@
#include <unistd.h>
off_t
-_DEFUN (lseek, (fd, pos, whence),
- int fd,
+lseek (int fd,
off_t pos,
int whence)
{
diff --git a/newlib/libc/syscalls/sysopen.c b/newlib/libc/syscalls/sysopen.c
index 36523fc67..4d1a29953 100644
--- a/newlib/libc/syscalls/sysopen.c
+++ b/newlib/libc/syscalls/sysopen.c
@@ -10,8 +10,7 @@
#include <stdarg.h>
int
-_DEFUN (open, (file, flags, ...),
- const char *file,
+open (const char *file,
int flags, ...)
{
va_list ap;
diff --git a/newlib/libc/syscalls/sysread.c b/newlib/libc/syscalls/sysread.c
index e45b76336..25d4e3bcf 100644
--- a/newlib/libc/syscalls/sysread.c
+++ b/newlib/libc/syscalls/sysread.c
@@ -4,8 +4,7 @@
#include <unistd.h>
_READ_WRITE_RETURN_TYPE
-_DEFUN (read, (fd, buf, cnt),
- int fd,
+read (int fd,
void *buf,
size_t cnt)
{
diff --git a/newlib/libc/syscalls/syssbrk.c b/newlib/libc/syscalls/syssbrk.c
index a3e550579..79b876321 100644
--- a/newlib/libc/syscalls/syssbrk.c
+++ b/newlib/libc/syscalls/syssbrk.c
@@ -7,8 +7,7 @@ extern void *_sbrk_r (struct _reent *, ptrdiff_t);
extern void *_sbrk (ptrdiff_t);
void *
-_DEFUN (sbrk, (incr),
- ptrdiff_t incr)
+sbrk (ptrdiff_t incr)
{
return _sbrk_r (_REENT, incr);
}
diff --git a/newlib/libc/syscalls/sysstat.c b/newlib/libc/syscalls/sysstat.c
index 3e0287ec8..0490df164 100644
--- a/newlib/libc/syscalls/sysstat.c
+++ b/newlib/libc/syscalls/sysstat.c
@@ -5,8 +5,7 @@
#include <unistd.h>
int
-_DEFUN (stat, (file, pstat),
- const char *file,
+stat (const char *file,
struct stat *pstat)
{
return _stat_r (_REENT, file, pstat);
diff --git a/newlib/libc/syscalls/systimes.c b/newlib/libc/syscalls/systimes.c
index cc30a3e38..ecd958348 100644
--- a/newlib/libc/syscalls/systimes.c
+++ b/newlib/libc/syscalls/systimes.c
@@ -4,8 +4,7 @@
#include <sys/times.h>
clock_t
-_DEFUN (times, (buf),
- struct tms *buf)
+times (struct tms *buf)
{
return _times_r (_REENT, buf);
}
diff --git a/newlib/libc/syscalls/sysunlink.c b/newlib/libc/syscalls/sysunlink.c
index 06b4fc086..ecd052e7d 100644
--- a/newlib/libc/syscalls/sysunlink.c
+++ b/newlib/libc/syscalls/sysunlink.c
@@ -4,8 +4,7 @@
#include <unistd.h>
int
-_DEFUN (unlink, (file),
- const char *file)
+unlink (const char *file)
{
return _unlink_r (_REENT, file);
}
diff --git a/newlib/libc/syscalls/syswait.c b/newlib/libc/syscalls/syswait.c
index 070160342..25b5c4788 100644
--- a/newlib/libc/syscalls/syswait.c
+++ b/newlib/libc/syscalls/syswait.c
@@ -4,8 +4,7 @@
#include <sys/wait.h>
pid_t
-_DEFUN (wait, (status),
- int *status)
+wait (int *status)
{
return _wait_r (_REENT, status);
}
diff --git a/newlib/libc/syscalls/syswrite.c b/newlib/libc/syscalls/syswrite.c
index 35a1e8430..3b9b878f5 100644
--- a/newlib/libc/syscalls/syswrite.c
+++ b/newlib/libc/syscalls/syswrite.c
@@ -4,8 +4,7 @@
#include <unistd.h>
_READ_WRITE_RETURN_TYPE
-_DEFUN (write, (fd, buf, cnt),
- int fd,
+write (int fd,
const void *buf,
size_t cnt)
{
diff --git a/newlib/libc/time/asctime.c b/newlib/libc/time/asctime.c
index cbecd94f1..9aa26c3dc 100644
--- a/newlib/libc/time/asctime.c
+++ b/newlib/libc/time/asctime.c
@@ -48,8 +48,7 @@ ANSI C requires <<asctime>>.
#ifndef _REENT_ONLY
char *
-_DEFUN (asctime, (tim_p),
- const struct tm *tim_p)
+asctime (const struct tm *tim_p)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/time/asctime_r.c b/newlib/libc/time/asctime_r.c
index 93e3fc27f..3e0864fc8 100644
--- a/newlib/libc/time/asctime_r.c
+++ b/newlib/libc/time/asctime_r.c
@@ -6,8 +6,7 @@
#include <time.h>
char *
-_DEFUN (asctime_r, (tim_p, result),
- const struct tm *__restrict tim_p,
+asctime_r (const struct tm *__restrict tim_p,
char *__restrict result)
{
static const char day_name[7][3] = {
diff --git a/newlib/libc/time/ctime.c b/newlib/libc/time/ctime.c
index f0592f469..58826a6d8 100644
--- a/newlib/libc/time/ctime.c
+++ b/newlib/libc/time/ctime.c
@@ -37,8 +37,7 @@ ANSI C requires <<ctime>>.
#ifndef _REENT_ONLY
char *
-_DEFUN (ctime, (tim_p),
- const time_t * tim_p)
+ctime (const time_t * tim_p)
{
return asctime (localtime (tim_p));
}
diff --git a/newlib/libc/time/ctime_r.c b/newlib/libc/time/ctime_r.c
index 4ab0ba77d..63aee3890 100644
--- a/newlib/libc/time/ctime_r.c
+++ b/newlib/libc/time/ctime_r.c
@@ -5,8 +5,7 @@
#include <time.h>
char *
-_DEFUN (ctime_r, (tim_p, result),
- const time_t * tim_p,
+ctime_r (const time_t * tim_p,
char * result)
{
diff --git a/newlib/libc/time/difftime.c b/newlib/libc/time/difftime.c
index 363eb6482..52ab9d84f 100644
--- a/newlib/libc/time/difftime.c
+++ b/newlib/libc/time/difftime.c
@@ -30,8 +30,7 @@ in all implementations.
#include <time.h>
double
-_DEFUN (difftime, (tim1, tim2),
- time_t tim1,
+difftime (time_t tim1,
time_t tim2)
{
return (double)(tim1 - tim2);
diff --git a/newlib/libc/time/gmtime.c b/newlib/libc/time/gmtime.c
index e74a16157..08e011129 100644
--- a/newlib/libc/time/gmtime.c
+++ b/newlib/libc/time/gmtime.c
@@ -50,8 +50,7 @@ ANSI C requires <<gmtime>>.
#ifndef _REENT_ONLY
struct tm *
-_DEFUN (gmtime, (tim_p),
- const time_t * tim_p)
+gmtime (const time_t * tim_p)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/time/gmtime_r.c b/newlib/libc/time/gmtime_r.c
index dcc5dd166..8bf9ee52d 100644
--- a/newlib/libc/time/gmtime_r.c
+++ b/newlib/libc/time/gmtime_r.c
@@ -46,8 +46,7 @@
#define YEARS_PER_ERA 400
struct tm *
-_DEFUN (gmtime_r, (tim_p, res),
- const time_t *__restrict tim_p,
+gmtime_r (const time_t *__restrict tim_p,
struct tm *__restrict res)
{
long days, rem;
diff --git a/newlib/libc/time/lcltime.c b/newlib/libc/time/lcltime.c
index 493df80d1..ded98c57a 100644
--- a/newlib/libc/time/lcltime.c
+++ b/newlib/libc/time/lcltime.c
@@ -43,8 +43,7 @@ ANSI C requires <<localtime>>.
#ifndef _REENT_ONLY
struct tm *
-_DEFUN (localtime, (tim_p),
- const time_t * tim_p)
+localtime (const time_t * tim_p)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/time/lcltime_r.c b/newlib/libc/time/lcltime_r.c
index 3eba498c3..9b9126bcc 100644
--- a/newlib/libc/time/lcltime_r.c
+++ b/newlib/libc/time/lcltime_r.c
@@ -16,8 +16,7 @@
#include "local.h"
struct tm *
-_DEFUN (localtime_r, (tim_p, res),
- const time_t *__restrict tim_p,
+localtime_r (const time_t *__restrict tim_p,
struct tm *__restrict res)
{
long offset;
diff --git a/newlib/libc/time/mktime.c b/newlib/libc/time/mktime.c
index 1f0d9ba27..9bcef3268 100644
--- a/newlib/libc/time/mktime.c
+++ b/newlib/libc/time/mktime.c
@@ -62,8 +62,7 @@ static const int _DAYS_BEFORE_MONTH[12] =
#define _DAYS_IN_YEAR(year) (_ISLEAP(year) ? 366 : 365)
static void
-_DEFUN(validate_structure, (tim_p),
- struct tm *tim_p)
+validate_structure (struct tm *tim_p)
{
div_t res;
int days_in_feb = 28;
@@ -149,8 +148,7 @@ _DEFUN(validate_structure, (tim_p),
}
time_t
-_DEFUN(mktime, (tim_p),
- struct tm *tim_p)
+mktime (struct tm *tim_p)
{
time_t tim = 0;
long days = 0;
diff --git a/newlib/libc/time/strftime.c b/newlib/libc/time/strftime.c
index 4ed84fb23..3e5e268bc 100644
--- a/newlib/libc/time/strftime.c
+++ b/newlib/libc/time/strftime.c
@@ -348,8 +348,7 @@ static const int dname_len[7] =
-1, 0, or 1 as the adjustment to add to the year for the ISO week
numbering used in "%g%G%V", avoiding overflow. */
static int
-_DEFUN (iso_year_adjust, (tim_p),
- const struct tm *tim_p)
+iso_year_adjust (const struct tm *tim_p)
{
/* Account for fact that tm_year==0 is year 1900. */
int leap = isleap (tim_p->tm_year + (YEAR_BASE
@@ -1431,8 +1430,7 @@ recurse:
}
size_t
-_DEFUN (strftime, (s, maxsize, format, tim_p),
- CHAR *__restrict s,
+strftime (CHAR *__restrict s,
size_t maxsize,
const CHAR *__restrict format,
const struct tm *__restrict tim_p)
diff --git a/newlib/libc/time/time.c b/newlib/libc/time/time.c
index e0c3a8e74..93e061b83 100644
--- a/newlib/libc/time/time.c
+++ b/newlib/libc/time/time.c
@@ -33,8 +33,7 @@ Supporting OS subroutine required: Some implementations require
#include <sys/time.h>
time_t
-_DEFUN (time, (t),
- time_t * t)
+time (time_t * t)
{
struct timeval now;
diff --git a/newlib/libc/time/tzcalc_limits.c b/newlib/libc/time/tzcalc_limits.c
index fe785058d..e0ea6549c 100644
--- a/newlib/libc/time/tzcalc_limits.c
+++ b/newlib/libc/time/tzcalc_limits.c
@@ -11,8 +11,7 @@
#include "local.h"
int
-_DEFUN (__tzcalc_limits, (year),
- int year)
+__tzcalc_limits (int year)
{
int days, year_days, years;
int i, j;
diff --git a/newlib/libc/time/tzset_r.c b/newlib/libc/time/tzset_r.c
index 211ddc8af..9e0cf834b 100644
--- a/newlib/libc/time/tzset_r.c
+++ b/newlib/libc/time/tzset_r.c
@@ -14,8 +14,7 @@ static char __tzname_dst[11];
static char *prev_tzenv = NULL;
void
-_DEFUN (_tzset_unlocked_r, (reent_ptr),
- struct _reent *reent_ptr)
+_tzset_unlocked_r (struct _reent *reent_ptr)
{
char *tzenv;
unsigned short hh, mm, ss, m, w, d;
@@ -184,8 +183,7 @@ _DEFUN (_tzset_unlocked_r, (reent_ptr),
}
void
-_DEFUN (_tzset_r, (reent_ptr),
- struct _reent *reent_ptr)
+_tzset_r (struct _reent *reent_ptr)
{
TZ_LOCK;
_tzset_unlocked_r (reent_ptr);
diff --git a/newlib/libc/unix/basename.c b/newlib/libc/unix/basename.c
index 3a9cc0c19..7a28ac51b 100644
--- a/newlib/libc/unix/basename.c
+++ b/newlib/libc/unix/basename.c
@@ -8,8 +8,7 @@
#include <string.h>
char*
-_DEFUN (basename, (path),
- char *path)
+basename (char *path)
{
char *p;
if( path == NULL || *path == '\0' )
diff --git a/newlib/libc/unix/dirname.c b/newlib/libc/unix/dirname.c
index 164da7f78..7d8d6f024 100644
--- a/newlib/libc/unix/dirname.c
+++ b/newlib/libc/unix/dirname.c
@@ -9,8 +9,7 @@
#include <string.h>
char *
-_DEFUN (dirname, (path),
- char *path)
+dirname (char *path)
{
char *p;
if( path == NULL || *path == '\0' )
diff --git a/newlib/libc/unix/pread.c b/newlib/libc/unix/pread.c
index 54efe29fe..61daac3b4 100644
--- a/newlib/libc/unix/pread.c
+++ b/newlib/libc/unix/pread.c
@@ -38,8 +38,7 @@ Supporting OS subroutine required: <<read>>, <<lseek>>.
#include <reent.h>
ssize_t
-_DEFUN (_pread_r, (rptr, fd, buf, n, off),
- struct _reent *rptr,
+_pread_r (struct _reent *rptr,
int fd,
void *buf,
size_t n,
@@ -65,8 +64,7 @@ _DEFUN (_pread_r, (rptr, fd, buf, n, off),
#ifndef _REENT_ONLY
ssize_t
-_DEFUN (pread, (fd, buf, n, off),
- int fd,
+pread (int fd,
void *buf,
size_t n,
off_t off)
diff --git a/newlib/libc/unix/pwrite.c b/newlib/libc/unix/pwrite.c
index 939d186d4..60166c9f9 100644
--- a/newlib/libc/unix/pwrite.c
+++ b/newlib/libc/unix/pwrite.c
@@ -39,8 +39,7 @@ Supporting OS subroutine required: <<write>>, <<lseek>>.
#include <reent.h>
ssize_t
-_DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
- struct _reent *rptr,
+_pwrite_r (struct _reent *rptr,
int fd,
const void *buf,
size_t n,
@@ -66,8 +65,7 @@ _DEFUN (_pwrite_r, (rptr, fd, buf, n, off),
#ifndef _REENT_ONLY
ssize_t
-_DEFUN (pwrite, (fd, buf, n, off),
- int fd,
+pwrite (int fd,
const void *buf,
size_t n,
off_t off)
diff --git a/newlib/libc/unix/ttyname.c b/newlib/libc/unix/ttyname.c
index b36bb7408..a9a4a5bb4 100644
--- a/newlib/libc/unix/ttyname.c
+++ b/newlib/libc/unix/ttyname.c
@@ -41,8 +41,7 @@ static char ttyname_buf[TTYNAME_BUFSIZE] = _PATH_DEV;
* ttyname() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name
*/
char *
-_DEFUN( ttyname,(fd),
- int fd)
+ ttyname (int fd)
{
register int fail;
register char *ret=NULL;
diff --git a/newlib/libc/unix/ttyname_r.c b/newlib/libc/unix/ttyname_r.c
index 673e7f543..fd3b504a7 100644
--- a/newlib/libc/unix/ttyname_r.c
+++ b/newlib/libc/unix/ttyname_r.c
@@ -44,8 +44,7 @@
* ttyname_r() - POSIX 1003.1b 4.7.2 - Determine Terminal Device Name
*/
int
-_DEFUN( ttyname_r,(fd, name, namesize),
- int fd,
+ ttyname_r (int fd,
char *name,
size_t namesize)
{
diff --git a/newlib/libc/xdr/xdr.c b/newlib/libc/xdr/xdr.c
index b60a89782..075093014 100644
--- a/newlib/libc/xdr/xdr.c
+++ b/newlib/libc/xdr/xdr.c
@@ -62,8 +62,7 @@ static const char xdr_zero[BYTES_PER_XDR_UNIT] = { 0, 0, 0, 0 };
* Not a filter, but a convenient utility nonetheless
*/
void
-_DEFUN (xdr_free, (proc, objp),
- xdrproc_t proc,
+xdr_free (xdrproc_t proc,
void * objp)
{
XDR x;
@@ -86,8 +85,7 @@ xdr_void (void)
* XDR integers
*/
bool_t
-_DEFUN (xdr_int, (xdrs, ip),
- XDR * xdrs,
+xdr_int (XDR * xdrs,
int * ip)
{
#if INT_MAX < LONG_MAX
@@ -121,8 +119,7 @@ _DEFUN (xdr_int, (xdrs, ip),
* XDR unsigned integers
*/
bool_t
-_DEFUN (xdr_u_int, (xdrs, up),
- XDR * xdrs,
+xdr_u_int (XDR * xdrs,
u_int * up)
{
#if UINT_MAX < ULONG_MAX
@@ -156,8 +153,7 @@ _DEFUN (xdr_u_int, (xdrs, up),
* XDR long integers
*/
bool_t
-_DEFUN (xdr_long, (xdrs, lp),
- XDR * xdrs,
+xdr_long (XDR * xdrs,
long * lp)
{
if ((xdrs->x_op == XDR_ENCODE)
@@ -177,8 +173,7 @@ _DEFUN (xdr_long, (xdrs, lp),
* XDR unsigned long integers
*/
bool_t
-_DEFUN (xdr_u_long, (xdrs, ulp),
- XDR * xdrs,
+xdr_u_long (XDR * xdrs,
u_long * ulp)
{
switch (xdrs->x_op)
@@ -208,8 +203,7 @@ _DEFUN (xdr_u_long, (xdrs, ulp),
* XDR 32-bit integers
*/
bool_t
-_DEFUN (xdr_int32_t, (xdrs, int32_p),
- XDR * xdrs,
+xdr_int32_t (XDR * xdrs,
int32_t * int32_p)
{
switch (xdrs->x_op)
@@ -230,8 +224,7 @@ _DEFUN (xdr_int32_t, (xdrs, int32_p),
* XDR unsigned 32-bit integers
*/
bool_t
-_DEFUN (xdr_u_int32_t, (xdrs, u_int32_p),
- XDR * xdrs,
+xdr_u_int32_t (XDR * xdrs,
u_int32_t * u_int32_p)
{
switch (xdrs->x_op)
@@ -252,8 +245,7 @@ _DEFUN (xdr_u_int32_t, (xdrs, u_int32_p),
* XDR unsigned 32-bit integers
*/
bool_t
-_DEFUN (xdr_uint32_t, (xdrs, uint32_p),
- XDR * xdrs,
+xdr_uint32_t (XDR * xdrs,
uint32_t * uint32_p)
{
switch (xdrs->x_op)
@@ -274,8 +266,7 @@ _DEFUN (xdr_uint32_t, (xdrs, uint32_p),
* XDR short integers
*/
bool_t
-_DEFUN (xdr_short, (xdrs, sp),
- XDR * xdrs,
+xdr_short (XDR * xdrs,
short * sp)
{
long l;
@@ -302,8 +293,7 @@ _DEFUN (xdr_short, (xdrs, sp),
* XDR unsigned short integers
*/
bool_t
-_DEFUN (xdr_u_short, (xdrs, usp),
- XDR * xdrs,
+xdr_u_short (XDR * xdrs,
u_short * usp)
{
long l;
@@ -331,8 +321,7 @@ _DEFUN (xdr_u_short, (xdrs, usp),
* XDR 16-bit integers
*/
bool_t
-_DEFUN (xdr_int16_t, (xdrs, int16_p),
- XDR * xdrs,
+xdr_int16_t (XDR * xdrs,
int16_t * int16_p)
{
int32_t t;
@@ -359,8 +348,7 @@ _DEFUN (xdr_int16_t, (xdrs, int16_p),
* XDR unsigned 16-bit integers
*/
bool_t
-_DEFUN (xdr_u_int16_t, (xdrs, u_int16_p),
- XDR * xdrs,
+xdr_u_int16_t (XDR * xdrs,
u_int16_t * u_int16_p)
{
uint32_t ut;
@@ -387,8 +375,7 @@ _DEFUN (xdr_u_int16_t, (xdrs, u_int16_p),
* XDR unsigned 16-bit integers
*/
bool_t
-_DEFUN (xdr_uint16_t, (xdrs, uint16_p),
- XDR * xdrs,
+xdr_uint16_t (XDR * xdrs,
uint16_t * uint16_p)
{
uint32_t ut;
@@ -415,8 +402,7 @@ _DEFUN (xdr_uint16_t, (xdrs, uint16_p),
* XDR 8-bit integers
*/
bool_t
-_DEFUN (xdr_int8_t, (xdrs, int8_p),
- XDR * xdrs,
+xdr_int8_t (XDR * xdrs,
int8_t * int8_p)
{
int32_t t;
@@ -443,8 +429,7 @@ _DEFUN (xdr_int8_t, (xdrs, int8_p),
* XDR unsigned 8-bit integers
*/
bool_t
-_DEFUN (xdr_u_int8_t, (xdrs, u_int8_p),
- XDR * xdrs,
+xdr_u_int8_t (XDR * xdrs,
u_int8_t * u_int8_p)
{
uint32_t ut;
@@ -471,8 +456,7 @@ _DEFUN (xdr_u_int8_t, (xdrs, u_int8_p),
* XDR unsigned 8-bit integers
*/
bool_t
-_DEFUN (xdr_uint8_t, (xdrs, uint8_p),
- XDR * xdrs,
+xdr_uint8_t (XDR * xdrs,
uint8_t * uint8_p)
{
uint32_t ut;
@@ -501,8 +485,7 @@ _DEFUN (xdr_uint8_t, (xdrs, uint8_p),
* XDR a char
*/
bool_t
-_DEFUN (xdr_char, (xdrs, cp),
- XDR * xdrs,
+xdr_char (XDR * xdrs,
char * cp)
{
int i;
@@ -518,8 +501,7 @@ _DEFUN (xdr_char, (xdrs, cp),
* XDR an unsigned char
*/
bool_t
-_DEFUN (xdr_u_char, (xdrs, ucp),
- XDR * xdrs,
+xdr_u_char (XDR * xdrs,
u_char * ucp)
{
u_int u;
@@ -535,8 +517,7 @@ _DEFUN (xdr_u_char, (xdrs, ucp),
* XDR booleans
*/
bool_t
-_DEFUN (xdr_bool, (xdrs, bp),
- XDR * xdrs,
+xdr_bool (XDR * xdrs,
bool_t * bp)
{
long lb;
@@ -563,8 +544,7 @@ _DEFUN (xdr_bool, (xdrs, bp),
* XDR enumerations
*/
bool_t
-_DEFUN (xdr_enum, (xdrs, ep),
- XDR * xdrs,
+xdr_enum (XDR * xdrs,
enum_t * ep)
{
enum sizecheck
@@ -607,8 +587,7 @@ _DEFUN (xdr_enum, (xdrs, ep),
* cp points to the opaque object and cnt gives the byte length.
*/
bool_t
-_DEFUN (xdr_opaque, (xdrs, cp, cnt),
- XDR * xdrs,
+xdr_opaque (XDR * xdrs,
caddr_t cp,
u_int cnt)
{
@@ -656,8 +635,7 @@ _DEFUN (xdr_opaque, (xdrs, cp, cnt),
* If *cpp is NULL maxsize bytes are allocated
*/
bool_t
-_DEFUN (xdr_bytes, (xdrs, cpp, sizep, maxsize),
- XDR * xdrs,
+xdr_bytes (XDR * xdrs,
char ** cpp,
u_int * sizep,
u_int maxsize)
@@ -711,8 +689,7 @@ _DEFUN (xdr_bytes, (xdrs, cpp, sizep, maxsize),
* Implemented here due to commonality of the object.
*/
bool_t
-_DEFUN (xdr_netobj, (xdrs, np),
- XDR * xdrs,
+xdr_netobj (XDR * xdrs,
struct netobj * np)
{
return (xdr_bytes (xdrs, &np->n_bytes, &np->n_len, MAX_NETOBJ_SZ));
@@ -734,8 +711,7 @@ _DEFUN (xdr_netobj, (xdrs, np),
* dfault: default xdr routine
*/
bool_t
-_DEFUN (xdr_union, (xdrs, dscmp, unp, choices, dfault),
- XDR * xdrs,
+xdr_union (XDR * xdrs,
enum_t * dscmp,
char * unp,
const struct xdr_discrim * choices,
@@ -783,8 +759,7 @@ _DEFUN (xdr_union, (xdrs, dscmp, unp, choices, dfault),
* of the string as specified by a protocol.
*/
bool_t
-_DEFUN (xdr_string, (xdrs, cpp, maxsize),
- XDR * xdrs,
+xdr_string (XDR * xdrs,
char ** cpp,
u_int maxsize)
{
@@ -861,8 +836,7 @@ _DEFUN (xdr_string, (xdrs, cpp, maxsize),
* routines like clnt_call
*/
bool_t
-_DEFUN (xdr_wrapstring, (xdrs, cpp),
- XDR * xdrs,
+xdr_wrapstring (XDR * xdrs,
char ** cpp)
{
return xdr_string (xdrs, cpp, LASTUNSIGNED);
@@ -882,8 +856,7 @@ _DEFUN (xdr_wrapstring, (xdrs, cpp),
* XDR 64-bit integers
*/
bool_t
-_DEFUN (xdr_int64_t, (xdrs, llp),
- XDR * xdrs,
+xdr_int64_t (XDR * xdrs,
int64_t * llp)
{
int32_t t1, t2;
@@ -913,8 +886,7 @@ _DEFUN (xdr_int64_t, (xdrs, llp),
* XDR unsigned 64-bit integers
*/
bool_t
-_DEFUN (xdr_u_int64_t, (xdrs, ullp),
- XDR * xdrs,
+xdr_u_int64_t (XDR * xdrs,
u_int64_t * ullp)
{
uint32_t t1, t2;
@@ -945,8 +917,7 @@ _DEFUN (xdr_u_int64_t, (xdrs, ullp),
* XDR unsigned 64-bit integers
*/
bool_t
-_DEFUN (xdr_uint64_t, (xdrs, ullp),
- XDR * xdrs,
+xdr_uint64_t (XDR * xdrs,
uint64_t * ullp)
{
uint32_t t1, t2;
@@ -978,8 +949,7 @@ _DEFUN (xdr_uint64_t, (xdrs, ullp),
* XDR hypers
*/
bool_t
-_DEFUN (xdr_hyper, (xdrs, llp),
- XDR * xdrs,
+xdr_hyper (XDR * xdrs,
quad_t * llp)
{
/*
@@ -994,8 +964,7 @@ _DEFUN (xdr_hyper, (xdrs, llp),
* XDR unsigned hypers
*/
bool_t
-_DEFUN (xdr_u_hyper, (xdrs, ullp),
- XDR * xdrs,
+xdr_u_hyper (XDR * xdrs,
u_quad_t * ullp)
{
/*
@@ -1010,8 +979,7 @@ _DEFUN (xdr_u_hyper, (xdrs, ullp),
* XDR longlong_t's
*/
bool_t
-_DEFUN (xdr_longlong_t, (xdrs, llp),
- XDR * xdrs,
+xdr_longlong_t (XDR * xdrs,
quad_t * llp)
{
/*
@@ -1026,8 +994,7 @@ _DEFUN (xdr_longlong_t, (xdrs, llp),
* XDR u_longlong_t's
*/
bool_t
-_DEFUN (xdr_u_longlong_t, (xdrs, ullp),
- XDR * xdrs,
+xdr_u_longlong_t (XDR * xdrs,
u_quad_t *ullp)
{
/*
diff --git a/newlib/libc/xdr/xdr_array.c b/newlib/libc/xdr/xdr_array.c
index 9c9748725..77e7164d2 100644
--- a/newlib/libc/xdr/xdr_array.c
+++ b/newlib/libc/xdr/xdr_array.c
@@ -54,8 +54,7 @@
* xdr procedure to call to handle each element of the array.
*/
bool_t
-_DEFUN (xdr_array, (xdrs, addrp, sizep, maxsize, elsize, elproc),
- XDR * xdrs,
+xdr_array (XDR * xdrs,
caddr_t * addrp,
u_int * sizep,
u_int maxsize,
@@ -138,8 +137,7 @@ _DEFUN (xdr_array, (xdrs, addrp, sizep, maxsize, elsize, elproc),
* > xdr_elem: routine to XDR each element
*/
bool_t
-_DEFUN (xdr_vector, (xdrs, basep, nelem, elemsize, xdr_elem),
- XDR * xdrs,
+xdr_vector (XDR * xdrs,
char *basep,
u_int nelem,
u_int elemsize,
diff --git a/newlib/libc/xdr/xdr_float.c b/newlib/libc/xdr/xdr_float.c
index 691e92965..e19b1ef9e 100644
--- a/newlib/libc/xdr/xdr_float.c
+++ b/newlib/libc/xdr/xdr_float.c
@@ -59,8 +59,7 @@
#if defined(__IEEE_LITTLE_ENDIAN) || defined(__IEEE_BIG_ENDIAN)
bool_t
-_DEFUN (xdr_float, (xdrs, fp),
- XDR * xdrs,
+xdr_float (XDR * xdrs,
float *fp)
{
switch (xdrs->x_op)
@@ -80,8 +79,7 @@ _DEFUN (xdr_float, (xdrs, fp),
#if !defined(_DOUBLE_IS_32BITS)
bool_t
-_DEFUN (xdr_double, (xdrs, dp),
- XDR * xdrs,
+xdr_double (XDR * xdrs,
double *dp)
{
int32_t *i32p;
diff --git a/newlib/libc/xdr/xdr_float_vax.c b/newlib/libc/xdr/xdr_float_vax.c
index ed943480f..09c24b03e 100644
--- a/newlib/libc/xdr/xdr_float_vax.c
+++ b/newlib/libc/xdr/xdr_float_vax.c
@@ -81,8 +81,7 @@ static struct sgl_limits
*/
bool_t
-_DEFUN (xdr_float, (xdrs, fp),
- XDR * xdrs,
+xdr_float (XDR * xdrs,
float *fp)
{
struct ieee_single is;
@@ -184,8 +183,7 @@ static struct dbl_limits
*/
bool_t
-_DEFUN (xdr_double, (xdrs, dp),
- XDR * xdrs,
+xdr_double (XDR * xdrs,
double *dp)
{
int32_t *lp;
diff --git a/newlib/libc/xdr/xdr_mem.c b/newlib/libc/xdr/xdr_mem.c
index 16d128774..3187ade74 100644
--- a/newlib/libc/xdr/xdr_mem.c
+++ b/newlib/libc/xdr/xdr_mem.c
@@ -101,8 +101,7 @@ static const struct xdr_ops xdrmem_ops_unaligned = {
* memory buffer.
*/
void
-_DEFUN (xdrmem_create, (xdrs, addr, size, op),
- XDR * xdrs,
+xdrmem_create (XDR * xdrs,
caddr_t addr,
u_int size,
enum xdr_op op)
@@ -116,14 +115,12 @@ _DEFUN (xdrmem_create, (xdrs, addr, size, op),
}
static void
-_DEFUN (xdrmem_destroy, (xdrs),
- XDR * xdrs)
+xdrmem_destroy (XDR * xdrs)
{
}
static bool_t
-_DEFUN (xdrmem_getlong_aligned, (xdrs, lp),
- XDR * xdrs,
+xdrmem_getlong_aligned (XDR * xdrs,
long *lp)
{
if (xdrs->x_handy < sizeof (int32_t))
@@ -135,8 +132,7 @@ _DEFUN (xdrmem_getlong_aligned, (xdrs, lp),
}
static bool_t
-_DEFUN (xdrmem_putlong_aligned, (xdrs, lp),
- XDR * xdrs,
+xdrmem_putlong_aligned (XDR * xdrs,
const long *lp)
{
if (xdrs->x_handy < sizeof (int32_t))
@@ -148,8 +144,7 @@ _DEFUN (xdrmem_putlong_aligned, (xdrs, lp),
}
static bool_t
-_DEFUN (xdrmem_getlong_unaligned, (xdrs, lp),
- XDR * xdrs,
+xdrmem_getlong_unaligned (XDR * xdrs,
long *lp)
{
u_int32_t l;
@@ -164,8 +159,7 @@ _DEFUN (xdrmem_getlong_unaligned, (xdrs, lp),
}
static bool_t
-_DEFUN (xdrmem_putlong_unaligned, (xdrs, lp),
- XDR * xdrs,
+xdrmem_putlong_unaligned (XDR * xdrs,
const long *lp)
{
u_int32_t l;
@@ -180,8 +174,7 @@ _DEFUN (xdrmem_putlong_unaligned, (xdrs, lp),
}
static bool_t
-_DEFUN (xdrmem_getbytes, (xdrs, addr, len),
- XDR * xdrs,
+xdrmem_getbytes (XDR * xdrs,
char *addr,
u_int len)
{
@@ -194,8 +187,7 @@ _DEFUN (xdrmem_getbytes, (xdrs, addr, len),
}
static bool_t
-_DEFUN (xdrmem_putbytes, (xdrs, addr, len),
- XDR * xdrs,
+xdrmem_putbytes (XDR * xdrs,
const char *addr,
u_int len)
{
@@ -208,16 +200,14 @@ _DEFUN (xdrmem_putbytes, (xdrs, addr, len),
}
static u_int
-_DEFUN (xdrmem_getpos, (xdrs),
- XDR * xdrs)
+xdrmem_getpos (XDR * xdrs)
{
/* XXX w/64-bit pointers, u_int not enough! */
return (u_int) ((u_long) xdrs->x_private - (u_long) xdrs->x_base);
}
static bool_t
-_DEFUN (xdrmem_setpos, (xdrs, pos),
- XDR * xdrs,
+xdrmem_setpos (XDR * xdrs,
u_int pos)
{
caddr_t newaddr = xdrs->x_base + pos;
@@ -236,8 +226,7 @@ _DEFUN (xdrmem_setpos, (xdrs, pos),
}
static int32_t *
-_DEFUN (xdrmem_inline_aligned, (xdrs, len),
- XDR * xdrs,
+xdrmem_inline_aligned (XDR * xdrs,
u_int len)
{
int32_t *buf = 0;
@@ -252,16 +241,14 @@ _DEFUN (xdrmem_inline_aligned, (xdrs, len),
}
static int32_t *
-_DEFUN (xdrmem_inline_unaligned, (xdrs, len),
- XDR * xdrs,
+xdrmem_inline_unaligned (XDR * xdrs,
u_int len)
{
return (0);
}
static bool_t
-_DEFUN (xdrmem_getint32_aligned, (xdrs, ip),
- XDR *xdrs,
+xdrmem_getint32_aligned (XDR *xdrs,
int32_t *ip)
{
if (xdrs->x_handy < sizeof(int32_t))
@@ -273,8 +260,7 @@ _DEFUN (xdrmem_getint32_aligned, (xdrs, ip),
}
static bool_t
-_DEFUN (xdrmem_putint32_aligned, (xdrs, ip),
- XDR *xdrs,
+xdrmem_putint32_aligned (XDR *xdrs,
const int32_t *ip)
{
if (xdrs->x_handy < sizeof(int32_t))
@@ -286,8 +272,7 @@ _DEFUN (xdrmem_putint32_aligned, (xdrs, ip),
}
static bool_t
-_DEFUN (xdrmem_getint32_unaligned, (xdrs, ip),
- XDR *xdrs,
+xdrmem_getint32_unaligned (XDR *xdrs,
int32_t *ip)
{
u_int32_t l;
@@ -302,8 +287,7 @@ _DEFUN (xdrmem_getint32_unaligned, (xdrs, ip),
}
static bool_t
-_DEFUN (xdrmem_putint32_unaligned, (xdrs, ip),
- XDR *xdrs,
+xdrmem_putint32_unaligned (XDR *xdrs,
const int32_t *ip)
{
u_int32_t l;
diff --git a/newlib/libc/xdr/xdr_private.c b/newlib/libc/xdr/xdr_private.c
index 64eac9d23..cad6b7e82 100644
--- a/newlib/libc/xdr/xdr_private.c
+++ b/newlib/libc/xdr/xdr_private.c
@@ -26,8 +26,7 @@
static xdr_vprintf_t xdr_vprintf = NULL;
xdr_vprintf_t
-_DEFUN (xdr_set_vprintf, (fnptr),
- xdr_vprintf_t fnptr)
+xdr_set_vprintf (xdr_vprintf_t fnptr)
{
xdr_vprintf_t tmp = xdr_vprintf;
xdr_vprintf = fnptr;
@@ -35,8 +34,7 @@ _DEFUN (xdr_set_vprintf, (fnptr),
}
void
-_DEFUN (xdr_vwarnx, (format, ap),
- const char *format,
+xdr_vwarnx (const char *format,
va_list ap)
{
if (xdr_vprintf)
@@ -48,8 +46,7 @@ _DEFUN (xdr_vwarnx, (format, ap),
}
void
-_DEFUN (xdr_warnx, (fmt),
- const char *fmt, ...)
+xdr_warnx (const char *fmt, ...)
{
va_list ap;
va_start (ap, fmt);
diff --git a/newlib/libc/xdr/xdr_rec.c b/newlib/libc/xdr/xdr_rec.c
index 367c3cb64..f46a9a3fa 100644
--- a/newlib/libc/xdr/xdr_rec.c
+++ b/newlib/libc/xdr/xdr_rec.c
@@ -169,8 +169,7 @@ bool_t _EXFUN (__xdrrec_setnonblock, (XDR *, int));
* calls except that they take an opaque handle rather than an fd.
*/
void
-_DEFUN (xdrrec_create, (xdrs, sendsize, recvsize, tcp_handle, readit, writeit),
- XDR * xdrs,
+xdrrec_create (XDR * xdrs,
u_int sendsize,
u_int recvsize,
void *tcp_handle,
@@ -261,8 +260,7 @@ _DEFUN (xdrrec_create, (xdrs, sendsize, recvsize, tcp_handle, readit, writeit),
*/
static bool_t
-_DEFUN (xdrrec_getlong, (xdrs, lp),
- XDR * xdrs,
+xdrrec_getlong (XDR * xdrs,
long *lp)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -288,8 +286,7 @@ _DEFUN (xdrrec_getlong, (xdrs, lp),
}
static bool_t
-_DEFUN (xdrrec_putlong, (xdrs, lp),
- XDR * xdrs,
+xdrrec_putlong (XDR * xdrs,
const long *lp)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -313,8 +310,7 @@ _DEFUN (xdrrec_putlong, (xdrs, lp),
}
static bool_t /* must manage buffers, fragments, and records */
-_DEFUN (xdrrec_getbytes, (xdrs, addr, len),
- XDR * xdrs,
+xdrrec_getbytes (XDR * xdrs,
char *addr,
u_int len)
{
@@ -343,8 +339,7 @@ _DEFUN (xdrrec_getbytes, (xdrs, addr, len),
}
static bool_t
-_DEFUN (xdrrec_putbytes, (xdrs, addr, len),
- XDR * xdrs,
+xdrrec_putbytes (XDR * xdrs,
const char *addr,
u_int len)
{
@@ -371,8 +366,7 @@ _DEFUN (xdrrec_putbytes, (xdrs, addr, len),
}
static u_int
-_DEFUN (xdrrec_getpos, (xdrs),
- XDR * xdrs)
+xdrrec_getpos (XDR * xdrs)
{
RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
off_t pos;
@@ -398,8 +392,7 @@ _DEFUN (xdrrec_getpos, (xdrs),
}
static bool_t
-_DEFUN (xdrrec_setpos, (xdrs, pos),
- XDR * xdrs,
+xdrrec_setpos (XDR * xdrs,
u_int pos)
{
RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
@@ -439,8 +432,7 @@ _DEFUN (xdrrec_setpos, (xdrs, pos),
}
static int32_t *
-_DEFUN (xdrrec_inline, (xdrs, len),
- XDR * xdrs,
+xdrrec_inline (XDR * xdrs,
u_int len)
{
RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
@@ -482,8 +474,7 @@ _DEFUN (xdrrec_inline, (xdrs, len),
}
static void
-_DEFUN (xdrrec_destroy, (xdrs),
- XDR * xdrs)
+xdrrec_destroy (XDR * xdrs)
{
RECSTREAM *rstrm = (RECSTREAM *) xdrs->x_private;
@@ -493,8 +484,7 @@ _DEFUN (xdrrec_destroy, (xdrs),
}
static bool_t
-_DEFUN (xdrrec_getint32, (xdrs, ip),
- XDR *xdrs,
+xdrrec_getint32 (XDR *xdrs,
int32_t *ip)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -520,8 +510,7 @@ _DEFUN (xdrrec_getint32, (xdrs, ip),
}
static bool_t
-_DEFUN (xdrrec_putint32, (xdrs, ip),
- XDR *xdrs,
+xdrrec_putint32 (XDR *xdrs,
const int32_t *ip)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -553,8 +542,7 @@ _DEFUN (xdrrec_putint32, (xdrs, ip),
* this procedure to guarantee proper record alignment.
*/
bool_t
-_DEFUN (xdrrec_skiprecord, (xdrs),
- XDR * xdrs)
+xdrrec_skiprecord (XDR * xdrs)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
enum xprt_stat xstat;
@@ -592,8 +580,7 @@ _DEFUN (xdrrec_skiprecord, (xdrs),
* after consuming the rest of the current record.
*/
bool_t
-_DEFUN (xdrrec_eof, (xdrs),
- XDR * xdrs)
+xdrrec_eof (XDR * xdrs)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -617,8 +604,7 @@ _DEFUN (xdrrec_eof, (xdrs),
* pipelined procedure calls.) TRUE => immmediate flush to tcp connection.
*/
bool_t
-_DEFUN (xdrrec_endofrecord, (xdrs, sendnow),
- XDR * xdrs,
+xdrrec_endofrecord (XDR * xdrs,
bool_t sendnow)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -644,8 +630,7 @@ _DEFUN (xdrrec_endofrecord, (xdrs, sendnow),
* Return true if a record is available in the buffer, false if not.
*/
bool_t
-_DEFUN (__xdrrec_getrec, (xdrs, statp, expectdata),
- XDR * xdrs,
+__xdrrec_getrec (XDR * xdrs,
enum xprt_stat * statp,
bool_t expectdata)
{
@@ -737,8 +722,7 @@ _DEFUN (__xdrrec_getrec, (xdrs, statp, expectdata),
}
bool_t
-_DEFUN (__xdrrec_setnonblock, (xdrs, maxrec),
- XDR * xdrs,
+__xdrrec_setnonblock (XDR * xdrs,
int maxrec)
{
RECSTREAM *rstrm = (RECSTREAM *) (xdrs->x_private);
@@ -754,8 +738,7 @@ _DEFUN (__xdrrec_setnonblock, (xdrs, maxrec),
* Internal useful routines
*/
static bool_t
-_DEFUN (flush_out, (rstrm, eor),
- RECSTREAM * rstrm,
+flush_out (RECSTREAM * rstrm,
bool_t eor)
{
u_int32_t eormask = (eor == TRUE) ? LAST_FRAG : 0;
@@ -775,8 +758,7 @@ _DEFUN (flush_out, (rstrm, eor),
}
static bool_t /* knows nothing about records! Only about input buffers */
-_DEFUN (fill_input_buf, (rstrm),
- RECSTREAM * rstrm)
+fill_input_buf (RECSTREAM * rstrm)
{
char *where;
u_int32_t i;
@@ -798,8 +780,7 @@ _DEFUN (fill_input_buf, (rstrm),
}
static bool_t /* knows nothing about records! Only about input buffers */
-_DEFUN (get_input_bytes, (rstrm, addr, len),
- RECSTREAM * rstrm,
+get_input_bytes (RECSTREAM * rstrm,
char *addr,
size_t len)
{
@@ -834,8 +815,7 @@ _DEFUN (get_input_bytes, (rstrm, addr, len),
}
static bool_t /* next two bytes of the input stream are treated as a header */
-_DEFUN (set_input_fragment, (rstrm),
- RECSTREAM * rstrm)
+set_input_fragment (RECSTREAM * rstrm)
{
u_int32_t header;
@@ -860,8 +840,7 @@ _DEFUN (set_input_fragment, (rstrm),
}
static bool_t /* consumes input bytes; knows nothing about records! */
-_DEFUN (skip_input_bytes, (rstrm, cnt),
- RECSTREAM * rstrm,
+skip_input_bytes (RECSTREAM * rstrm,
long cnt)
{
size_t current;
@@ -884,8 +863,7 @@ _DEFUN (skip_input_bytes, (rstrm, cnt),
}
static u_int
-_DEFUN (fix_buf_size, (s),
- u_int s)
+fix_buf_size (u_int s)
{
if (s < 100)
@@ -897,8 +875,7 @@ _DEFUN (fix_buf_size, (s),
* Reallocate the input buffer for a non-block stream.
*/
static bool_t
-_DEFUN (realloc_stream, (rstrm, size),
- RECSTREAM * rstrm,
+realloc_stream (RECSTREAM * rstrm,
int size)
{
ptrdiff_t diff;
diff --git a/newlib/libc/xdr/xdr_reference.c b/newlib/libc/xdr/xdr_reference.c
index 7a5f1d851..eba4b8355 100644
--- a/newlib/libc/xdr/xdr_reference.c
+++ b/newlib/libc/xdr/xdr_reference.c
@@ -56,8 +56,7 @@
* proc is the routine to handle the referenced structure.
*/
bool_t
-_DEFUN (xdr_reference, (xdrs, pp, size, proc),
- XDR * xdrs,
+xdr_reference (XDR * xdrs,
caddr_t * pp,
u_int size,
xdrproc_t proc)
@@ -117,8 +116,7 @@ _DEFUN (xdr_reference, (xdrs, pp, size, proc),
*
*/
bool_t
-_DEFUN (xdr_pointer, (xdrs, objpp, obj_size, xdr_obj),
- XDR * xdrs,
+xdr_pointer (XDR * xdrs,
char **objpp,
u_int obj_size,
xdrproc_t xdr_obj)
diff --git a/newlib/libc/xdr/xdr_sizeof.c b/newlib/libc/xdr/xdr_sizeof.c
index 427917640..bf02cf5e7 100644
--- a/newlib/libc/xdr/xdr_sizeof.c
+++ b/newlib/libc/xdr/xdr_sizeof.c
@@ -43,8 +43,7 @@
/* ARGSUSED */
static bool_t
-_DEFUN (x_putlong, (xdrs, longp),
- XDR * xdrs,
+x_putlong (XDR * xdrs,
const long *longp)
{
xdrs->x_handy += BYTES_PER_XDR_UNIT;
@@ -53,8 +52,7 @@ _DEFUN (x_putlong, (xdrs, longp),
/* ARGSUSED */
static bool_t
-_DEFUN (x_putbytes, (xdrs, bp, len),
- XDR * xdrs,
+x_putbytes (XDR * xdrs,
const char *bp,
u_int len)
{
@@ -63,16 +61,14 @@ _DEFUN (x_putbytes, (xdrs, bp, len),
}
static u_int
-_DEFUN (x_getpostn, (xdrs),
- XDR * xdrs)
+x_getpostn (XDR * xdrs)
{
return xdrs->x_handy;
}
/* ARGSUSED */
static bool_t
-_DEFUN (x_setpostn, (xdrs, pos),
- XDR * xdrs,
+x_setpostn (XDR * xdrs,
u_int pos)
{
/* This is not allowed */
@@ -80,8 +76,7 @@ _DEFUN (x_setpostn, (xdrs, pos),
}
static int32_t *
-_DEFUN (x_inline, (xdrs, len),
- XDR * xdrs,
+x_inline (XDR * xdrs,
u_int len)
{
if (len == 0)
@@ -118,8 +113,7 @@ harmless (void)
}
static void
-_DEFUN (x_destroy, (xdrs),
- XDR * xdrs)
+x_destroy (XDR * xdrs)
{
xdrs->x_handy = 0;
xdrs->x_base = 0;
@@ -132,8 +126,7 @@ _DEFUN (x_destroy, (xdrs),
}
static bool_t
-_DEFUN (x_putint32, (xdrs, int32p),
- XDR *xdrs,
+x_putint32 (XDR *xdrs,
const int32_t *int32p)
{
xdrs->x_handy += BYTES_PER_XDR_UNIT;
@@ -142,8 +135,7 @@ _DEFUN (x_putint32, (xdrs, int32p),
unsigned long
-_DEFUN (xdr_sizeof, (func, data),
- xdrproc_t func,
+xdr_sizeof (xdrproc_t func,
void *data)
{
XDR x;
diff --git a/newlib/libc/xdr/xdr_stdio.c b/newlib/libc/xdr/xdr_stdio.c
index e6513e5d0..784ac6c8b 100644
--- a/newlib/libc/xdr/xdr_stdio.c
+++ b/newlib/libc/xdr/xdr_stdio.c
@@ -83,8 +83,7 @@ static const struct xdr_ops xdrstdio_ops = {
* Operation flag is set to op.
*/
void
-_DEFUN (xdrstdio_create, (xdrs, file, op),
- XDR * xdrs,
+xdrstdio_create (XDR * xdrs,
FILE * file,
enum xdr_op op)
{
@@ -100,16 +99,14 @@ _DEFUN (xdrstdio_create, (xdrs, file, op),
* Cleans up the xdr stream handle xdrs previously set up by xdrstdio_create.
*/
static void
-_DEFUN (xdrstdio_destroy, (xdrs),
- XDR * xdrs)
+xdrstdio_destroy (XDR * xdrs)
{
(void) fflush ((FILE *) xdrs->x_private);
/* XXX: should we close the file ?? */
}
static bool_t
-_DEFUN (xdrstdio_getlong, (xdrs, lp),
- XDR * xdrs,
+xdrstdio_getlong (XDR * xdrs,
long *lp)
{
u_int32_t temp;
@@ -121,8 +118,7 @@ _DEFUN (xdrstdio_getlong, (xdrs, lp),
}
static bool_t
-_DEFUN (xdrstdio_putlong, (xdrs, lp),
- XDR * xdrs,
+xdrstdio_putlong (XDR * xdrs,
const long *lp)
{
u_int32_t temp = htonl ((u_int32_t) * lp);
@@ -133,8 +129,7 @@ _DEFUN (xdrstdio_putlong, (xdrs, lp),
}
static bool_t
-_DEFUN (xdrstdio_getbytes, (xdrs, addr, len),
- XDR * xdrs,
+xdrstdio_getbytes (XDR * xdrs,
char *addr,
u_int len)
{
@@ -145,8 +140,7 @@ _DEFUN (xdrstdio_getbytes, (xdrs, addr, len),
}
static bool_t
-_DEFUN (xdrstdio_putbytes, (xdrs, addr, len),
- XDR * xdrs,
+xdrstdio_putbytes (XDR * xdrs,
const char *addr,
u_int len)
{
@@ -157,15 +151,13 @@ _DEFUN (xdrstdio_putbytes, (xdrs, addr, len),
}
static u_int
-_DEFUN (xdrstdio_getpos, (xdrs),
- XDR * xdrs)
+xdrstdio_getpos (XDR * xdrs)
{
return ((u_int) ftell ((FILE *) xdrs->x_private));
}
static bool_t
-_DEFUN (xdrstdio_setpos, (xdrs, pos),
- XDR * xdrs,
+xdrstdio_setpos (XDR * xdrs,
u_int pos)
{
return ((fseek ((FILE *) xdrs->x_private, (long) pos, 0) < 0) ?
@@ -174,8 +166,7 @@ _DEFUN (xdrstdio_setpos, (xdrs, pos),
/* ARGSUSED */
static int32_t *
-_DEFUN (xdrstdio_inline, (xdrs, len),
- XDR * xdrs,
+xdrstdio_inline (XDR * xdrs,
u_int len)
{
/*
@@ -191,8 +182,7 @@ _DEFUN (xdrstdio_inline, (xdrs, len),
}
static bool_t
-_DEFUN (xdrstdio_getint32, (xdrs, ip),
- XDR *xdrs,
+xdrstdio_getint32 (XDR *xdrs,
int32_t *ip)
{
int32_t temp;
@@ -204,8 +194,7 @@ _DEFUN (xdrstdio_getint32, (xdrs, ip),
}
static bool_t
-_DEFUN (xdrstdio_putint32, (xdrs, ip),
- XDR *xdrs,
+xdrstdio_putint32 (XDR *xdrs,
const int32_t *ip)
{
int32_t temp = htonl (*ip);
diff --git a/newlib/libm/common/s_isinf.c b/newlib/libm/common/s_isinf.c
index fe18e2aba..55fd5c214 100644
--- a/newlib/libm/common/s_isinf.c
+++ b/newlib/libm/common/s_isinf.c
@@ -16,8 +16,7 @@
#undef isinf
int
-_DEFUN (isinf, (x),
- double x)
+isinf (double x)
{
__int32_t hx,lx;
EXTRACT_WORDS(hx,lx,x);
diff --git a/newlib/libm/common/s_isinfd.c b/newlib/libm/common/s_isinfd.c
index 5a2b04d4e..771ce44e4 100644
--- a/newlib/libm/common/s_isinfd.c
+++ b/newlib/libm/common/s_isinfd.c
@@ -9,8 +9,7 @@
#ifndef _DOUBLE_IS_32BITS
int
-_DEFUN (__isinfd, (x),
- double x)
+__isinfd (double x)
{
__int32_t hx,lx;
EXTRACT_WORDS(hx,lx,x);
diff --git a/newlib/libm/common/s_isnand.c b/newlib/libm/common/s_isnand.c
index 5f2c06467..31a3272c5 100644
--- a/newlib/libm/common/s_isnand.c
+++ b/newlib/libm/common/s_isnand.c
@@ -93,8 +93,7 @@ QUICKREF
#ifndef _DOUBLE_IS_32BITS
int
-_DEFUN (__isnand, (x),
- double x)
+__isnand (double x)
{
__int32_t hx,lx;
EXTRACT_WORDS(hx,lx,x);
diff --git a/newlib/libm/common/sf_isinf.c b/newlib/libm/common/sf_isinf.c
index 5b57a346f..75e90c9fd 100644
--- a/newlib/libm/common/sf_isinf.c
+++ b/newlib/libm/common/sf_isinf.c
@@ -13,8 +13,7 @@
#undef isinff
int
-_DEFUN (isinff, (x),
- float x)
+isinff (float x)
{
__int32_t ix;
GET_FLOAT_WORD(ix,x);
@@ -27,8 +26,7 @@ _DEFUN (isinff, (x),
#undef isinf
int
-_DEFUN (isinf, (x),
- double x)
+isinf (double x)
{
return isinff((float) x);
}
diff --git a/newlib/libm/common/sf_isinff.c b/newlib/libm/common/sf_isinff.c
index 9d0e742e5..cd7b2cfd3 100644
--- a/newlib/libm/common/sf_isinff.c
+++ b/newlib/libm/common/sf_isinff.c
@@ -6,8 +6,7 @@
#include "fdlibm.h"
int
-_DEFUN (__isinff, (x),
- float x)
+__isinff (float x)
{
__int32_t ix;
GET_FLOAT_WORD(ix,x);
@@ -18,8 +17,7 @@ _DEFUN (__isinff, (x),
#ifdef _DOUBLE_IS_32BITS
int
-_DEFUN (__isinfd, (x),
- double x)
+__isinfd (double x)
{
return __isinff((float) x);
}
diff --git a/newlib/libm/common/sf_isnan.c b/newlib/libm/common/sf_isnan.c
index 9c813fc24..5c611d67e 100644
--- a/newlib/libm/common/sf_isnan.c
+++ b/newlib/libm/common/sf_isnan.c
@@ -24,8 +24,7 @@
#undef isnanf
int
-_DEFUN (isnanf, (x),
- float x)
+isnanf (float x)
{
__int32_t ix;
GET_FLOAT_WORD(ix,x);
@@ -38,8 +37,7 @@ _DEFUN (isnanf, (x),
#undef isnan
int
-_DEFUN (isnan, (x),
- double x)
+isnan (double x)
{
return isnanf((float) x);
}
diff --git a/newlib/libm/common/sf_isnanf.c b/newlib/libm/common/sf_isnanf.c
index 0b0d9bbaf..0831da664 100644
--- a/newlib/libm/common/sf_isnanf.c
+++ b/newlib/libm/common/sf_isnanf.c
@@ -16,8 +16,7 @@
#include "fdlibm.h"
int
-_DEFUN (__isnanf, (x),
- float x)
+__isnanf (float x)
{
__int32_t ix;
GET_FLOAT_WORD(ix,x);
@@ -28,8 +27,7 @@ _DEFUN (__isnanf, (x),
#ifdef _DOUBLE_IS_32BITS
int
-_DEFUN (__isnand, (x),
- double x)
+__isnand (double x)
{
return __isnanf((float) x);
}
diff --git a/newlib/libm/machine/i386/f_math.h b/newlib/libm/machine/i386/f_math.h
index bd44b1e92..833e5cff9 100644
--- a/newlib/libm/machine/i386/f_math.h
+++ b/newlib/libm/machine/i386/f_math.h
@@ -7,8 +7,7 @@
__inline__
static
int
-_DEFUN (check_finite, (x),
- double x)
+check_finite (double x)
{
__int32_t hx;
GET_HIGH_WORD(hx,x);
@@ -18,8 +17,7 @@ _DEFUN (check_finite, (x),
__inline__
static
int
-_DEFUN (check_finitef, (x),
- float x)
+check_finitef (float x)
{
__int32_t ix;
GET_FLOAT_WORD(ix,x);
diff --git a/newlib/libm/mathfp/s_acos.c b/newlib/libm/mathfp/s_acos.c
index d66a5cd26..d0318e1c7 100644
--- a/newlib/libm/mathfp/s_acos.c
+++ b/newlib/libm/mathfp/s_acos.c
@@ -75,8 +75,7 @@ MATHREF
#ifndef _DOUBLE_IS_32BITS
double
-_DEFUN (acos, (double),
- double x)
+acos (double x)
{
return (asine (x, 1));
}
diff --git a/newlib/libm/mathfp/s_asin.c b/newlib/libm/mathfp/s_asin.c
index 477bbf5cb..b20f0a3f2 100644
--- a/newlib/libm/mathfp/s_asin.c
+++ b/newlib/libm/mathfp/s_asin.c
@@ -20,8 +20,7 @@
#ifndef _DOUBLE_IS_32BITS
double
-_DEFUN (asin, (double),
- double x)
+asin (double x)
{
return (asine (x, 0));
}
diff --git a/newlib/libm/mathfp/s_asine.c b/newlib/libm/mathfp/s_asine.c
index 28cfaf7a6..9e9073d1f 100644
--- a/newlib/libm/mathfp/s_asine.c
+++ b/newlib/libm/mathfp/s_asine.c
@@ -89,8 +89,7 @@ static const double a[] = { 0.0, 0.78539816339744830962 };
static const double b[] = { 1.57079632679489661923, 0.78539816339744830962 };
double
-_DEFUN (asine, (double, int),
- double x,
+asine (double x,
int acosine)
{
int flag, i;
diff --git a/newlib/libm/mathfp/s_atan.c b/newlib/libm/mathfp/s_atan.c
index 0dd339474..53551e56e 100644
--- a/newlib/libm/mathfp/s_atan.c
+++ b/newlib/libm/mathfp/s_atan.c
@@ -54,8 +54,7 @@ PORTABILITY
#ifndef _DOUBLE_IS_32BITS
double
-_DEFUN (atan, (double),
- double x)
+atan (double x)
{
switch (numtest (x))
{
diff --git a/newlib/libm/mathfp/s_atan2.c b/newlib/libm/mathfp/s_atan2.c
index 9f71ed9c8..395253905 100644
--- a/newlib/libm/mathfp/s_atan2.c
+++ b/newlib/libm/mathfp/s_atan2.c
@@ -69,8 +69,7 @@ PORTABILITY
#ifndef _DOUBLE_IS_32BITS
double
-_DEFUN (atan2, (double, double),
- double v,
+atan2 (double v,
double u)
{
return (atangent (0.0, v, u, 1));
diff --git a/newlib/libm/mathfp/s_atangent.c b/newlib/libm/mathfp/s_atangent.c
index 1df39ac50..02675b522 100644
--- a/newlib/libm/mathfp/s_atangent.c
+++ b/newlib/libm/mathfp/s_atangent.c
@@ -85,8 +85,7 @@ static const double p[] = { -0.13688768894191926929e+2,
-0.83758299368150059274 };
double
-_DEFUN (atangent, (double, double, double, int),
- double x,
+atangent (double x,
double v,
double u,
int arctan2)
diff --git a/newlib/libm/mathfp/s_ceil.c b/newlib/libm/mathfp/s_ceil.c
index c6ecbe323..29e4a059d 100644
--- a/newlib/libm/mathfp/s_ceil.c
+++ b/newlib/libm/mathfp/s_ceil.c
@@ -20,8 +20,7 @@
#ifndef _DOUBLE_IS_32BITS
double
-_DEFUN (ceil, (double),
- double x)
+ceil (double x)
{
double f, y;
diff --git a/newlib/libm/mathfp/s_cos.c b/newlib/libm/mathfp/s_cos.c
index 6f63a404e..7c4029f9d 100644
--- a/newlib/libm/mathfp/s_cos.c
+++ b/newlib/libm/mathfp/s_cos.c
@@ -20,8 +20,7 @@
#ifndef _DOUBLE_IS_32BITS
double
-_DEFUN (cos, (double),
- double x)
+cos (double x)
{
return (sine (x, 1));
}
diff --git a/newlib/libm/mathfp/s_cosh.c b/newlib/libm/mathfp/s_cosh.c
index 552e5ee5c..bfe665069 100644
--- a/newlib/libm/mathfp/s_cosh.c
+++ b/newlib/libm/mathfp/s_cosh.c
@@ -63,8 +63,7 @@ QUICKREF
#ifndef _DOUBLE_IS_32BITS
double
-_DEFUN (cosh, (double),
- double x)
+cosh (double x)
{
return (sineh (x, 1));
}
diff --git a/newlib/libm/mathfp/s_exp.c b/newlib/libm/mathfp/s_exp.c
index 362b8b079..bb1beffd7 100644
--- a/newlib/libm/mathfp/s_exp.c
+++ b/newlib/libm/mathfp/s_exp.c
@@ -70,8 +70,7 @@ static const double q[] = { 0.5, 0.56817302698551221787e-1,
0.75104028399870046114e-6 };
double
-_DEFUN (exp, (double),
- double x)
+exp (double x)
{
int N;
double g, z, R, P, Q;
diff --git a/newlib/libm/mathfp/s_exp2.c b/newlib/libm/mathfp/s_exp2.c
index 3bcf7ca2c..c913b3a22 100644
--- a/newlib/libm/mathfp/s_exp2.c
+++ b/newlib/libm/mathfp/s_exp2.c
@@ -9,8 +9,7 @@
#ifndef _DOUBLE_IS_32BITS
double
-_DEFUN (exp2, (double),
- double x)
+exp2 (double x)
{
return pow(2.0, x);
}
diff --git a/newlib/libm/mathfp/s_fabs.c b/newlib/libm/mathfp/s_fabs.c
index 3d6d83889..10e89ef06 100644
--- a/newlib/libm/mathfp/s_fabs.c
+++ b/newlib/libm/mathfp/s_fabs.c
@@ -51,8 +51,7 @@ PORTABILITY
#ifndef _DOUBLE_IS_32BITS
double
-_DEFUN (fabs, (double),
- double x)
+fabs (double x)
{
switch (numtest (x))
{
diff --git a/newlib/libm/mathfp/s_floor.c b/newlib/libm/mathfp/s_floor.c
index ebdb9a7b3..e407ea237 100644
--- a/newlib/libm/mathfp/s_floor.c
+++ b/newlib/libm/mathfp/s_floor.c
@@ -62,8 +62,7 @@ PORTABILITY
#ifndef _DOUBLE_IS_32BITS
double
-_DEFUN (floor, (double),
- double x)
+floor (double x)
{
double f, y;
diff --git a/newlib/libm/mathfp/s_ldexp.c b/newlib/libm/mathfp/s_ldexp.c
index 472093071..6a844e0fe 100644
--- a/newlib/libm/mathfp/s_ldexp.c
+++ b/newlib/libm/mathfp/s_ldexp.c
@@ -63,8 +63,7 @@ PORTABILITY
#define DOUBLE_EXP_OFFS 1023
double
-_DEFUN (ldexp, (double, int),
- double d,
+ldexp (double d,
int e)
{
int exp;
diff --git a/newlib/libm/mathfp/s_log.c b/newlib/libm/mathfp/s_log.c
index 27b959831..e1d33e10b 100644
--- a/newlib/libm/mathfp/s_log.c
+++ b/newlib/libm/mathfp/s_log.c
@@ -20,8 +20,7 @@
#ifndef _DOUBLE_IS_32BITS
double
-_DEFUN (log, (double),
- double x)
+log (double x)
{
return (logarithm (x, 0));
}
diff --git a/newlib/libm/mathfp/s_log10.c b/newlib/libm/mathfp/s_log10.c
index 9491cff76..d7fed2cfa 100644
--- a/newlib/libm/mathfp/s_log10.c
+++ b/newlib/libm/mathfp/s_log10.c
@@ -51,8 +51,7 @@ PORTABILITY
#ifndef _DOUBLE_IS_32BITS
double
-_DEFUN (log10, (double),
- double x)
+log10 (double x)
{
return (logarithm (x, 1));
}
diff --git a/newlib/libm/mathfp/s_logarithm.c b/newlib/libm/mathfp/s_logarithm.c
index d14bf2eb4..e8c24200a 100644
--- a/newlib/libm/mathfp/s_logarithm.c
+++ b/newlib/libm/mathfp/s_logarithm.c
@@ -79,8 +79,7 @@ static const double C2 = 1.428606820309417232e-06;
static const double C3 = 0.43429448190325182765;
double
-_DEFUN (logarithm, (double, int),
- double x,
+logarithm (double x,
int ten)
{
int N;
diff --git a/newlib/libm/mathfp/s_numtest.c b/newlib/libm/mathfp/s_numtest.c
index b41bb87f4..a01045fa3 100644
--- a/newlib/libm/mathfp/s_numtest.c
+++ b/newlib/libm/mathfp/s_numtest.c
@@ -25,8 +25,7 @@
#ifndef _DOUBLE_IS_32BITS
int
-_DEFUN (numtest, (double),
- double x)
+numtest (double x)
{
__uint32_t hx, lx;
int exp;
diff --git a/newlib/libm/mathfp/s_sin.c b/newlib/libm/mathfp/s_sin.c
index 2051304e0..c394f8548 100644
--- a/newlib/libm/mathfp/s_sin.c
+++ b/newlib/libm/mathfp/s_sin.c
@@ -20,8 +20,7 @@
#ifndef _DOUBLE_IS_32BITS
double
-_DEFUN (sin, (double),
- double x)
+sin (double x)
{
return (sine (x, 0));
}
diff --git a/newlib/libm/mathfp/s_sincos.c b/newlib/libm/mathfp/s_sincos.c
index 8fc65ac20..8694dc64d 100644
--- a/newlib/libm/mathfp/s_sincos.c
+++ b/newlib/libm/mathfp/s_sincos.c
@@ -20,8 +20,7 @@
#ifndef _DOUBLE_IS_32BITS
void
-_DEFUN (sincos, (x, sinx, cosx),
- double x,
+sincos (double x,
double *sinx,
double *cosx)
{
diff --git a/newlib/libm/mathfp/s_sine.c b/newlib/libm/mathfp/s_sine.c
index d5e4469a0..7a5f4ddd3 100644
--- a/newlib/libm/mathfp/s_sine.c
+++ b/newlib/libm/mathfp/s_sine.c
@@ -72,8 +72,7 @@ static const double r[] = { -0.16666666666666665052,
0.27204790957888846175e-14 };
double
-_DEFUN (sine, (double, int),
- double x,
+sine (double x,
int cosine)
{
int sgn, N;
diff --git a/newlib/libm/mathfp/s_sineh.c b/newlib/libm/mathfp/s_sineh.c
index 457003ff8..1ca08b84c 100644
--- a/newlib/libm/mathfp/s_sineh.c
+++ b/newlib/libm/mathfp/s_sineh.c
@@ -94,8 +94,7 @@ static const double INV_V2 = 0.24999308500451499336;
static const double V_OVER2_MINUS1 = 0.13830277879601902638e-4;
double
-_DEFUN (sineh, (double, int),
- double x,
+sineh (double x,
int cosineh)
{
double y, f, P, Q, R, res, z, w;
diff --git a/newlib/libm/mathfp/s_sinf.c b/newlib/libm/mathfp/s_sinf.c
index b738a49b9..3e29fedf3 100644
--- a/newlib/libm/mathfp/s_sinf.c
+++ b/newlib/libm/mathfp/s_sinf.c
@@ -18,8 +18,7 @@
#include "zmath.h"
float
-_DEFUN (sinf, (float),
- float x)
+sinf (float x)
{
return (sinef (x, 0));
}
diff --git a/newlib/libm/mathfp/s_sinh.c b/newlib/libm/mathfp/s_sinh.c
index c600ee0da..55b339bfb 100644
--- a/newlib/libm/mathfp/s_sinh.c
+++ b/newlib/libm/mathfp/s_sinh.c
@@ -20,8 +20,7 @@
#ifndef _DOUBLE_IS_32BITS
double
-_DEFUN (sinh, (double),
- double x)
+sinh (double x)
{
return (sineh (x, 0));
}
diff --git a/newlib/libm/mathfp/s_sqrt.c b/newlib/libm/mathfp/s_sqrt.c
index af3b1d85e..d5df47eec 100644
--- a/newlib/libm/mathfp/s_sqrt.c
+++ b/newlib/libm/mathfp/s_sqrt.c
@@ -62,8 +62,7 @@ PORTABILITY
#ifndef _DOUBLE_IS_32BITS
double
-_DEFUN (sqrt, (double),
- double x)
+sqrt (double x)
{
double f, y;
int exp, i, odd;
diff --git a/newlib/libm/mathfp/s_tan.c b/newlib/libm/mathfp/s_tan.c
index 3910a4c49..f3bfb6988 100644
--- a/newlib/libm/mathfp/s_tan.c
+++ b/newlib/libm/mathfp/s_tan.c
@@ -63,8 +63,7 @@ static const double q[] = { -0.46671683339755294240,
0.49819433993786512270e-6 };
double
-_DEFUN (tan, (double),
- double x)
+tan (double x)
{
double y, f, g, XN, xnum, xden, res;
int N;
diff --git a/newlib/libm/mathfp/s_tanh.c b/newlib/libm/mathfp/s_tanh.c
index 7c92c1750..ed036645b 100644
--- a/newlib/libm/mathfp/s_tanh.c
+++ b/newlib/libm/mathfp/s_tanh.c
@@ -69,8 +69,7 @@ static const double q[] = { 0.48402357071988688686e+4,
0.11274474380534949335e+3 };
double
-_DEFUN (tanh, (double),
- double x)
+tanh (double x)
{
double f, res, g, P, Q, R;
diff --git a/newlib/libm/mathfp/sf_acos.c b/newlib/libm/mathfp/sf_acos.c
index 6bef98041..8631f3b97 100644
--- a/newlib/libm/mathfp/sf_acos.c
+++ b/newlib/libm/mathfp/sf_acos.c
@@ -18,8 +18,7 @@
#include "zmath.h"
float
-_DEFUN (acosf, (float),
- float x)
+acosf (float x)
{
return (asinef (x, 1));
}
diff --git a/newlib/libm/mathfp/sf_asin.c b/newlib/libm/mathfp/sf_asin.c
index 92c33fda3..391ac304e 100644
--- a/newlib/libm/mathfp/sf_asin.c
+++ b/newlib/libm/mathfp/sf_asin.c
@@ -18,8 +18,7 @@
#include "zmath.h"
float
-_DEFUN (asinf, (float),
- float x)
+asinf (float x)
{
return (asinef (x, 0));
}
diff --git a/newlib/libm/mathfp/sf_asine.c b/newlib/libm/mathfp/sf_asine.c
index a74778034..118479678 100644
--- a/newlib/libm/mathfp/sf_asine.c
+++ b/newlib/libm/mathfp/sf_asine.c
@@ -30,8 +30,7 @@ static const float a[] = { 0.0, 0.785398163 };
static const float b[] = { 1.570796326, 0.785398163 };
float
-_DEFUN (asinef, (float, int),
- float x,
+asinef (float x,
int acosine)
{
int flag, i;
diff --git a/newlib/libm/mathfp/sf_atan.c b/newlib/libm/mathfp/sf_atan.c
index f0f522076..03da2a6b0 100644
--- a/newlib/libm/mathfp/sf_atan.c
+++ b/newlib/libm/mathfp/sf_atan.c
@@ -18,8 +18,7 @@
#include "zmath.h"
float
-_DEFUN (atanf, (float),
- float x)
+atanf (float x)
{
switch (numtestf (x))
{
diff --git a/newlib/libm/mathfp/sf_atan2.c b/newlib/libm/mathfp/sf_atan2.c
index e866ecbb8..dfe1d3375 100644
--- a/newlib/libm/mathfp/sf_atan2.c
+++ b/newlib/libm/mathfp/sf_atan2.c
@@ -18,8 +18,7 @@
#include "zmath.h"
float
-_DEFUN (atan2f, (float, float),
- float v,
+atan2f (float v,
float u)
{
return (atangentf (0.0, v, u, 1));
diff --git a/newlib/libm/mathfp/sf_atangent.c b/newlib/libm/mathfp/sf_atangent.c
index 1865cde74..2c96e1544 100644
--- a/newlib/libm/mathfp/sf_atangent.c
+++ b/newlib/libm/mathfp/sf_atangent.c
@@ -31,8 +31,7 @@ static const float q[] = { 0.1412500740e+1 };
static const float p[] = { -0.4708325141, -0.5090958253e-1 };
float
-_DEFUN (atangentf, (float, float, float, int),
- float x,
+atangentf (float x,
float v,
float u,
int arctan2)
diff --git a/newlib/libm/mathfp/sf_ceil.c b/newlib/libm/mathfp/sf_ceil.c
index bc8e1403b..51ddada1f 100644
--- a/newlib/libm/mathfp/sf_ceil.c
+++ b/newlib/libm/mathfp/sf_ceil.c
@@ -18,8 +18,7 @@
#include "zmath.h"
float
-_DEFUN (ceilf, (float),
- float x)
+ceilf (float x)
{
float f, y;
diff --git a/newlib/libm/mathfp/sf_cos.c b/newlib/libm/mathfp/sf_cos.c
index 057663e69..34b7dfdab 100644
--- a/newlib/libm/mathfp/sf_cos.c
+++ b/newlib/libm/mathfp/sf_cos.c
@@ -18,8 +18,7 @@
#include "zmath.h"
float
-_DEFUN (cosf, (float),
- float x)
+cosf (float x)
{
return (sinef (x, 1));
}
diff --git a/newlib/libm/mathfp/sf_cosh.c b/newlib/libm/mathfp/sf_cosh.c
index 4635b7144..c747e907b 100644
--- a/newlib/libm/mathfp/sf_cosh.c
+++ b/newlib/libm/mathfp/sf_cosh.c
@@ -18,8 +18,7 @@
#include "zmath.h"
float
-_DEFUN (coshf, (float),
- float x)
+coshf (float x)
{
return (sinehf (x, 1));
}
diff --git a/newlib/libm/mathfp/sf_exp.c b/newlib/libm/mathfp/sf_exp.c
index e37fac58b..33b3529c8 100644
--- a/newlib/libm/mathfp/sf_exp.c
+++ b/newlib/libm/mathfp/sf_exp.c
@@ -30,8 +30,7 @@ static const float p[] = { 0.249999999950, 0.00416028863 };
static const float q[] = { 0.5, 0.04998717878 };
float
-_DEFUN (expf, (float),
- float x)
+expf (float x)
{
int N;
float g, z, R, P, Q;
diff --git a/newlib/libm/mathfp/sf_exp2.c b/newlib/libm/mathfp/sf_exp2.c
index 7e147c5ed..43a9ae2df 100644
--- a/newlib/libm/mathfp/sf_exp2.c
+++ b/newlib/libm/mathfp/sf_exp2.c
@@ -7,8 +7,7 @@
#include "fdlibm.h"
float
-_DEFUN (exp2f, (float),
- float x)
+exp2f (float x)
{
return powf(2.0, x);
}
diff --git a/newlib/libm/mathfp/sf_fabs.c b/newlib/libm/mathfp/sf_fabs.c
index 2661eabc0..8ee93b162 100644
--- a/newlib/libm/mathfp/sf_fabs.c
+++ b/newlib/libm/mathfp/sf_fabs.c
@@ -18,8 +18,7 @@
#include "zmath.h"
float
-_DEFUN (fabsf, (float),
- float x)
+fabsf (float x)
{
switch (numtestf (x))
{
diff --git a/newlib/libm/mathfp/sf_floor.c b/newlib/libm/mathfp/sf_floor.c
index 1e0fb9e44..4ba295139 100644
--- a/newlib/libm/mathfp/sf_floor.c
+++ b/newlib/libm/mathfp/sf_floor.c
@@ -18,8 +18,7 @@
#include "zmath.h"
float
-_DEFUN (floorf, (float),
- float x)
+floorf (float x)
{
float f, y;
diff --git a/newlib/libm/mathfp/sf_fmod.c b/newlib/libm/mathfp/sf_fmod.c
index 611725409..5dec8a1c9 100644
--- a/newlib/libm/mathfp/sf_fmod.c
+++ b/newlib/libm/mathfp/sf_fmod.c
@@ -25,8 +25,7 @@
static const float one = 1.0, Zero[] = {0.0, -0.0,};
float
-_DEFUN (fmodf, (float, float),
- float x,
+fmodf (float x,
float y)
{
__int32_t n,hx,hy,hz,ix,iy,sx,i;
diff --git a/newlib/libm/mathfp/sf_ldexp.c b/newlib/libm/mathfp/sf_ldexp.c
index 3a0d7a41a..9f05c43a0 100644
--- a/newlib/libm/mathfp/sf_ldexp.c
+++ b/newlib/libm/mathfp/sf_ldexp.c
@@ -23,8 +23,7 @@
#define FLOAT_EXP_OFFS 127
float
-_DEFUN (ldexpf, (float, int),
- float d,
+ldexpf (float d,
int e)
{
int exp;
diff --git a/newlib/libm/mathfp/sf_log.c b/newlib/libm/mathfp/sf_log.c
index b746d444f..c988f764f 100644
--- a/newlib/libm/mathfp/sf_log.c
+++ b/newlib/libm/mathfp/sf_log.c
@@ -18,8 +18,7 @@
#include "zmath.h"
float
-_DEFUN (logf, (float),
- float x)
+logf (float x)
{
return (logarithmf (x, 0));
}
diff --git a/newlib/libm/mathfp/sf_log10.c b/newlib/libm/mathfp/sf_log10.c
index 444e535e0..deb35a378 100644
--- a/newlib/libm/mathfp/sf_log10.c
+++ b/newlib/libm/mathfp/sf_log10.c
@@ -18,8 +18,7 @@
#include "zmath.h"
float
-_DEFUN (log10f, (float),
- float x)
+log10f (float x)
{
return (logarithmf (x, 1));
}
diff --git a/newlib/libm/mathfp/sf_logarithm.c b/newlib/libm/mathfp/sf_logarithm.c
index 855ee0744..37e57251c 100644
--- a/newlib/libm/mathfp/sf_logarithm.c
+++ b/newlib/libm/mathfp/sf_logarithm.c
@@ -31,8 +31,7 @@ static const float C2 = 1.428606820e-06;
static const float C3 = 0.4342944819;
float
-_DEFUN (logarithmf, (float, int),
- float x,
+logarithmf (float x,
int ten)
{
int N;
diff --git a/newlib/libm/mathfp/sf_numtest.c b/newlib/libm/mathfp/sf_numtest.c
index 00bab3a9d..1ad5862b1 100644
--- a/newlib/libm/mathfp/sf_numtest.c
+++ b/newlib/libm/mathfp/sf_numtest.c
@@ -23,8 +23,7 @@
#include "zmath.h"
int
-_DEFUN (numtestf, (float),
- float x)
+numtestf (float x)
{
__int32_t wx;
int exp;
diff --git a/newlib/libm/mathfp/sf_sin.c b/newlib/libm/mathfp/sf_sin.c
index c68e18e50..61ae76b6b 100644
--- a/newlib/libm/mathfp/sf_sin.c
+++ b/newlib/libm/mathfp/sf_sin.c
@@ -18,8 +18,7 @@
#include "zmath.h"
float
-_DEFUN (sinf, (float),
- float x)
+sinf (float x)
{
return (sinef (x, 0));
}
diff --git a/newlib/libm/mathfp/sf_sincos.c b/newlib/libm/mathfp/sf_sincos.c
index 85b393dce..472aa712b 100644
--- a/newlib/libm/mathfp/sf_sincos.c
+++ b/newlib/libm/mathfp/sf_sincos.c
@@ -18,8 +18,7 @@
#include "zmath.h"
void
-_DEFUN (sincosf, (x, sinx, cosx),
- float x,
+sincosf (float x,
float *sinx,
float *cosx)
{
diff --git a/newlib/libm/mathfp/sf_sine.c b/newlib/libm/mathfp/sf_sine.c
index 24725bde1..8dd34d9a1 100644
--- a/newlib/libm/mathfp/sf_sine.c
+++ b/newlib/libm/mathfp/sf_sine.c
@@ -32,8 +32,7 @@ static const float r[] = { -0.1666665668,
0.2601903036e-5 };
float
-_DEFUN (sinef, (float, int),
- float x,
+sinef (float x,
int cosine)
{
int sgn, N;
diff --git a/newlib/libm/mathfp/sf_sineh.c b/newlib/libm/mathfp/sf_sineh.c
index 966e91362..83665bdc3 100644
--- a/newlib/libm/mathfp/sf_sineh.c
+++ b/newlib/libm/mathfp/sf_sineh.c
@@ -32,8 +32,7 @@ static const float INV_V2 = 0.2499930850;
static const float V_OVER2_MINUS1 = 0.1383027787e-4;
float
-_DEFUN (sinehf, (float, int),
- float x,
+sinehf (float x,
int cosineh)
{
float y, f, P, Q, R, res, z, w;
diff --git a/newlib/libm/mathfp/sf_sinh.c b/newlib/libm/mathfp/sf_sinh.c
index a50e56606..78cbef90d 100644
--- a/newlib/libm/mathfp/sf_sinh.c
+++ b/newlib/libm/mathfp/sf_sinh.c
@@ -18,8 +18,7 @@
#include "zmath.h"
float
-_DEFUN (sinhf, (float),
- float x)
+sinhf (float x)
{
return (sinehf (x, 0));
}
diff --git a/newlib/libm/mathfp/sf_sqrt.c b/newlib/libm/mathfp/sf_sqrt.c
index 5d5410dce..ede24b987 100644
--- a/newlib/libm/mathfp/sf_sqrt.c
+++ b/newlib/libm/mathfp/sf_sqrt.c
@@ -32,8 +32,7 @@
#include "zmath.h"
float
-_DEFUN (sqrtf, (float),
- float x)
+sqrtf (float x)
{
float f, y;
int exp, i, odd;
diff --git a/newlib/libm/mathfp/sf_tan.c b/newlib/libm/mathfp/sf_tan.c
index fcde19ab3..7924bd217 100644
--- a/newlib/libm/mathfp/sf_tan.c
+++ b/newlib/libm/mathfp/sf_tan.c
@@ -29,8 +29,7 @@ static const float q[] = { -0.429135777,
0.971685835e-2 };
float
-_DEFUN (tanf, (float),
- float x)
+tanf (float x)
{
float y, f, g, XN, xnum, xden, res;
int N;
diff --git a/newlib/libm/mathfp/sf_tanh.c b/newlib/libm/mathfp/sf_tanh.c
index 51806af45..7da600a9c 100644
--- a/newlib/libm/mathfp/sf_tanh.c
+++ b/newlib/libm/mathfp/sf_tanh.c
@@ -31,8 +31,7 @@ static const float q[] = { 0.6178299136,
0.25 };
float
-_DEFUN (tanhf, (float),
- float x)
+tanhf (float x)
{
float f, res, g, P, Q, R;
diff --git a/newlib/libm/test/convert.c b/newlib/libm/test/convert.c
index 24188fa8b..fe5bc0aa4 100644
--- a/newlib/libm/test/convert.c
+++ b/newlib/libm/test/convert.c
@@ -49,8 +49,7 @@ test_atoff (void)
static
void
-_DEFUN(iterate,(func, name),
- void _EXFUN((*func),(void)),
+iterate (void _EXFUN((*func),(void)),
char *name)
{
@@ -70,8 +69,7 @@ int_type *p = ints;
static void
-_DEFUN(int_iterate,(func, name),
- void (*func)(),
+int_iterate (void (*func)(),
char *name)
{
newfunc(name);
@@ -86,8 +84,7 @@ _DEFUN(int_iterate,(func, name),
}
void
-_DEFUN(test_strtol_base,(base, pi, string),
- int base,
+test_strtol_base (int base,
int_scan_type *pi,
char *string)
{
@@ -206,8 +203,7 @@ test_fcvt (void)
static void
-_DEFUN(diterate,(func, name),
- void (*func)(),
+diterate (void (*func)(),
char *name)
{
newfunc(name);
diff --git a/newlib/libm/test/dcvt.c b/newlib/libm/test/dcvt.c
index 922652e9f..56d5c2b6b 100644
--- a/newlib/libm/test/dcvt.c
+++ b/newlib/libm/test/dcvt.c
@@ -28,8 +28,7 @@ static struct p {
#define _MAX_PREC 16
static char
-_DEFUN(nextdigit,(value),
-double *value)
+nextdigit (double *value)
{
double tmp;
@@ -39,8 +38,7 @@ double *value)
static char *
-_DEFUN(print_nan,(buffer, value, precision),
- char *buffer,
+print_nan (char *buffer,
double value,
int precision)
{
@@ -100,8 +98,7 @@ typedef struct
void
-_DEFUN(renormalize,(in),
- cvt_info_type *in)
+renormalize (cvt_info_type *in)
{
/* Make sure all numbers are less than 1 */
@@ -133,8 +130,7 @@ _DEFUN(renormalize,(in),
*/
static void
-_DEFUN(normalize,(value, in),
- double value,
+normalize (double value,
cvt_info_type *in)
{
int j;
@@ -195,8 +191,7 @@ _DEFUN(normalize,(value, in),
}
int
-_DEFUN(round,(in, start, now, ch),
- cvt_info_type *in,
+round (cvt_info_type *in,
char *start,
char *now,
char ch)
@@ -272,8 +267,7 @@ _DEFUN(round,(in, start, now, ch),
void
-_DEFUN(_cvte,(in),
- register cvt_info_type *in)
+_cvte (register cvt_info_type *in)
{
int buffer_idx =0;
int digit = 0;
@@ -341,8 +335,7 @@ _DEFUN(_cvte,(in),
/* Produce NNNN.FFFF */
void
-_DEFUN(_cvtf,(in),
- cvt_info_type *in)
+_cvtf (cvt_info_type *in)
{
int buffer_idx = 0; /* Current char being output */
@@ -434,8 +427,7 @@ _DEFUN(_cvtf,(in),
char *
-_DEFUN(_dcvt,(buffer, invalue, precision, width, type, dot),
- char *buffer,
+_dcvt (char *buffer,
double invalue,
int precision,
int width,
@@ -533,8 +525,7 @@ _DEFUN(_dcvt,(buffer, invalue, precision, width, type, dot),
char *
-_DEFUN(fcvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
- double invalue,
+fcvtbuf (double invalue,
int ndigit,
int *decpt,
int *sign,
@@ -563,8 +554,7 @@ _DEFUN(fcvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
char *
-_DEFUN(ecvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
- double invalue,
+ecvtbuf (double invalue,
int ndigit,
int *decpt,
int *sign,
@@ -596,8 +586,7 @@ _DEFUN(ecvtbuf,(invalue,ndigit,decpt,sign, fcvt_buf),
char *
-_DEFUN(gcvt,(d,ndigit,buf),
- double d,
+gcvt (double d,
int ndigit,
char *buf)
{
diff --git a/newlib/libm/test/math.c b/newlib/libm/test/math.c
index f58f64f79..dda587a33 100644
--- a/newlib/libm/test/math.c
+++ b/newlib/libm/test/math.c
@@ -35,8 +35,7 @@ int verbose;
/* To test exceptions - we trap them all and return a known value */
int
-_DEFUN(matherr,(e),
- struct exception *e)
+matherr (struct exception *e)
{
if (traperror)
{
@@ -50,8 +49,7 @@ _DEFUN(matherr,(e),
}
-void _DEFUN(translate_to,(file,r),
- FILE *file,
+void translate_to (FILE *file,
double r)
{
__ieee_double_shape_type bits;
@@ -60,8 +58,7 @@ void _DEFUN(translate_to,(file,r),
}
int
-_DEFUN(ffcheck,( is, p, name, serrno, merror),
- double is,
+ffcheck (double is,
one_line_type *p,
char *name,
int serrno,
@@ -108,8 +105,7 @@ _DEFUN(ffcheck,( is, p, name, serrno, merror),
}
double
-_DEFUN(thedouble, (msw, lsw),
- long msw,
+thedouble (long msw,
long lsw)
{
__ieee_double_shape_type x;
@@ -123,8 +119,7 @@ int calc;
int reduce;
-_DEFUN(frontline,(f, mag, p, result, merror, errno, args, name),
- FILE *f,
+frontline (FILE *f,
int mag,
one_line_type *p,
double result,
@@ -176,8 +171,7 @@ _DEFUN(frontline,(f, mag, p, result, merror, errno, args, name),
fprintf(f, ")*/\n");
}
-_DEFUN(finish,(f, vector, result , p, args, name),
- FILE *f,
+finish (FILE *f,
int vector,
double result,
one_line_type *p,
@@ -194,8 +188,7 @@ _DEFUN(finish,(f, vector, result , p, args, name),
}
int redo;
-_DEFUN(run_vector_1,(vector, p, func, name, args),
- int vector,
+run_vector_1 (int vector,
one_line_type *p,
char *func,
char *name,
@@ -429,12 +422,12 @@ test_math (void)
*/
#if 0
-float _DEFUN(cosf,(a), float a) { return cos((double)a); }
-float _DEFUN(sinf,(a), float a) { return sin((double)a); }
-float _DEFUN(log1pf,(a), float a) { return log1p((double)a); }
-float _DEFUN(tanf,(a), float a) { return tan((double)a); }
-float _DEFUN(ceilf,(a), float a) { return ceil(a); }
-float _DEFUN(floorf,(a), float a) { return floor(a); }
+float cosf (float a) { return cos((double)a); }
+float sinf (float a) { return sin((double)a); }
+float log1pf (float a) { return log1p((double)a); }
+float tanf (float a) { return tan((double)a); }
+float ceilf (float a) { return ceil(a); }
+float floorf (float a) { return floor(a); }
#endif
/*ndef HAVE_FLOAT*/
diff --git a/newlib/libm/test/string.c b/newlib/libm/test/string.c
index e66117fb6..a8cc1a16f 100644
--- a/newlib/libm/test/string.c
+++ b/newlib/libm/test/string.c
@@ -10,8 +10,7 @@ int errors = 0;
#define check(thing) checkit(thing, __LINE__)
void
-_DEFUN(checkit,(ok,l),
- int ok,
+checkit (int ok,
int l )
{
@@ -31,8 +30,7 @@ _DEFUN(checkit,(ok,l),
#define equal(a, b) funcqual(a,b,__LINE__);
void
-_DEFUN(funcqual,(a,b,l),
- char *a,
+funcqual (char *a,
char *b,
int l)
{
diff --git a/newlib/libm/test/test.c b/newlib/libm/test/test.c
index 365c4c843..7769e2b36 100644
--- a/newlib/libm/test/test.c
+++ b/newlib/libm/test/test.c
@@ -9,8 +9,7 @@ int inacc;
int
-_DEFUN(main,(ac, av),
- int ac,
+main (int ac,
char **av)
{
int i;
@@ -57,8 +56,7 @@ bt();
static const char *iname = "foo";
void
-_DEFUN(newfunc,(string),
- const char *string)
+newfunc (const char *string)
{
if (strcmp(iname, string))
{
@@ -92,8 +90,7 @@ int reduce = 0;
int strtod_vector = 0;
int
-_DEFUN(bigger,(a,b),
- __ieee_double_shape_type *a,
+bigger (__ieee_double_shape_type *a,
__ieee_double_shape_type *b)
{
@@ -116,8 +113,7 @@ _DEFUN(bigger,(a,b),
/* Return the first bit different between two double numbers */
int
-_DEFUN(mag_of_error,(is, shouldbe),
- double is,
+mag_of_error (double is,
double shouldbe)
{
__ieee_double_shape_type a,b;
@@ -183,8 +179,7 @@ _DEFUN(mag_of_error,(is, shouldbe),
void
-_DEFUN(test_sok,(is, shouldbe),
- char *is,
+test_sok (char *is,
char *shouldbe)
{
if (strcmp(is,shouldbe))
@@ -197,8 +192,7 @@ _DEFUN(test_sok,(is, shouldbe),
}
}
void
-_DEFUN(test_iok,(is, shouldbe),
- int is,
+test_iok (int is,
int shouldbe)
{
if (is != shouldbe){
@@ -215,8 +209,7 @@ _DEFUN(test_iok,(is, shouldbe),
prec float conversions against double results
*/
void
-_DEFUN(test_scok,(is, shouldbe, count),
- char *is,
+test_scok (char *is,
char *shouldbe,
int count)
{
@@ -231,8 +224,7 @@ _DEFUN(test_scok,(is, shouldbe, count),
}
void
-_DEFUN(test_eok,(is, shouldbe),
- int is,
+test_eok (int is,
int shouldbe)
{
if (is != shouldbe){
@@ -245,8 +237,7 @@ _DEFUN(test_eok,(is, shouldbe),
}
void
-_DEFUN(test_mok,(value, shouldbe, okmag),
- double value,
+test_mok (double value,
double shouldbe,
int okmag)
{
diff --git a/newlib/libm/test/test_ieee.c b/newlib/libm/test/test_ieee.c
index 167a40c87..f23ceba6d 100644
--- a/newlib/libm/test/test_ieee.c
+++ b/newlib/libm/test/test_ieee.c
@@ -82,8 +82,7 @@ test_getroundtoi (void)
}
double
- _DEFUN(dnumber,(msw, lsw),
- int msw,
+ dnumber (int msw,
int lsw)
{
diff --git a/newlib/libm/test/test_is.c b/newlib/libm/test/test_is.c
index c4c8e2fdb..ac8f79c49 100644
--- a/newlib/libm/test/test_is.c
+++ b/newlib/libm/test/test_is.c
@@ -18,8 +18,7 @@ int mygraph;
int mypunct;
void
-_DEFUN(test_is_single,(i),
- int i)
+test_is_single (int i)
{
setascii = 0;
setlower = 0;
@@ -1913,28 +1912,27 @@ _DEFUN(test_is_single,(i),
}
-int _DEFUN(def_isascii,(i), int i) { return isascii(i); }
-int _DEFUN(def_iscntrl,(i), int i) { return iscntrl(i); }
-int _DEFUN(def_isspace,(i), int i) { return isspace(i); }
-int _DEFUN(def_isprint,(i), int i) { return isprint(i); }
-int _DEFUN(def_isalnum,(i), int i) { return isalnum(i); }
-int _DEFUN(def_isdigit,(i), int i) { return isdigit(i); }
-int _DEFUN(def_isxdigit,(i), int i) { return isxdigit(i); }
-int _DEFUN(def_isalpha,(i), int i) { return isalpha(i); }
-int _DEFUN(def_isupper,(i), int i) { return isupper(i); }
-int _DEFUN(def_islower,(i), int i) { return islower(i); }
-int _DEFUN(def_isgraph,(i), int i) { return isgraph(i); }
-int _DEFUN(def_ispunct,(i), int i) { return ispunct(i); }
-int _DEFUN(def_tolower,(i), int i) { return tolower(i); }
-int _DEFUN(def_toupper,(i), int i) { return toupper(i); }
-int _DEFUN(def_toascii,(i), int i) { return toascii(i); }
-int _DEFUN(def__tolower,(i), int i) { return _tolower(i); }
-int _DEFUN(def__toupper,(i), int i) { return _toupper(i); }
+int def_isascii (int i) { return isascii(i); }
+int def_iscntrl (int i) { return iscntrl(i); }
+int def_isspace (int i) { return isspace(i); }
+int def_isprint (int i) { return isprint(i); }
+int def_isalnum (int i) { return isalnum(i); }
+int def_isdigit (int i) { return isdigit(i); }
+int def_isxdigit (int i) { return isxdigit(i); }
+int def_isalpha (int i) { return isalpha(i); }
+int def_isupper (int i) { return isupper(i); }
+int def_islower (int i) { return islower(i); }
+int def_isgraph (int i) { return isgraph(i); }
+int def_ispunct (int i) { return ispunct(i); }
+int def_tolower (int i) { return tolower(i); }
+int def_toupper (int i) { return toupper(i); }
+int def_toascii (int i) { return toascii(i); }
+int def__tolower (int i) { return _tolower(i); }
+int def__toupper (int i) { return _toupper(i); }
extern int inacc;
void
-_DEFUN(test_is_set,(func, name, p),
- int (*func)(),
+test_is_set (int (*func)(),
char *name,
int *p)
{
@@ -1952,8 +1950,7 @@ _DEFUN(test_is_set,(func, name, p),
}
}
void
-_DEFUN(test_to_set,(func, name, p, low, high),
- int (*func)(),
+test_to_set (int (*func)(),
char *name,
int *p,
int low,
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 09/17] ansification: remove _DEFUN_VOID
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
` (7 preceding siblings ...)
2017-12-07 18:20 ` [PATCH v2 06/17] ansification: remove _VOID_PTR Yaakov Selkowitz
@ 2017-12-07 18:26 ` Yaakov Selkowitz
2017-12-07 18:26 ` [PATCH v2 12/17] ansification: remove _DEFUN Yaakov Selkowitz
` (8 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:26 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
libgloss/m68k/idp-inbyte.c | 2 +-
libgloss/m68k/mvme-stub.c | 8 ++++----
libgloss/mcore/read.c | 2 +-
libgloss/read.c | 2 +-
newlib/libc/include/_ansi.h | 2 --
newlib/libc/locale/locale.c | 2 +-
newlib/libc/locale/localeconv.c | 2 +-
newlib/libc/machine/microblaze/abort.c | 2 +-
newlib/libc/machine/nds32/abort.c | 2 +-
newlib/libc/machine/spu/stdio.c | 2 +-
newlib/libc/machine/spu/tmpfile.c | 2 +-
newlib/libc/reent/getreent.c | 2 +-
newlib/libc/reent/signgam.c | 2 +-
newlib/libc/search/hcreate.c | 2 +-
newlib/libc/signal/signal.c | 2 +-
newlib/libc/stdio/fcloseall.c | 2 +-
newlib/libc/stdio/findfp.c | 14 +++++++-------
newlib/libc/stdio/getchar.c | 2 +-
newlib/libc/stdio/getchar_u.c | 2 +-
newlib/libc/stdio/getwchar.c | 2 +-
newlib/libc/stdio/getwchar_u.c | 2 +-
newlib/libc/stdio/tmpfile.c | 2 +-
newlib/libc/stdio64/tmpfile64.c | 2 +-
newlib/libc/stdlib/abort.c | 2 +-
newlib/libc/stdlib/drand48.c | 2 +-
newlib/libc/stdlib/lrand48.c | 2 +-
newlib/libc/stdlib/mrand48.c | 2 +-
newlib/libc/stdlib/mstats.c | 4 ++--
newlib/libc/stdlib/rand.c | 2 +-
newlib/libc/stdlib/random.c | 2 +-
newlib/libc/sys/a29khif/getpid.c | 2 +-
newlib/libc/sys/linux/getlogin.c | 2 +-
newlib/libc/sys/sparc64/ieee.c | 8 ++++----
newlib/libc/sys/sun4/ieee.c | 8 ++++----
newlib/libc/sys/sysvi386/fpx.c | 6 +++---
newlib/libc/sys/sysvnecv70/fpx.c | 6 +++---
newlib/libc/syscalls/sysfork.c | 2 +-
newlib/libc/syscalls/sysgetpid.c | 2 +-
newlib/libc/time/tzlock.c | 4 ++--
newlib/libc/time/tzset.c | 4 ++--
newlib/libc/xdr/xdr.c | 2 +-
newlib/libc/xdr/xdr_sizeof.c | 2 +-
newlib/libm/test/convert.c | 32 ++++++++++++++++----------------
newlib/libm/test/math.c | 2 +-
newlib/libm/test/math2.c | 14 +++++++-------
newlib/libm/test/test_ieee.c | 12 ++++++------
newlib/libm/test/test_is.c | 2 +-
47 files changed, 94 insertions(+), 96 deletions(-)
diff --git a/libgloss/m68k/idp-inbyte.c b/libgloss/m68k/idp-inbyte.c
index 41db57fc9..c9c403cad 100644
--- a/libgloss/m68k/idp-inbyte.c
+++ b/libgloss/m68k/idp-inbyte.c
@@ -32,7 +32,7 @@
* from channel A
*/
char
-_DEFUN_VOID (inbyte)
+inbyte (void)
{
while ((READREG (DUART_SRA) & 0x01) == 0x00)
;
diff --git a/libgloss/m68k/mvme-stub.c b/libgloss/m68k/mvme-stub.c
index fbc4c61b5..fcf7e7bf0 100644
--- a/libgloss/m68k/mvme-stub.c
+++ b/libgloss/m68k/mvme-stub.c
@@ -133,7 +133,7 @@ ExceptionHook exceptionHook; /* hook variable for errors/exceptions */
/* FORWARD DECLARATIONS */
/************************/
/** static void initializeRemcomErrorFrame PARAMS ((void)); **/
-static void _DEFUN_VOID (initializeRemcomErrorFrame);
+static void initializeRemcomErrorFrame (void);
/************************************************************************/
/* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/
@@ -203,9 +203,9 @@ jmp_buf remcomEnv;
#define BREAKPOINT() asm(" trap #1");
-extern void _DEFUN_VOID (return_to_super);
-extern void _DEFUN_VOID (return_to_user);
-extern void _DEFUN_VOID (_catchException);
+extern void return_to_super (void);
+extern void return_to_user (void);
+extern void _catchException (void);
void _returnFromException( Frame *frame )
{
diff --git a/libgloss/mcore/read.c b/libgloss/mcore/read.c
index 8f394780c..d97d98d22 100644
--- a/libgloss/mcore/read.c
+++ b/libgloss/mcore/read.c
@@ -14,7 +14,7 @@
*/
#include "glue.h"
-extern char _DEFUN_VOID (inbyte);
+extern char inbyte (void);
/*
* read -- read bytes from the serial port. Ignore fd, since
diff --git a/libgloss/read.c b/libgloss/read.c
index 2e5e0c72c..507c9802f 100644
--- a/libgloss/read.c
+++ b/libgloss/read.c
@@ -14,7 +14,7 @@
*/
#include "glue.h"
-extern char _DEFUN_VOID (inbyte);
+extern char inbyte (void);
/*
* read -- read bytes from the serial port. Ignore fd, since
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index 5e0cce4c8..b8d27b24e 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -62,7 +62,6 @@
#define _EXFNPTR(name, proto) (* name) proto
#endif
#define _DEFUN(name, arglist, args) name(args)
-#define _DEFUN_VOID(name) name(void)
#ifndef _LONG_DOUBLE
#define _LONG_DOUBLE long double
#endif
@@ -73,7 +72,6 @@
#define _EXFUN(name, proto) name()
#define _EXFUN_NOTHROW(name, proto) name()
#define _DEFUN(name, arglist, args) name arglist args;
-#define _DEFUN_VOID(name) name()
#define _LONG_DOUBLE double
#endif
diff --git a/newlib/libc/locale/locale.c b/newlib/libc/locale/locale.c
index f461ef162..7080b0510 100644
--- a/newlib/libc/locale/locale.c
+++ b/newlib/libc/locale/locale.c
@@ -966,7 +966,7 @@ __get_locale_env (struct _reent *p, int category)
#endif /* _MB_CAPABLE */
int
-_DEFUN_VOID (__locale_mb_cur_max)
+__locale_mb_cur_max (void)
{
#ifdef __HAVE_LOCALE_INFO__
return __get_current_ctype_locale ()->mb_cur_max[0];
diff --git a/newlib/libc/locale/localeconv.c b/newlib/libc/locale/localeconv.c
index 165f6f7c3..b87f604a3 100644
--- a/newlib/libc/locale/localeconv.c
+++ b/newlib/libc/locale/localeconv.c
@@ -62,7 +62,7 @@ _DEFUN (_localeconv_r, (data),
#ifndef _REENT_ONLY
struct lconv *
-_DEFUN_VOID (localeconv)
+localeconv (void)
{
return __localeconv_l (__get_current_locale ());
}
diff --git a/newlib/libc/machine/microblaze/abort.c b/newlib/libc/machine/microblaze/abort.c
index 82daebe43..a2bb535e0 100644
--- a/newlib/libc/machine/microblaze/abort.c
+++ b/newlib/libc/machine/microblaze/abort.c
@@ -47,7 +47,7 @@ Supporting OS subroutines required: <<_exit>> and optionally, <<write>>.
#include <signal.h>
_VOID
-_DEFUN_VOID (abort)
+abort (void)
{
#ifdef ABORT_MESSAGE
write (2, "Abort called\n", sizeof ("Abort called\n")-1);
diff --git a/newlib/libc/machine/nds32/abort.c b/newlib/libc/machine/nds32/abort.c
index abceb4b8b..c952ce569 100644
--- a/newlib/libc/machine/nds32/abort.c
+++ b/newlib/libc/machine/nds32/abort.c
@@ -29,7 +29,7 @@ Supporting OS subroutines required: <<_exit>>.
#include <unistd.h>
_VOID
-_DEFUN_VOID (abort)
+abort (void)
{
while (1)
{
diff --git a/newlib/libc/machine/spu/stdio.c b/newlib/libc/machine/spu/stdio.c
index 997ccb7a0..e8b9dd9fa 100644
--- a/newlib/libc/machine/spu/stdio.c
+++ b/newlib/libc/machine/spu/stdio.c
@@ -82,7 +82,7 @@ _DEFUN (__sinit, (s),
}
_VOID
-_DEFUN_VOID (__check_init)
+__check_init (void)
{
CHECK_INIT(_REENT);
}
diff --git a/newlib/libc/machine/spu/tmpfile.c b/newlib/libc/machine/spu/tmpfile.c
index c66f78388..e926cbc48 100644
--- a/newlib/libc/machine/spu/tmpfile.c
+++ b/newlib/libc/machine/spu/tmpfile.c
@@ -37,7 +37,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#ifndef _REENT_ONLY
FILE *
-_DEFUN_VOID (tmpfile)
+tmpfile (void)
{
int ret;
FILE* fp;
diff --git a/newlib/libc/reent/getreent.c b/newlib/libc/reent/getreent.c
index 124abce2a..5fa98e96b 100644
--- a/newlib/libc/reent/getreent.c
+++ b/newlib/libc/reent/getreent.c
@@ -14,7 +14,7 @@ int _dummy_getreent;
#endif
struct _reent *
-_DEFUN_VOID(__getreent)
+__getreent (void)
{
return _impure_ptr;
}
diff --git a/newlib/libc/reent/signgam.c b/newlib/libc/reent/signgam.c
index bfb2dea51..b1017d861 100644
--- a/newlib/libc/reent/signgam.c
+++ b/newlib/libc/reent/signgam.c
@@ -8,7 +8,7 @@
#ifndef _REENT_ONLY
int *
-_DEFUN_VOID (__signgam)
+__signgam (void)
{
return &_REENT_SIGNGAM(_REENT);
}
diff --git a/newlib/libc/search/hcreate.c b/newlib/libc/search/hcreate.c
index 800211689..5472de1f0 100644
--- a/newlib/libc/search/hcreate.c
+++ b/newlib/libc/search/hcreate.c
@@ -63,7 +63,7 @@ _DEFUN(hcreate, (nel), size_t nel)
}
void
-_DEFUN_VOID (hdestroy)
+hdestroy (void)
{
hdestroy_r (&htab);
}
diff --git a/newlib/libc/signal/signal.c b/newlib/libc/signal/signal.c
index 806abd888..f5fe4c0b9 100644
--- a/newlib/libc/signal/signal.c
+++ b/newlib/libc/signal/signal.c
@@ -213,7 +213,7 @@ _DEFUN (signal, (sig, func),
}
int
-_DEFUN_VOID (_init_signal)
+_init_signal (void)
{
return _init_signal_r (_REENT);
}
diff --git a/newlib/libc/stdio/fcloseall.c b/newlib/libc/stdio/fcloseall.c
index a578e8a00..659172b32 100644
--- a/newlib/libc/stdio/fcloseall.c
+++ b/newlib/libc/stdio/fcloseall.c
@@ -66,7 +66,7 @@ _DEFUN(_fcloseall_r, (ptr),
#ifndef _REENT_ONLY
int
-_DEFUN_VOID(fcloseall)
+fcloseall (void)
{
return _fcloseall_r (_GLOBAL_REENT);
}
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index a7ea76bb5..fb437515d 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -235,7 +235,7 @@ _DEFUN(_cleanup_r, (ptr),
#ifndef _REENT_ONLY
_VOID
-_DEFUN_VOID(_cleanup)
+_cleanup (void)
{
_cleanup_r (_GLOBAL_REENT);
}
@@ -304,25 +304,25 @@ __LOCK_INIT_RECURSIVE(static, __sfp_recursive_mutex);
__LOCK_INIT_RECURSIVE(static, __sinit_recursive_mutex);
_VOID
-_DEFUN_VOID(__sfp_lock_acquire)
+__sfp_lock_acquire (void)
{
__lock_acquire_recursive (__sfp_recursive_mutex);
}
_VOID
-_DEFUN_VOID(__sfp_lock_release)
+__sfp_lock_release (void)
{
__lock_release_recursive (__sfp_recursive_mutex);
}
_VOID
-_DEFUN_VOID(__sinit_lock_acquire)
+__sinit_lock_acquire (void)
{
__lock_acquire_recursive (__sinit_recursive_mutex);
}
_VOID
-_DEFUN_VOID(__sinit_lock_release)
+__sinit_lock_release (void)
{
__lock_release_recursive (__sinit_recursive_mutex);
}
@@ -350,7 +350,7 @@ _DEFUN(__fp_unlock, (ptr),
}
_VOID
-_DEFUN_VOID(__fp_lock_all)
+__fp_lock_all (void)
{
__sfp_lock_acquire ();
@@ -358,7 +358,7 @@ _DEFUN_VOID(__fp_lock_all)
}
_VOID
-_DEFUN_VOID(__fp_unlock_all)
+__fp_unlock_all (void)
{
(void) _fwalk (_REENT, __fp_unlock);
diff --git a/newlib/libc/stdio/getchar.c b/newlib/libc/stdio/getchar.c
index 07ba9e64f..b3ca289ba 100644
--- a/newlib/libc/stdio/getchar.c
+++ b/newlib/libc/stdio/getchar.c
@@ -82,7 +82,7 @@ _DEFUN(_getchar_r, (reent),
#ifndef _REENT_ONLY
int
-_DEFUN_VOID(getchar)
+getchar (void)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdio/getchar_u.c b/newlib/libc/stdio/getchar_u.c
index 516b4dbd2..5848d47ac 100644
--- a/newlib/libc/stdio/getchar_u.c
+++ b/newlib/libc/stdio/getchar_u.c
@@ -79,7 +79,7 @@ _DEFUN(_getchar_unlocked_r, (ptr),
#ifndef _REENT_ONLY
int
-_DEFUN_VOID(getchar_unlocked)
+getchar_unlocked (void)
{
/* CHECK_INIT is called (eventually) by __srefill_r. */
diff --git a/newlib/libc/stdio/getwchar.c b/newlib/libc/stdio/getwchar.c
index 61031e5a6..f432755a0 100644
--- a/newlib/libc/stdio/getwchar.c
+++ b/newlib/libc/stdio/getwchar.c
@@ -103,7 +103,7 @@ _DEFUN (_getwchar_r, (ptr),
* Synonym for fgetwc(stdin).
*/
wint_t
-_DEFUN_VOID (getwchar)
+getwchar (void)
{
_REENT_SMALL_CHECK_INIT (_REENT);
return fgetwc (stdin);
diff --git a/newlib/libc/stdio/getwchar_u.c b/newlib/libc/stdio/getwchar_u.c
index f5c50cced..4c854f213 100644
--- a/newlib/libc/stdio/getwchar_u.c
+++ b/newlib/libc/stdio/getwchar_u.c
@@ -44,7 +44,7 @@ _DEFUN (_getwchar_unlocked_r, (ptr),
* Synonym for fgetwc_unlocked(stdin).
*/
wint_t
-_DEFUN_VOID (getwchar_unlocked)
+getwchar_unlocked (void)
{
_REENT_SMALL_CHECK_INIT (_REENT);
return fgetwc_unlocked (stdin);
diff --git a/newlib/libc/stdio/tmpfile.c b/newlib/libc/stdio/tmpfile.c
index 30e9040fd..ee30523ab 100644
--- a/newlib/libc/stdio/tmpfile.c
+++ b/newlib/libc/stdio/tmpfile.c
@@ -81,7 +81,7 @@ _DEFUN(_tmpfile_r, (ptr),
#ifndef _REENT_ONLY
FILE *
-_DEFUN_VOID(tmpfile)
+tmpfile (void)
{
return _tmpfile_r (_REENT);
}
diff --git a/newlib/libc/stdio64/tmpfile64.c b/newlib/libc/stdio64/tmpfile64.c
index 58b945d5b..2012417fb 100644
--- a/newlib/libc/stdio64/tmpfile64.c
+++ b/newlib/libc/stdio64/tmpfile64.c
@@ -84,7 +84,7 @@ _DEFUN (_tmpfile64_r, (ptr),
#ifndef _REENT_ONLY
FILE *
-_DEFUN_VOID (tmpfile64)
+tmpfile64 (void)
{
return _tmpfile64_r (_REENT);
}
diff --git a/newlib/libc/stdlib/abort.c b/newlib/libc/stdlib/abort.c
index febc07a31..ae0c2fb62 100644
--- a/newlib/libc/stdlib/abort.c
+++ b/newlib/libc/stdlib/abort.c
@@ -47,7 +47,7 @@ Supporting OS subroutines required: <<_exit>> and optionally, <<write>>.
#include <signal.h>
_VOID
-_DEFUN_VOID (abort)
+abort (void)
{
#ifdef ABORT_MESSAGE
write (2, "Abort called\n", sizeof ("Abort called\n")-1);
diff --git a/newlib/libc/stdlib/drand48.c b/newlib/libc/stdlib/drand48.c
index 89fe6af1d..6c4dca1ed 100644
--- a/newlib/libc/stdlib/drand48.c
+++ b/newlib/libc/stdlib/drand48.c
@@ -23,7 +23,7 @@ _DEFUN (_drand48_r, (r),
#ifndef _REENT_ONLY
double
-_DEFUN_VOID (drand48)
+drand48 (void)
{
return _drand48_r (_REENT);
}
diff --git a/newlib/libc/stdlib/lrand48.c b/newlib/libc/stdlib/lrand48.c
index bfc693b75..bb3289c83 100644
--- a/newlib/libc/stdlib/lrand48.c
+++ b/newlib/libc/stdlib/lrand48.c
@@ -25,7 +25,7 @@ _DEFUN (_lrand48_r, (r),
#ifndef _REENT_ONLY
long
-_DEFUN_VOID (lrand48)
+lrand48 (void)
{
return _lrand48_r (_REENT);
}
diff --git a/newlib/libc/stdlib/mrand48.c b/newlib/libc/stdlib/mrand48.c
index 28f4f7d2b..62b44edc9 100644
--- a/newlib/libc/stdlib/mrand48.c
+++ b/newlib/libc/stdlib/mrand48.c
@@ -24,7 +24,7 @@ _DEFUN (_mrand48_r, (r),
#ifndef _REENT_ONLY
long
-_DEFUN_VOID (mrand48)
+mrand48 (void)
{
return _mrand48_r (_REENT);
}
diff --git a/newlib/libc/stdlib/mstats.c b/newlib/libc/stdlib/mstats.c
index b7aa93b28..92f9fb792 100644
--- a/newlib/libc/stdlib/mstats.c
+++ b/newlib/libc/stdlib/mstats.c
@@ -84,14 +84,14 @@ not portable.
#ifndef _REENT_ONLY
struct mallinfo
-_DEFUN_VOID (mallinfo)
+mallinfo (void)
{
return _mallinfo_r (_REENT);
}
#if !defined (_ELIX_LEVEL) || _ELIX_LEVEL >= 2
void
-_DEFUN_VOID (malloc_stats)
+malloc_stats (void)
{
_malloc_stats_r (_REENT);
}
diff --git a/newlib/libc/stdlib/rand.c b/newlib/libc/stdlib/rand.c
index aacb0a8a4..e6ef7a1f6 100644
--- a/newlib/libc/stdlib/rand.c
+++ b/newlib/libc/stdlib/rand.c
@@ -68,7 +68,7 @@ _DEFUN (srand, (seed), unsigned int seed)
}
int
-_DEFUN_VOID (rand)
+rand (void)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/stdlib/random.c b/newlib/libc/stdlib/random.c
index 7abca6da4..b3b0ca305 100644
--- a/newlib/libc/stdlib/random.c
+++ b/newlib/libc/stdlib/random.c
@@ -66,7 +66,7 @@ _DEFUN (srandom, (seed), unsigned int seed)
}
long int
-_DEFUN_VOID (random)
+random (void)
{
struct _reent *reent = _REENT;
diff --git a/newlib/libc/sys/a29khif/getpid.c b/newlib/libc/sys/a29khif/getpid.c
index 99d88bd39..5d95b933e 100644
--- a/newlib/libc/sys/a29khif/getpid.c
+++ b/newlib/libc/sys/a29khif/getpid.c
@@ -6,7 +6,7 @@
<sys/types.h>. */
int
-_DEFUN_VOID (_getpid)
+_getpid (void)
{
return 1;
}
diff --git a/newlib/libc/sys/linux/getlogin.c b/newlib/libc/sys/linux/getlogin.c
index 3931e7731..1cc0f4e04 100644
--- a/newlib/libc/sys/linux/getlogin.c
+++ b/newlib/libc/sys/linux/getlogin.c
@@ -3,7 +3,7 @@
#include <unistd.h>
char *
-_DEFUN_VOID (getlogin)
+getlogin (void)
{
errno = ENOSYS;
return NULL;
diff --git a/newlib/libc/sys/sparc64/ieee.c b/newlib/libc/sys/sparc64/ieee.c
index 28289761d..f3298e63d 100644
--- a/newlib/libc/sys/sparc64/ieee.c
+++ b/newlib/libc/sys/sparc64/ieee.c
@@ -3,7 +3,7 @@
fp_rnd
-_DEFUN_VOID(fpgetround)
+fpgetround (void)
{
char *out;
ieee_flags("get", "direction","", &out);
@@ -44,7 +44,7 @@ _DEFUN(fpsetround,(new),
fp_except
-_DEFUN_VOID(fpgetmask)
+fpgetmask (void)
{
char *out;
int r = 0;
@@ -92,7 +92,7 @@ _DEFUN(fpsetsticky,(mask),
}
fp_except
-_DEFUN_VOID(fpgetsticky)
+fpgetsticky (void)
{
return fpgetmask();
}
@@ -107,7 +107,7 @@ _DEFUN(fpsetroundtoi,(rdi_mode),
}
int
-_DEFUN_VOID(fpgetroundtoi)
+fpgetroundtoi (void)
{
return 0;
diff --git a/newlib/libc/sys/sun4/ieee.c b/newlib/libc/sys/sun4/ieee.c
index 28289761d..f3298e63d 100644
--- a/newlib/libc/sys/sun4/ieee.c
+++ b/newlib/libc/sys/sun4/ieee.c
@@ -3,7 +3,7 @@
fp_rnd
-_DEFUN_VOID(fpgetround)
+fpgetround (void)
{
char *out;
ieee_flags("get", "direction","", &out);
@@ -44,7 +44,7 @@ _DEFUN(fpsetround,(new),
fp_except
-_DEFUN_VOID(fpgetmask)
+fpgetmask (void)
{
char *out;
int r = 0;
@@ -92,7 +92,7 @@ _DEFUN(fpsetsticky,(mask),
}
fp_except
-_DEFUN_VOID(fpgetsticky)
+fpgetsticky (void)
{
return fpgetmask();
}
@@ -107,7 +107,7 @@ _DEFUN(fpsetroundtoi,(rdi_mode),
}
int
-_DEFUN_VOID(fpgetroundtoi)
+fpgetroundtoi (void)
{
return 0;
diff --git a/newlib/libc/sys/sysvi386/fpx.c b/newlib/libc/sys/sysvi386/fpx.c
index d55a1e30f..c9ff7c314 100644
--- a/newlib/libc/sys/sysvi386/fpx.c
+++ b/newlib/libc/sys/sysvi386/fpx.c
@@ -17,7 +17,7 @@ fp_except _DEFUN(fpsetmask,(newmask),
}
-fp_except _DEFUN_VOID(fpgetmask)
+fp_except fpgetmask (void)
{
v60_tkcw_type tkcw;
sysv60(0, 8, &tkcw);
@@ -25,7 +25,7 @@ fp_except _DEFUN_VOID(fpgetmask)
}
-fp_rnd _DEFUN_VOID(fpgetround)
+fp_rnd fpgetround (void)
{
v60_tkcw_type tkcw;
sysv60(0, 8, &tkcw);
@@ -49,7 +49,7 @@ fp_rnd _DEFUN(fpsetround,(rnd),
-fp_rdi _DEFUN_VOID(fpgetroundtoi)
+fp_rdi fpgetroundtoi (void)
{
v60_tkcw_type tkcw;
sysv60(0, 8, &tkcw);
diff --git a/newlib/libc/sys/sysvnecv70/fpx.c b/newlib/libc/sys/sysvnecv70/fpx.c
index d55a1e30f..c9ff7c314 100644
--- a/newlib/libc/sys/sysvnecv70/fpx.c
+++ b/newlib/libc/sys/sysvnecv70/fpx.c
@@ -17,7 +17,7 @@ fp_except _DEFUN(fpsetmask,(newmask),
}
-fp_except _DEFUN_VOID(fpgetmask)
+fp_except fpgetmask (void)
{
v60_tkcw_type tkcw;
sysv60(0, 8, &tkcw);
@@ -25,7 +25,7 @@ fp_except _DEFUN_VOID(fpgetmask)
}
-fp_rnd _DEFUN_VOID(fpgetround)
+fp_rnd fpgetround (void)
{
v60_tkcw_type tkcw;
sysv60(0, 8, &tkcw);
@@ -49,7 +49,7 @@ fp_rnd _DEFUN(fpsetround,(rnd),
-fp_rdi _DEFUN_VOID(fpgetroundtoi)
+fp_rdi fpgetroundtoi (void)
{
v60_tkcw_type tkcw;
sysv60(0, 8, &tkcw);
diff --git a/newlib/libc/syscalls/sysfork.c b/newlib/libc/syscalls/sysfork.c
index 21e6be0e2..282f73fe3 100644
--- a/newlib/libc/syscalls/sysfork.c
+++ b/newlib/libc/syscalls/sysfork.c
@@ -8,7 +8,7 @@
#include <unistd.h>
int
-_DEFUN_VOID (fork)
+fork (void)
{
return _fork_r (_REENT);
}
diff --git a/newlib/libc/syscalls/sysgetpid.c b/newlib/libc/syscalls/sysgetpid.c
index f18783c75..22c7605e8 100644
--- a/newlib/libc/syscalls/sysgetpid.c
+++ b/newlib/libc/syscalls/sysgetpid.c
@@ -4,7 +4,7 @@
#include <unistd.h>
int
-_DEFUN_VOID (getpid)
+getpid (void)
{
return _getpid_r (_REENT);
}
diff --git a/newlib/libc/time/tzlock.c b/newlib/libc/time/tzlock.c
index 24354ad0b..153dfd3a5 100644
--- a/newlib/libc/time/tzlock.c
+++ b/newlib/libc/time/tzlock.c
@@ -36,7 +36,7 @@ __LOCK_INIT(static, __tz_mutex);
#endif
_VOID
-_DEFUN_VOID (__tz_lock)
+__tz_lock (void)
{
#ifndef __SINGLE_THREAD__
__lock_acquire(__tz_mutex);
@@ -44,7 +44,7 @@ _DEFUN_VOID (__tz_lock)
}
_VOID
-_DEFUN_VOID (__tz_unlock)
+__tz_unlock (void)
{
#ifndef __SINGLE_THREAD__
__lock_release(__tz_mutex);
diff --git a/newlib/libc/time/tzset.c b/newlib/libc/time/tzset.c
index 629b8f240..ca1e1d91f 100644
--- a/newlib/libc/time/tzset.c
+++ b/newlib/libc/time/tzset.c
@@ -62,13 +62,13 @@ Supporting OS subroutine required: None
#include "local.h"
_VOID
-_DEFUN_VOID (_tzset_unlocked)
+_tzset_unlocked (void)
{
_tzset_unlocked_r (_REENT);
}
_VOID
-_DEFUN_VOID (tzset)
+tzset (void)
{
TZ_LOCK;
_tzset_unlocked_r (_REENT);
diff --git a/newlib/libc/xdr/xdr.c b/newlib/libc/xdr/xdr.c
index 8c637fcbf..b60a89782 100644
--- a/newlib/libc/xdr/xdr.c
+++ b/newlib/libc/xdr/xdr.c
@@ -76,7 +76,7 @@ _DEFUN (xdr_free, (proc, objp),
* XDR nothing
*/
bool_t
-_DEFUN_VOID (xdr_void)
+xdr_void (void)
{
return TRUE;
}
diff --git a/newlib/libc/xdr/xdr_sizeof.c b/newlib/libc/xdr/xdr_sizeof.c
index b7dc6d098..427917640 100644
--- a/newlib/libc/xdr/xdr_sizeof.c
+++ b/newlib/libc/xdr/xdr_sizeof.c
@@ -111,7 +111,7 @@ _DEFUN (x_inline, (xdrs, len),
}
static int
-_DEFUN_VOID (harmless)
+harmless (void)
{
/* Always return FALSE/NULL, as the case may be */
return 0;
diff --git a/newlib/libm/test/convert.c b/newlib/libm/test/convert.c
index 8420cdec7..24188fa8b 100644
--- a/newlib/libm/test/convert.c
+++ b/newlib/libm/test/convert.c
@@ -13,7 +13,7 @@ extern double_type doubles[];
double_type *pd = doubles;
void
-_DEFUN_VOID(test_strtod)
+test_strtod (void)
{
char *tail;
double v;
@@ -24,7 +24,7 @@ _DEFUN_VOID(test_strtod)
}
void
-_DEFUN_VOID(test_strtof)
+test_strtof (void)
{
char *tail;
double v;
@@ -35,13 +35,13 @@ _DEFUN_VOID(test_strtof)
}
void
-_DEFUN_VOID(test_atof)
+test_atof (void)
{
test_mok(atof(pd->string), pd->value, 64);
}
void
-_DEFUN_VOID(test_atoff)
+test_atoff (void)
{
test_mok(atoff(pd->string), pd->value, 32);
}
@@ -101,7 +101,7 @@ _DEFUN(test_strtol_base,(base, pi, string),
}
void
-_DEFUN_VOID(test_strtol)
+test_strtol (void)
{
test_strtol_base(8,&(p->octal), p->string);
test_strtol_base(10,&(p->decimal), p->string);
@@ -111,14 +111,14 @@ _DEFUN_VOID(test_strtol)
}
void
-_DEFUN_VOID(test_atoi)
+test_atoi (void)
{
test_iok(atoi(p->string), p->decimal.value);
test_eok(errno, p->decimal.errno_val);
}
void
-_DEFUN_VOID(test_atol)
+test_atol (void)
{
test_iok(atol(p->string), p->decimal.value);
test_eok(errno, p->decimal.errno_val);
@@ -128,7 +128,7 @@ _DEFUN_VOID(test_atol)
extern ddouble_type ddoubles[];
ddouble_type *pdd;
void
-_DEFUN_VOID(test_ecvtbuf)
+test_ecvtbuf (void)
{
int a2,a3;
char *s;
@@ -140,7 +140,7 @@ _DEFUN_VOID(test_ecvtbuf)
}
void
-_DEFUN_VOID(test_ecvt)
+test_ecvt (void)
{
int a2,a3;
char *s;
@@ -158,7 +158,7 @@ _DEFUN_VOID(test_ecvt)
}
void
-_DEFUN_VOID(test_fcvtbuf)
+test_fcvtbuf (void)
{
int a2,a3;
char *s;
@@ -170,7 +170,7 @@ _DEFUN_VOID(test_fcvtbuf)
}
void
-_DEFUN_VOID(test_gcvt)
+test_gcvt (void)
{
char *s = gcvt(pdd->value, pdd->g1, buffer);
test_scok(s, pdd->gstring, 9);
@@ -181,7 +181,7 @@ _DEFUN_VOID(test_gcvt)
}
void
-_DEFUN_VOID(test_fcvt)
+test_fcvt (void)
{
int a2,a3;
char *sd;
@@ -223,7 +223,7 @@ _DEFUN(diterate,(func, name),
void
-_DEFUN_VOID(deltest)
+deltest (void)
{
newfunc("rounding");
line(1);
@@ -255,7 +255,7 @@ _DEFUN_VOID(deltest)
/* Most of what sprint does is tested with the tests of
fcvt/ecvt/gcvt, but here are some more */
void
-_DEFUN_VOID(test_sprint)
+test_sprint (void)
{
extern sprint_double_type sprint_doubles[];
sprint_double_type *s = sprint_doubles;
@@ -286,7 +286,7 @@ _DEFUN_VOID(test_sprint)
/* Scanf calls strtod etc tested elsewhere, but also has some pattern matching skills */
void
-_DEFUN_VOID(test_scan)
+test_scan (void)
{
int i,j;
extern sprint_double_type sprint_doubles[];
@@ -340,7 +340,7 @@ _DEFUN_VOID(test_scan)
}
void
-_DEFUN_VOID(test_cvt)
+test_cvt (void)
{
deltest();
diff --git a/newlib/libm/test/math.c b/newlib/libm/test/math.c
index 50b22223a..f58f64f79 100644
--- a/newlib/libm/test/math.c
+++ b/newlib/libm/test/math.c
@@ -354,7 +354,7 @@ _DEFUN(run_vector_1,(vector, p, func, name, args),
}
void
-_DEFUN_VOID(test_math)
+test_math (void)
{
test_acos(0);
test_acosf(0);
diff --git a/newlib/libm/test/math2.c b/newlib/libm/test/math2.c
index 50b537646..b7108de4a 100644
--- a/newlib/libm/test/math2.c
+++ b/newlib/libm/test/math2.c
@@ -4,14 +4,14 @@
int
-_DEFUN_VOID(randi)
+randi (void)
{
static int next;
next = (next * 1103515245) + 12345;
return ((next >> 16) & 0xffff);
}
-double _DEFUN_VOID(randx)
+double randx (void)
{
double res;
@@ -34,7 +34,7 @@ double _DEFUN_VOID(randx)
}
/* Return a random double, but bias for numbers closer to 0 */
-double _DEFUN_VOID(randy)
+double randy (void)
{
int pow;
double r= randx();
@@ -43,7 +43,7 @@ double _DEFUN_VOID(randy)
}
void
-_DEFUN_VOID(test_frexp)
+test_frexp (void)
{
int i;
double r;
@@ -131,7 +131,7 @@ _DEFUN_VOID(test_frexp)
*/
void
-_DEFUN_VOID(test_mod)
+test_mod (void)
{
int i;
@@ -176,7 +176,7 @@ _DEFUN_VOID(test_mod)
Test pow by multiplying logs
*/
void
-_DEFUN_VOID(test_pow)
+test_pow (void)
{
unsigned int i;
newfunc("pow");
@@ -224,7 +224,7 @@ _DEFUN_VOID(test_pow)
void
-_DEFUN_VOID(test_math2)
+test_math2 (void)
{
test_mod();
test_frexp();
diff --git a/newlib/libm/test/test_ieee.c b/newlib/libm/test/test_ieee.c
index 07c49418d..167a40c87 100644
--- a/newlib/libm/test/test_ieee.c
+++ b/newlib/libm/test/test_ieee.c
@@ -6,7 +6,7 @@
/* Test fp getround and fp setround */
void
-_DEFUN_VOID(test_getround)
+test_getround (void)
{
newfunc("fpgetround/fpsetround");
@@ -26,7 +26,7 @@ _DEFUN_VOID(test_getround)
/* And fpset/fpgetmask */
void
-_DEFUN_VOID(test_getmask)
+test_getmask (void)
{
newfunc("fpsetmask/fpgetmask");
line(1);
@@ -47,7 +47,7 @@ _DEFUN_VOID(test_getmask)
}
void
-_DEFUN_VOID(test_getsticky)
+test_getsticky (void)
{
newfunc("fpsetsticky/fpgetsticky");
line(1);
@@ -68,7 +68,7 @@ _DEFUN_VOID(test_getsticky)
}
void
-_DEFUN_VOID(test_getroundtoi)
+test_getroundtoi (void)
{
newfunc("fpsetroundtoi/fpgetroundtoi");
line(1);
@@ -105,7 +105,7 @@ double sub_rounded_down ;
double sub_rounded_up ;
double r1,r2,r3,r4;
void
-_DEFUN_VOID(test_round)
+test_round (void)
{
n = dnumber(0x40000000, 0x00000008); /* near 2 */
m = dnumber(0x40400000, 0x00000003); /* near 3.4 */
@@ -163,7 +163,7 @@ _DEFUN_VOID(test_round)
void
-_DEFUN_VOID(test_ieee)
+test_ieee (void)
{
fp_rnd old = fpgetround();
test_getround();
diff --git a/newlib/libm/test/test_is.c b/newlib/libm/test/test_is.c
index 39c15c10e..c4c8e2fdb 100644
--- a/newlib/libm/test/test_is.c
+++ b/newlib/libm/test/test_is.c
@@ -1993,7 +1993,7 @@ _DEFUN(test_to_set,(func, name, p, low, high),
#undef _toupper
void
-_DEFUN_VOID(test_is)
+test_is (void)
{
test_is_set(def_isalnum, "isalnum define", &myalnum);
test_is_set(def_isalpha, "isalpha define", &myalpha);
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 11/17] ansification: remove _VOLATILE, _SIGNED
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
` (9 preceding siblings ...)
2017-12-07 18:26 ` [PATCH v2 12/17] ansification: remove _DEFUN Yaakov Selkowitz
@ 2017-12-07 18:26 ` Yaakov Selkowitz
2017-12-07 18:27 ` [PATCH v2 05/17] ansification: remove _PARAMS Yaakov Selkowitz
` (6 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:26 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
newlib/libc/include/_ansi.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index 9c3a04695..d05145b91 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -47,8 +47,6 @@
#endif
#ifdef _HAVE_STDC
-#define _VOLATILE volatile
-#define _SIGNED signed
#ifdef __CYGWIN__
#define _EXFUN_NOTHROW(name, proto) __cdecl name proto _NOTHROW
#define _EXFUN(name, proto) __cdecl name proto
@@ -65,8 +63,6 @@
#define _LONG_DOUBLE long double
#endif
#else
-#define _VOLATILE
-#define _SIGNED
#define _EXFUN(name, proto) name()
#define _EXFUN_NOTHROW(name, proto) name()
#define _DEFUN(name, arglist, args) name arglist args;
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 05/17] ansification: remove _PARAMS
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
` (10 preceding siblings ...)
2017-12-07 18:26 ` [PATCH v2 11/17] ansification: remove _VOLATILE, _SIGNED Yaakov Selkowitz
@ 2017-12-07 18:27 ` Yaakov Selkowitz
2017-12-07 18:28 ` [PATCH v2 10/17] ansification: remove _VOID Yaakov Selkowitz
` (5 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:27 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
libgloss/aarch64/_exit.c | 2 +-
libgloss/aarch64/_kill.c | 2 +-
libgloss/aarch64/svc.h | 6 +-
libgloss/aarch64/syscalls.c | 62 ++---
libgloss/arm/_exit.c | 4 +-
libgloss/arm/_kill.c | 2 +-
libgloss/arm/swi.h | 6 +-
libgloss/arm/syscalls.c | 62 ++---
newlib/libc/include/_ansi.h | 6 -
newlib/libc/include/malloc.h | 54 ++--
newlib/libc/include/math.h | 448 +++++++++++++++----------------
newlib/libc/include/reent.h | 50 ++--
newlib/libc/include/sys/_default_fcntl.h | 18 +-
newlib/libc/include/sys/errno.h | 2 +-
newlib/libc/include/sys/reent.h | 2 +-
newlib/libc/include/sys/timeb.h | 2 +-
newlib/libc/machine/cris/sys/errno.h | 2 +-
newlib/libc/machine/cris/sys/fcntl.h | 12 +-
newlib/libc/machine/powerpc/ufix64toa.c | 4 +-
newlib/libc/machine/powerpc/vfprintf.c | 22 +-
newlib/libc/search/qsort.c | 4 +-
newlib/libc/stdio/nano-vfprintf_local.h | 4 +-
newlib/libc/stdio/nano-vfscanf_i.c | 2 +-
newlib/libc/stdio/vfprintf.c | 8 +-
newlib/libc/stdio/vfscanf.c | 2 +-
newlib/libc/stdio/vfwprintf.c | 8 +-
newlib/libc/stdio/vfwscanf.c | 6 +-
newlib/libc/stdlib/atexit.h | 4 +-
newlib/libc/stdlib/cxa_atexit.c | 2 +-
newlib/libc/stdlib/exit.c | 2 +-
newlib/libc/stdlib/setenv.c | 2 +-
newlib/libc/stdlib/setenv_r.c | 2 +-
newlib/libc/string/strerror.c | 2 +-
newlib/libc/sys/arm/syscalls.c | 62 ++---
newlib/libc/sys/linux/sys/errno.h | 2 +-
newlib/libc/sys/linux/sys/fcntl.h | 10 +-
newlib/libc/sys/phoenix/sys/errno.h | 2 +-
newlib/libc/sys/sparc64/sys/fcntl.h | 6 +-
winsup/cygwin/include/cygwin/stdlib.h | 4 +-
winsup/cygwin/include/fcntl.h | 4 +-
winsup/cygwin/include/sys/file.h | 2 +-
41 files changed, 451 insertions(+), 457 deletions(-)
diff --git a/libgloss/aarch64/_exit.c b/libgloss/aarch64/_exit.c
index 1a6b01532..16564bbda 100644
--- a/libgloss/aarch64/_exit.c
+++ b/libgloss/aarch64/_exit.c
@@ -26,7 +26,7 @@
#include <_ansi.h>
#include "svc.h"
-void _exit _PARAMS ((int));
+void _exit (int);
__attribute__ ((noreturn)) void
_exit (int status)
diff --git a/libgloss/aarch64/_kill.c b/libgloss/aarch64/_kill.c
index 1d42371f0..8109ace12 100644
--- a/libgloss/aarch64/_kill.c
+++ b/libgloss/aarch64/_kill.c
@@ -28,7 +28,7 @@
#include <errno.h>
#include "svc.h"
-int _kill _PARAMS ((int, int));
+int _kill (int, int);
int
_kill (int pid, int sig)
diff --git a/libgloss/aarch64/svc.h b/libgloss/aarch64/svc.h
index 60bd00fca..2c3da1317 100644
--- a/libgloss/aarch64/svc.h
+++ b/libgloss/aarch64/svc.h
@@ -72,9 +72,9 @@
#define SH_EXT_STDOUT_STDERR_BITNUM 0x1
#if !defined (__ASSEMBLER__)
-extern int _get_semihosting_exts _PARAMS ((char*, int, int));
-extern int _has_ext_exit_extended _PARAMS ((void));
-extern int _has_ext_stdout_stderr _PARAMS ((void));
+extern int _get_semihosting_exts (char*, int, int);
+extern int _has_ext_exit_extended (void);
+extern int _has_ext_stdout_stderr (void);
#endif
#if defined(ARM_RDI_MONITOR) && !defined(__ASSEMBLER__)
diff --git a/libgloss/aarch64/syscalls.c b/libgloss/aarch64/syscalls.c
index 4de4e0dcc..5aeb3d0b5 100644
--- a/libgloss/aarch64/syscalls.c
+++ b/libgloss/aarch64/syscalls.c
@@ -47,37 +47,37 @@
(param_block_t)(unsigned long) (PTR)
/* Forward prototypes. */
-int _system _PARAMS ((const char *));
-int _rename _PARAMS ((const char *, const char *));
-int _isatty _PARAMS ((int));
-clock_t _times _PARAMS ((struct tms *));
-int _gettimeofday _PARAMS ((struct timeval *, void *));
-int _unlink _PARAMS ((const char *));
-int _link _PARAMS ((void));
-int _stat _PARAMS ((const char *, struct stat *));
-int _fstat _PARAMS ((int, struct stat *));
-int _swistat _PARAMS ((int fd, struct stat * st));
-caddr_t _sbrk _PARAMS ((int));
-int _getpid _PARAMS ((int));
-int _close _PARAMS ((int));
-clock_t _clock _PARAMS ((void));
-int _swiclose _PARAMS ((int));
-int _open _PARAMS ((const char *, int, ...));
-int _swiopen _PARAMS ((const char *, int));
-int _write _PARAMS ((int, char *, int));
-int _swiwrite _PARAMS ((int, char *, int));
-int _lseek _PARAMS ((int, int, int));
-int _swilseek _PARAMS ((int, int, int));
-int _read _PARAMS ((int, char *, int));
-int _swiread _PARAMS ((int, char *, int));
-void initialise_monitor_handles _PARAMS ((void));
-
-static int checkerror _PARAMS ((int));
-static int error _PARAMS ((int));
-static int get_errno _PARAMS ((void));
+int _system (const char *);
+int _rename (const char *, const char *);
+int _isatty (int);
+clock_t _times (struct tms *);
+int _gettimeofday (struct timeval *, void *);
+int _unlink (const char *);
+int _link (void);
+int _stat (const char *, struct stat *);
+int _fstat (int, struct stat *);
+int _swistat (int fd, struct stat * st);
+caddr_t _sbrk (int);
+int _getpid (int);
+int _close (int);
+clock_t _clock (void);
+int _swiclose (int);
+int _open (const char *, int, ...);
+int _swiopen (const char *, int);
+int _write (int, char *, int);
+int _swiwrite (int, char *, int);
+int _lseek (int, int, int);
+int _swilseek (int, int, int);
+int _read (int, char *, int);
+int _swiread (int, char *, int);
+void initialise_monitor_handles (void);
+
+static int checkerror (int);
+static int error (int);
+static int get_errno (void);
/* Semihosting utilities. */
-static void initialise_semihosting_exts _PARAMS ((void));
+static void initialise_semihosting_exts (void);
/* Struct used to keep track of the file position, just so we
can implement fseek(fh,x,SEEK_CUR). */
@@ -108,8 +108,8 @@ struct fdent
static struct fdent openfiles[MAX_OPEN_FILES];
-static struct fdent *findslot _PARAMS ((int));
-static int newslot _PARAMS ((void));
+static struct fdent *findslot (int);
+static int newslot (void);
/* Register name faking - works in collusion with the linker. */
#ifdef __ILP32__
diff --git a/libgloss/arm/_exit.c b/libgloss/arm/_exit.c
index ed0087637..ca2d21c43 100644
--- a/libgloss/arm/_exit.c
+++ b/libgloss/arm/_exit.c
@@ -1,7 +1,7 @@
#include <_ansi.h>
-int _kill _PARAMS ((int, int));
-void _exit _PARAMS ((int));
+int _kill (int, int);
+void _exit (int);
void
_exit (int status)
diff --git a/libgloss/arm/_kill.c b/libgloss/arm/_kill.c
index 8871d3c36..fc77e8097 100644
--- a/libgloss/arm/_kill.c
+++ b/libgloss/arm/_kill.c
@@ -2,7 +2,7 @@
#include <signal.h>
#include "swi.h"
-int _kill _PARAMS ((int, int));
+int _kill (int, int);
int
_kill (int pid, int sig)
diff --git a/libgloss/arm/swi.h b/libgloss/arm/swi.h
index 72cb838dc..67eb36b3f 100644
--- a/libgloss/arm/swi.h
+++ b/libgloss/arm/swi.h
@@ -96,9 +96,9 @@
#define SH_EXT_STDOUT_STDERR_BITNUM 0x1
#if !defined (__ASSEMBLER__)
-extern int _get_semihosting_exts _PARAMS ((char*, int, int));
-extern int _has_ext_exit_extended _PARAMS ((void));
-extern int _has_ext_stdout_stderr _PARAMS ((void));
+extern int _get_semihosting_exts (char*, int, int);
+extern int _has_ext_exit_extended (void);
+extern int _has_ext_stdout_stderr (void);
#endif
#if defined(ARM_RDI_MONITOR) && !defined(__ASSEMBLER__)
diff --git a/libgloss/arm/syscalls.c b/libgloss/arm/syscalls.c
index 80713680b..b76858fc9 100644
--- a/libgloss/arm/syscalls.c
+++ b/libgloss/arm/syscalls.c
@@ -18,37 +18,37 @@
#include "swi.h"
/* Forward prototypes. */
-int _system _PARAMS ((const char *));
-int _rename _PARAMS ((const char *, const char *));
-int _isatty _PARAMS ((int));
-clock_t _times _PARAMS ((struct tms *));
-int _gettimeofday _PARAMS ((struct timeval *, void *));
-int _unlink _PARAMS ((const char *));
-int _link _PARAMS ((void));
-int _stat _PARAMS ((const char *, struct stat *));
-int _fstat _PARAMS ((int, struct stat *));
-int _swistat _PARAMS ((int fd, struct stat * st));
-caddr_t _sbrk _PARAMS ((int));
-int _getpid _PARAMS ((int));
-int _close _PARAMS ((int));
-clock_t _clock _PARAMS ((void));
-int _swiclose _PARAMS ((int));
-int _open _PARAMS ((const char *, int, ...));
-int _swiopen _PARAMS ((const char *, int));
-int _write _PARAMS ((int, char *, int));
-int _swiwrite _PARAMS ((int, char *, int));
-int _lseek _PARAMS ((int, int, int));
-int _swilseek _PARAMS ((int, int, int));
-int _read _PARAMS ((int, char *, int));
-int _swiread _PARAMS ((int, char *, int));
-void initialise_monitor_handles _PARAMS ((void));
-
-static int checkerror _PARAMS ((int));
-static int error _PARAMS ((int));
-static int get_errno _PARAMS ((void));
+int _system (const char *);
+int _rename (const char *, const char *);
+int _isatty (int);
+clock_t _times (struct tms *);
+int _gettimeofday (struct timeval *, void *);
+int _unlink (const char *);
+int _link (void);
+int _stat (const char *, struct stat *);
+int _fstat (int, struct stat *);
+int _swistat (int fd, struct stat * st);
+caddr_t _sbrk (int);
+int _getpid (int);
+int _close (int);
+clock_t _clock (void);
+int _swiclose (int);
+int _open (const char *, int, ...);
+int _swiopen (const char *, int);
+int _write (int, char *, int);
+int _swiwrite (int, char *, int);
+int _lseek (int, int, int);
+int _swilseek (int, int, int);
+int _read (int, char *, int);
+int _swiread (int, char *, int);
+void initialise_monitor_handles (void);
+
+static int checkerror (int);
+static int error (int);
+static int get_errno (void);
/* Semihosting utilities. */
-static void initialise_semihosting_exts _PARAMS ((void));
+static void initialise_semihosting_exts (void);
/* Struct used to keep track of the file position, just so we
can implement fseek(fh,x,SEEK_CUR). */
@@ -77,8 +77,8 @@ struct fdent
static struct fdent openfiles [MAX_OPEN_FILES];
-static struct fdent* findslot _PARAMS ((int));
-static int newslot _PARAMS ((void));
+static struct fdent* findslot (int);
+static int newslot (void);
/* Register name faking - works in collusion with the linker. */
register char * stack_ptr asm ("sp");
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index 41623f7a7..5e2eac93a 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -68,9 +68,6 @@
#ifndef _LONG_DOUBLE
#define _LONG_DOUBLE long double
#endif
-#ifndef _PARAMS
-#define _PARAMS(paramlist) paramlist
-#endif
#else
#define _PTR char *
#define _VOLATILE
@@ -82,9 +79,6 @@
#define _DEFUN_VOID(name) name()
#define _CAST_VOID
#define _LONG_DOUBLE double
-#ifndef _PARAMS
-#define _PARAMS(paramlist) ()
-#endif
#endif
/* Support gcc's __attribute__ facility. */
diff --git a/newlib/libc/include/malloc.h b/newlib/libc/include/malloc.h
index 41b5efdc0..b1e0a0946 100644
--- a/newlib/libc/include/malloc.h
+++ b/newlib/libc/include/malloc.h
@@ -34,113 +34,113 @@ struct mallinfo {
/* The routines. */
-extern _PTR malloc _PARAMS ((size_t));
+extern _PTR malloc (size_t);
#ifdef __CYGWIN__
#undef _malloc_r
#define _malloc_r(r, s) malloc (s)
#else
-extern _PTR _malloc_r _PARAMS ((struct _reent *, size_t));
+extern _PTR _malloc_r (struct _reent *, size_t);
#endif
-extern _VOID free _PARAMS ((_PTR));
+extern _VOID free (_PTR);
#ifdef __CYGWIN__
#undef _free_r
#define _free_r(r, p) free (p)
#else
-extern _VOID _free_r _PARAMS ((struct _reent *, _PTR));
+extern _VOID _free_r (struct _reent *, _PTR);
#endif
-extern _PTR realloc _PARAMS ((_PTR, size_t));
+extern _PTR realloc (_PTR, size_t);
#ifdef __CYGWIN__
#undef _realloc_r
#define _realloc_r(r, p, s) realloc (p, s)
#else
-extern _PTR _realloc_r _PARAMS ((struct _reent *, _PTR, size_t));
+extern _PTR _realloc_r (struct _reent *, _PTR, size_t);
#endif
-extern _PTR calloc _PARAMS ((size_t, size_t));
+extern _PTR calloc (size_t, size_t);
#ifdef __CYGWIN__
#undef _calloc_r
#define _calloc_r(r, s1, s2) calloc (s1, s2);
#else
-extern _PTR _calloc_r _PARAMS ((struct _reent *, size_t, size_t));
+extern _PTR _calloc_r (struct _reent *, size_t, size_t);
#endif
-extern _PTR memalign _PARAMS ((size_t, size_t));
+extern _PTR memalign (size_t, size_t);
#ifdef __CYGWIN__
#undef _memalign_r
#define _memalign_r(r, s1, s2) memalign (s1, s2);
#else
-extern _PTR _memalign_r _PARAMS ((struct _reent *, size_t, size_t));
+extern _PTR _memalign_r (struct _reent *, size_t, size_t);
#endif
-extern struct mallinfo mallinfo _PARAMS ((void));
+extern struct mallinfo mallinfo (void);
#ifdef __CYGWIN__
#undef _mallinfo_r
#define _mallinfo_r(r) mallinfo ()
#else
-extern struct mallinfo _mallinfo_r _PARAMS ((struct _reent *));
+extern struct mallinfo _mallinfo_r (struct _reent *);
#endif
-extern void malloc_stats _PARAMS ((void));
+extern void malloc_stats (void);
#ifdef __CYGWIN__
#undef _malloc_stats_r
#define _malloc_stats_r(r) malloc_stats ()
#else
-extern void _malloc_stats_r _PARAMS ((struct _reent *));
+extern void _malloc_stats_r (struct _reent *);
#endif
-extern int mallopt _PARAMS ((int, int));
+extern int mallopt (int, int);
#ifdef __CYGWIN__
#undef _mallopt_r
#define _mallopt_r(i1, i2) mallopt (i1, i2)
#else
-extern int _mallopt_r _PARAMS ((struct _reent *, int, int));
+extern int _mallopt_r (struct _reent *, int, int);
#endif
-extern size_t malloc_usable_size _PARAMS ((_PTR));
+extern size_t malloc_usable_size (_PTR);
#ifdef __CYGWIN__
#undef _malloc_usable_size_r
#define _malloc_usable_size_r(r, p) malloc_usable_size (p)
#else
-extern size_t _malloc_usable_size_r _PARAMS ((struct _reent *, _PTR));
+extern size_t _malloc_usable_size_r (struct _reent *, _PTR);
#endif
/* These aren't too useful on an embedded system, but we define them
anyhow. */
-extern _PTR valloc _PARAMS ((size_t));
+extern _PTR valloc (size_t);
#ifdef __CYGWIN__
#undef _valloc_r
#define _valloc_r(r, s) valloc (s)
#else
-extern _PTR _valloc_r _PARAMS ((struct _reent *, size_t));
+extern _PTR _valloc_r (struct _reent *, size_t);
#endif
-extern _PTR pvalloc _PARAMS ((size_t));
+extern _PTR pvalloc (size_t);
#ifdef __CYGWIN__
#undef _pvalloc_r
#define _pvalloc_r(r, s) pvalloc (s)
#else
-extern _PTR _pvalloc_r _PARAMS ((struct _reent *, size_t));
+extern _PTR _pvalloc_r (struct _reent *, size_t);
#endif
-extern int malloc_trim _PARAMS ((size_t));
+extern int malloc_trim (size_t);
#ifdef __CYGWIN__
#undef _malloc_trim_r
#define _malloc_trim_r(r, s) malloc_trim (s)
#else
-extern int _malloc_trim_r _PARAMS ((struct _reent *, size_t));
+extern int _malloc_trim_r (struct _reent *, size_t);
#endif
/* A compatibility routine for an earlier version of the allocator. */
-extern _VOID mstats _PARAMS ((char *));
+extern _VOID mstats (char *);
#ifdef __CYGWIN__
#undef _mstats_r
#define _mstats_r(r, p) mstats (p)
#else
-extern _VOID _mstats_r _PARAMS ((struct _reent *, char *));
+extern _VOID _mstats_r (struct _reent *, char *);
#endif
/* SVID2/XPG mallopt options */
@@ -159,7 +159,7 @@ extern _VOID _mstats_r _PARAMS ((struct _reent *, char *));
#ifndef __CYGWIN__
/* Some systems provide this, so do too for compatibility. */
-extern void cfree _PARAMS ((_PTR));
+extern void cfree (_PTR);
#endif /* __CYGWIN__ */
#ifdef __cplusplus
diff --git a/newlib/libc/include/math.h b/newlib/libc/include/math.h
index 2a322ee26..893a5d064 100644
--- a/newlib/libc/include/math.h
+++ b/newlib/libc/include/math.h
@@ -83,54 +83,54 @@ _BEGIN_STD_C
/* Reentrant ANSI C functions. */
#ifndef __math_68881
-extern double atan _PARAMS((double));
-extern double cos _PARAMS((double));
-extern double sin _PARAMS((double));
-extern double tan _PARAMS((double));
-extern double tanh _PARAMS((double));
-extern double frexp _PARAMS((double, int *));
-extern double modf _PARAMS((double, double *));
-extern double ceil _PARAMS((double));
-extern double fabs _PARAMS((double));
-extern double floor _PARAMS((double));
+extern double atan (double);
+extern double cos (double);
+extern double sin (double);
+extern double tan (double);
+extern double tanh (double);
+extern double frexp (double, int *);
+extern double modf (double, double *);
+extern double ceil (double);
+extern double fabs (double);
+extern double floor (double);
#endif /* ! defined (__math_68881) */
/* Non reentrant ANSI C functions. */
#ifndef _REENT_ONLY
#ifndef __math_68881
-extern double acos _PARAMS((double));
-extern double asin _PARAMS((double));
-extern double atan2 _PARAMS((double, double));
-extern double cosh _PARAMS((double));
-extern double sinh _PARAMS((double));
-extern double exp _PARAMS((double));
-extern double ldexp _PARAMS((double, int));
-extern double log _PARAMS((double));
-extern double log10 _PARAMS((double));
-extern double pow _PARAMS((double, double));
-extern double sqrt _PARAMS((double));
-extern double fmod _PARAMS((double, double));
+extern double acos (double);
+extern double asin (double);
+extern double atan2 (double, double);
+extern double cosh (double);
+extern double sinh (double);
+extern double exp (double);
+extern double ldexp (double, int);
+extern double log (double);
+extern double log10 (double);
+extern double pow (double, double);
+extern double sqrt (double);
+extern double fmod (double, double);
#endif /* ! defined (__math_68881) */
#endif /* ! defined (_REENT_ONLY) */
#if __MISC_VISIBLE
-extern int finite _PARAMS((double));
-extern int finitef _PARAMS((float));
-extern int finitel _PARAMS((long double));
-extern int isinff _PARAMS((float));
-extern int isnanf _PARAMS((float));
+extern int finite (double);
+extern int finitef (float);
+extern int finitel (long double);
+extern int isinff (float);
+extern int isnanf (float);
#ifdef __CYGWIN__ /* not implemented in newlib yet */
-extern int isinfl _PARAMS((long double));
-extern int isnanl _PARAMS((long double));
+extern int isinfl (long double);
+extern int isnanl (long double);
#endif
#if !defined(__cplusplus) || __cplusplus < 201103L
-extern int isinf _PARAMS((double));
+extern int isinf (double);
#endif
#endif /* __MISC_VISIBLE */
#if (__MISC_VISIBLE || (__XSI_VISIBLE && __XSI_VISIBLE < 600)) \
&& (!defined(__cplusplus) || __cplusplus < 201103L)
-extern int isnan _PARAMS((double));
+extern int isnan (double);
#endif
#if __ISO_C_VISIBLE >= 1999
@@ -287,128 +287,128 @@ extern int __signbitd (double x);
/* Non ANSI double precision functions. */
-extern double infinity _PARAMS((void));
-extern double nan _PARAMS((const char *));
-extern double copysign _PARAMS((double, double));
-extern double logb _PARAMS((double));
-extern int ilogb _PARAMS((double));
-
-extern double asinh _PARAMS((double));
-extern double cbrt _PARAMS((double));
-extern double nextafter _PARAMS((double, double));
-extern double rint _PARAMS((double));
-extern double scalbn _PARAMS((double, int));
-
-extern double exp2 _PARAMS((double));
-extern double scalbln _PARAMS((double, long int));
-extern double tgamma _PARAMS((double));
-extern double nearbyint _PARAMS((double));
-extern long int lrint _PARAMS((double));
-extern long long int llrint _PARAMS((double));
-extern double round _PARAMS((double));
-extern long int lround _PARAMS((double));
-extern long long int llround _PARAMS((double));
-extern double trunc _PARAMS((double));
-extern double remquo _PARAMS((double, double, int *));
-extern double fdim _PARAMS((double, double));
-extern double fmax _PARAMS((double, double));
-extern double fmin _PARAMS((double, double));
-extern double fma _PARAMS((double, double, double));
+extern double infinity (void);
+extern double nan (const char *);
+extern double copysign (double, double);
+extern double logb (double);
+extern int ilogb (double);
+
+extern double asinh (double);
+extern double cbrt (double);
+extern double nextafter (double, double);
+extern double rint (double);
+extern double scalbn (double, int);
+
+extern double exp2 (double);
+extern double scalbln (double, long int);
+extern double tgamma (double);
+extern double nearbyint (double);
+extern long int lrint (double);
+extern long long int llrint (double);
+extern double round (double);
+extern long int lround (double);
+extern long long int llround (double);
+extern double trunc (double);
+extern double remquo (double, double, int *);
+extern double fdim (double, double);
+extern double fmax (double, double);
+extern double fmin (double, double);
+extern double fma (double, double, double);
#ifndef __math_68881
-extern double log1p _PARAMS((double));
-extern double expm1 _PARAMS((double));
+extern double log1p (double);
+extern double expm1 (double);
#endif /* ! defined (__math_68881) */
#ifndef _REENT_ONLY
-extern double acosh _PARAMS((double));
-extern double atanh _PARAMS((double));
-extern double remainder _PARAMS((double, double));
-extern double gamma _PARAMS((double));
-extern double lgamma _PARAMS((double));
-extern double erf _PARAMS((double));
-extern double erfc _PARAMS((double));
-extern double log2 _PARAMS((double));
+extern double acosh (double);
+extern double atanh (double);
+extern double remainder (double, double);
+extern double gamma (double);
+extern double lgamma (double);
+extern double erf (double);
+extern double erfc (double);
+extern double log2 (double);
#if !defined(__cplusplus)
#define log2(x) (log (x) / _M_LN2)
#endif
#ifndef __math_68881
-extern double hypot _PARAMS((double, double));
+extern double hypot (double, double);
#endif
#endif /* ! defined (_REENT_ONLY) */
/* Single precision versions of ANSI functions. */
-extern float atanf _PARAMS((float));
-extern float cosf _PARAMS((float));
-extern float sinf _PARAMS((float));
-extern float tanf _PARAMS((float));
-extern float tanhf _PARAMS((float));
-extern float frexpf _PARAMS((float, int *));
-extern float modff _PARAMS((float, float *));
-extern float ceilf _PARAMS((float));
-extern float fabsf _PARAMS((float));
-extern float floorf _PARAMS((float));
+extern float atanf (float);
+extern float cosf (float);
+extern float sinf (float);
+extern float tanf (float);
+extern float tanhf (float);
+extern float frexpf (float, int *);
+extern float modff (float, float *);
+extern float ceilf (float);
+extern float fabsf (float);
+extern float floorf (float);
#ifndef _REENT_ONLY
-extern float acosf _PARAMS((float));
-extern float asinf _PARAMS((float));
-extern float atan2f _PARAMS((float, float));
-extern float coshf _PARAMS((float));
-extern float sinhf _PARAMS((float));
-extern float expf _PARAMS((float));
-extern float ldexpf _PARAMS((float, int));
-extern float logf _PARAMS((float));
-extern float log10f _PARAMS((float));
-extern float powf _PARAMS((float, float));
-extern float sqrtf _PARAMS((float));
-extern float fmodf _PARAMS((float, float));
+extern float acosf (float);
+extern float asinf (float);
+extern float atan2f (float, float);
+extern float coshf (float);
+extern float sinhf (float);
+extern float expf (float);
+extern float ldexpf (float, int);
+extern float logf (float);
+extern float log10f (float);
+extern float powf (float, float);
+extern float sqrtf (float);
+extern float fmodf (float, float);
#endif /* ! defined (_REENT_ONLY) */
/* Other single precision functions. */
-extern float exp2f _PARAMS((float));
-extern float scalblnf _PARAMS((float, long int));
-extern float tgammaf _PARAMS((float));
-extern float nearbyintf _PARAMS((float));
-extern long int lrintf _PARAMS((float));
-extern long long int llrintf _PARAMS((float));
-extern float roundf _PARAMS((float));
-extern long int lroundf _PARAMS((float));
-extern long long int llroundf _PARAMS((float));
-extern float truncf _PARAMS((float));
-extern float remquof _PARAMS((float, float, int *));
-extern float fdimf _PARAMS((float, float));
-extern float fmaxf _PARAMS((float, float));
-extern float fminf _PARAMS((float, float));
-extern float fmaf _PARAMS((float, float, float));
-
-extern float infinityf _PARAMS((void));
-extern float nanf _PARAMS((const char *));
-extern float copysignf _PARAMS((float, float));
-extern float logbf _PARAMS((float));
-extern int ilogbf _PARAMS((float));
-
-extern float asinhf _PARAMS((float));
-extern float cbrtf _PARAMS((float));
-extern float nextafterf _PARAMS((float, float));
-extern float rintf _PARAMS((float));
-extern float scalbnf _PARAMS((float, int));
-extern float log1pf _PARAMS((float));
-extern float expm1f _PARAMS((float));
+extern float exp2f (float);
+extern float scalblnf (float, long int);
+extern float tgammaf (float);
+extern float nearbyintf (float);
+extern long int lrintf (float);
+extern long long int llrintf (float);
+extern float roundf (float);
+extern long int lroundf (float);
+extern long long int llroundf (float);
+extern float truncf (float);
+extern float remquof (float, float, int *);
+extern float fdimf (float, float);
+extern float fmaxf (float, float);
+extern float fminf (float, float);
+extern float fmaf (float, float, float);
+
+extern float infinityf (void);
+extern float nanf (const char *);
+extern float copysignf (float, float);
+extern float logbf (float);
+extern int ilogbf (float);
+
+extern float asinhf (float);
+extern float cbrtf (float);
+extern float nextafterf (float, float);
+extern float rintf (float);
+extern float scalbnf (float, int);
+extern float log1pf (float);
+extern float expm1f (float);
#ifndef _REENT_ONLY
-extern float acoshf _PARAMS((float));
-extern float atanhf _PARAMS((float));
-extern float remainderf _PARAMS((float, float));
-extern float gammaf _PARAMS((float));
-extern float lgammaf _PARAMS((float));
-extern float erff _PARAMS((float));
-extern float erfcf _PARAMS((float));
-extern float log2f _PARAMS((float));
-extern float hypotf _PARAMS((float, float));
+extern float acoshf (float);
+extern float atanhf (float);
+extern float remainderf (float, float);
+extern float gammaf (float);
+extern float lgammaf (float);
+extern float erff (float);
+extern float erfcf (float);
+extern float log2f (float);
+extern float hypotf (float, float);
#endif /* ! defined (_REENT_ONLY) */
/* Newlib doesn't fully support long double math functions so far.
@@ -419,141 +419,141 @@ extern float hypotf _PARAMS((float, float));
#if defined (_LDBL_EQ_DBL) || defined (__CYGWIN__)
/* Reentrant ANSI C functions. */
#ifndef __math_68881
-extern long double atanl _PARAMS((long double));
-extern long double cosl _PARAMS((long double));
-extern long double sinl _PARAMS((long double));
-extern long double tanl _PARAMS((long double));
-extern long double tanhl _PARAMS((long double));
-extern long double frexpl _PARAMS((long double, int *));
-extern long double modfl _PARAMS((long double, long double *));
-extern long double ceill _PARAMS((long double));
-extern long double fabsl _PARAMS((long double));
-extern long double floorl _PARAMS((long double));
-extern long double log1pl _PARAMS((long double));
-extern long double expm1l _PARAMS((long double));
+extern long double atanl (long double);
+extern long double cosl (long double);
+extern long double sinl (long double);
+extern long double tanl (long double);
+extern long double tanhl (long double);
+extern long double frexpl (long double, int *);
+extern long double modfl (long double, long double *);
+extern long double ceill (long double);
+extern long double fabsl (long double);
+extern long double floorl (long double);
+extern long double log1pl (long double);
+extern long double expm1l (long double);
#endif /* ! defined (__math_68881) */
/* Non reentrant ANSI C functions. */
#ifndef _REENT_ONLY
#ifndef __math_68881
-extern long double acosl _PARAMS((long double));
-extern long double asinl _PARAMS((long double));
-extern long double atan2l _PARAMS((long double, long double));
-extern long double coshl _PARAMS((long double));
-extern long double sinhl _PARAMS((long double));
-extern long double expl _PARAMS((long double));
-extern long double ldexpl _PARAMS((long double, int));
-extern long double logl _PARAMS((long double));
-extern long double log10l _PARAMS((long double));
-extern long double powl _PARAMS((long double, long double));
-extern long double sqrtl _PARAMS((long double));
-extern long double fmodl _PARAMS((long double, long double));
-extern long double hypotl _PARAMS((long double, long double));
+extern long double acosl (long double);
+extern long double asinl (long double);
+extern long double atan2l (long double, long double);
+extern long double coshl (long double);
+extern long double sinhl (long double);
+extern long double expl (long double);
+extern long double ldexpl (long double, int);
+extern long double logl (long double);
+extern long double log10l (long double);
+extern long double powl (long double, long double);
+extern long double sqrtl (long double);
+extern long double fmodl (long double, long double);
+extern long double hypotl (long double, long double);
#endif /* ! defined (__math_68881) */
#endif /* ! defined (_REENT_ONLY) */
-extern long double copysignl _PARAMS((long double, long double));
-extern long double nanl _PARAMS((const char *));
-extern int ilogbl _PARAMS((long double));
-extern long double asinhl _PARAMS((long double));
-extern long double cbrtl _PARAMS((long double));
-extern long double nextafterl _PARAMS((long double, long double));
-extern float nexttowardf _PARAMS((float, long double));
-extern double nexttoward _PARAMS((double, long double));
-extern long double nexttowardl _PARAMS((long double, long double));
-extern long double logbl _PARAMS((long double));
-extern long double log2l _PARAMS((long double));
-extern long double rintl _PARAMS((long double));
-extern long double scalbnl _PARAMS((long double, int));
-extern long double exp2l _PARAMS((long double));
-extern long double scalblnl _PARAMS((long double, long));
-extern long double tgammal _PARAMS((long double));
-extern long double nearbyintl _PARAMS((long double));
-extern long int lrintl _PARAMS((long double));
-extern long long int llrintl _PARAMS((long double));
-extern long double roundl _PARAMS((long double));
-extern long lroundl _PARAMS((long double));
-extern long long int llroundl _PARAMS((long double));
-extern long double truncl _PARAMS((long double));
-extern long double remquol _PARAMS((long double, long double, int *));
-extern long double fdiml _PARAMS((long double, long double));
-extern long double fmaxl _PARAMS((long double, long double));
-extern long double fminl _PARAMS((long double, long double));
-extern long double fmal _PARAMS((long double, long double, long double));
+extern long double copysignl (long double, long double);
+extern long double nanl (const char *);
+extern int ilogbl (long double);
+extern long double asinhl (long double);
+extern long double cbrtl (long double);
+extern long double nextafterl (long double, long double);
+extern float nexttowardf (float, long double);
+extern double nexttoward (double, long double);
+extern long double nexttowardl (long double, long double);
+extern long double logbl (long double);
+extern long double log2l (long double);
+extern long double rintl (long double);
+extern long double scalbnl (long double, int);
+extern long double exp2l (long double);
+extern long double scalblnl (long double, long);
+extern long double tgammal (long double);
+extern long double nearbyintl (long double);
+extern long int lrintl (long double);
+extern long long int llrintl (long double);
+extern long double roundl (long double);
+extern long lroundl (long double);
+extern long long int llroundl (long double);
+extern long double truncl (long double);
+extern long double remquol (long double, long double, int *);
+extern long double fdiml (long double, long double);
+extern long double fmaxl (long double, long double);
+extern long double fminl (long double, long double);
+extern long double fmal (long double, long double, long double);
#ifndef _REENT_ONLY
-extern long double acoshl _PARAMS((long double));
-extern long double atanhl _PARAMS((long double));
-extern long double remainderl _PARAMS((long double, long double));
-extern long double lgammal _PARAMS((long double));
-extern long double erfl _PARAMS((long double));
-extern long double erfcl _PARAMS((long double));
+extern long double acoshl (long double);
+extern long double atanhl (long double);
+extern long double remainderl (long double, long double);
+extern long double lgammal (long double);
+extern long double erfl (long double);
+extern long double erfcl (long double);
#endif /* ! defined (_REENT_ONLY) */
#else /* !_LDBL_EQ_DBL && !__CYGWIN__ */
-extern long double hypotl _PARAMS((long double, long double));
-extern long double sqrtl _PARAMS((long double));
+extern long double hypotl (long double, long double);
+extern long double sqrtl (long double);
#ifdef __i386__
/* Other long double precision functions. */
-extern _LONG_DOUBLE rintl _PARAMS((_LONG_DOUBLE));
-extern long int lrintl _PARAMS((_LONG_DOUBLE));
-extern long long int llrintl _PARAMS((_LONG_DOUBLE));
+extern _LONG_DOUBLE rintl (_LONG_DOUBLE);
+extern long int lrintl (_LONG_DOUBLE);
+extern long long int llrintl (_LONG_DOUBLE);
#endif /* __i386__ */
#endif /* !_LDBL_EQ_DBL && !__CYGWIN__ */
#endif /* __ISO_C_VISIBLE >= 1999 */
#if __MISC_VISIBLE
-extern double drem _PARAMS((double, double));
-extern float dremf _PARAMS((float, float));
+extern double drem (double, double);
+extern float dremf (float, float);
#ifdef __CYGWIN__
-extern float dreml _PARAMS((long double, long double));
+extern float dreml (long double, long double);
#endif /* __CYGWIN__ */
-extern double gamma_r _PARAMS((double, int *));
-extern double lgamma_r _PARAMS((double, int *));
-extern float gammaf_r _PARAMS((float, int *));
-extern float lgammaf_r _PARAMS((float, int *));
+extern double gamma_r (double, int *);
+extern double lgamma_r (double, int *);
+extern float gammaf_r (float, int *);
+extern float lgammaf_r (float, int *);
#endif
#if __MISC_VISIBLE || __XSI_VISIBLE
-extern double y0 _PARAMS((double));
-extern double y1 _PARAMS((double));
-extern double yn _PARAMS((int, double));
-extern double j0 _PARAMS((double));
-extern double j1 _PARAMS((double));
-extern double jn _PARAMS((int, double));
+extern double y0 (double);
+extern double y1 (double);
+extern double yn (int, double);
+extern double j0 (double);
+extern double j1 (double);
+extern double jn (int, double);
#endif
#if __MISC_VISIBLE || __XSI_VISIBLE >= 600
-extern float y0f _PARAMS((float));
-extern float y1f _PARAMS((float));
-extern float ynf _PARAMS((int, float));
-extern float j0f _PARAMS((float));
-extern float j1f _PARAMS((float));
-extern float jnf _PARAMS((int, float));
+extern float y0f (float);
+extern float y1f (float);
+extern float ynf (int, float);
+extern float j0f (float);
+extern float j1f (float);
+extern float jnf (int, float);
#endif
/* GNU extensions */
#if __GNU_VISIBLE
-extern void sincos _PARAMS((double, double *, double *));
-extern void sincosf _PARAMS((float, float *, float *));
+extern void sincos (double, double *, double *);
+extern void sincosf (float, float *, float *);
#ifdef __CYGWIN__
-extern void sincosl _PARAMS((long double, long double *, long double *));
+extern void sincosl (long double, long double *, long double *);
#endif /* __CYGWIN__ */
# ifndef exp10
-extern double exp10 _PARAMS((double));
+extern double exp10 (double);
# endif
# ifndef pow10
-extern double pow10 _PARAMS((double));
+extern double pow10 (double);
# endif
# ifndef exp10f
-extern float exp10f _PARAMS((float));
+extern float exp10f (float);
# endif
# ifndef pow10f
-extern float pow10f _PARAMS((float));
+extern float pow10f (float);
# endif
#ifdef __CYGWIN__
# ifndef exp10l
-extern float exp10l _PARAMS((float));
+extern float exp10l (float);
# endif
# ifndef pow10l
-extern float pow10l _PARAMS((float));
+extern float pow10l (float);
# endif
#endif /* __CYGWIN__ */
#endif /* __GNU_VISIBLE */
@@ -562,7 +562,7 @@ extern float pow10l _PARAMS((float));
/* The gamma functions use a global variable, signgam. */
#ifndef _REENT_ONLY
#define signgam (*__signgam())
-extern int *__signgam _PARAMS((void));
+extern int *__signgam (void);
#endif /* ! defined (_REENT_ONLY) */
#define __signgam_r(ptr) _REENT_SIGNGAM(ptr)
@@ -587,9 +587,9 @@ struct exception
};
#ifdef __cplusplus
-extern int matherr _PARAMS((struct __exception *e));
+extern int matherr (struct __exception *e);
#else
-extern int matherr _PARAMS((struct exception *e));
+extern int matherr (struct exception *e);
#endif
/* Values for the type field of struct exception. */
diff --git a/newlib/libc/include/reent.h b/newlib/libc/include/reent.h
index b7664b0b9..2b01fbe8f 100644
--- a/newlib/libc/include/reent.h
+++ b/newlib/libc/include/reent.h
@@ -136,29 +136,29 @@ struct timezone;
#else
/* Reentrant versions of system calls. */
-extern int _close_r _PARAMS ((struct _reent *, int));
-extern int _execve_r _PARAMS ((struct _reent *, const char *, char *const *, char *const *));
-extern int _fcntl_r _PARAMS ((struct _reent *, int, int, int));
-extern int _fork_r _PARAMS ((struct _reent *));
-extern int _fstat_r _PARAMS ((struct _reent *, int, struct stat *));
-extern int _getpid_r _PARAMS ((struct _reent *));
-extern int _isatty_r _PARAMS ((struct _reent *, int));
-extern int _kill_r _PARAMS ((struct _reent *, int, int));
-extern int _link_r _PARAMS ((struct _reent *, const char *, const char *));
-extern _off_t _lseek_r _PARAMS ((struct _reent *, int, _off_t, int));
-extern int _mkdir_r _PARAMS ((struct _reent *, const char *, int));
-extern int _open_r _PARAMS ((struct _reent *, const char *, int, int));
-extern _ssize_t _read_r _PARAMS ((struct _reent *, int, void *, size_t));
-extern int _rename_r _PARAMS ((struct _reent *, const char *, const char *));
-extern void *_sbrk_r _PARAMS ((struct _reent *, ptrdiff_t));
-extern int _stat_r _PARAMS ((struct _reent *, const char *, struct stat *));
-extern _CLOCK_T_ _times_r _PARAMS ((struct _reent *, struct tms *));
-extern int _unlink_r _PARAMS ((struct _reent *, const char *));
-extern int _wait_r _PARAMS ((struct _reent *, int *));
-extern _ssize_t _write_r _PARAMS ((struct _reent *, int, const void *, size_t));
+extern int _close_r (struct _reent *, int);
+extern int _execve_r (struct _reent *, const char *, char *const *, char *const *);
+extern int _fcntl_r (struct _reent *, int, int, int);
+extern int _fork_r (struct _reent *);
+extern int _fstat_r (struct _reent *, int, struct stat *);
+extern int _getpid_r (struct _reent *);
+extern int _isatty_r (struct _reent *, int);
+extern int _kill_r (struct _reent *, int, int);
+extern int _link_r (struct _reent *, const char *, const char *);
+extern _off_t _lseek_r (struct _reent *, int, _off_t, int);
+extern int _mkdir_r (struct _reent *, const char *, int);
+extern int _open_r (struct _reent *, const char *, int, int);
+extern _ssize_t _read_r (struct _reent *, int, void *, size_t);
+extern int _rename_r (struct _reent *, const char *, const char *);
+extern void *_sbrk_r (struct _reent *, ptrdiff_t);
+extern int _stat_r (struct _reent *, const char *, struct stat *);
+extern _CLOCK_T_ _times_r (struct _reent *, struct tms *);
+extern int _unlink_r (struct _reent *, const char *);
+extern int _wait_r (struct _reent *, int *);
+extern _ssize_t _write_r (struct _reent *, int, const void *, size_t);
/* This one is not guaranteed to be available on all targets. */
-extern int _gettimeofday_r _PARAMS ((struct _reent *, struct timeval *__tp, void *__tzp));
+extern int _gettimeofday_r (struct _reent *, struct timeval *__tp, void *__tzp);
#ifdef __LARGE64_FILES
@@ -168,10 +168,10 @@ extern int _gettimeofday_r _PARAMS ((struct _reent *, struct timeval *__tp, void
#endif
struct stat64;
-extern _off64_t _lseek64_r _PARAMS ((struct _reent *, int, _off64_t, int));
-extern int _fstat64_r _PARAMS ((struct _reent *, int, struct stat64 *));
-extern int _open64_r _PARAMS ((struct _reent *, const char *, int, int));
-extern int _stat64_r _PARAMS ((struct _reent *, const char *, struct stat64 *));
+extern _off64_t _lseek64_r (struct _reent *, int, _off64_t, int);
+extern int _fstat64_r (struct _reent *, int, struct stat64 *);
+extern int _open64_r (struct _reent *, const char *, int, int);
+extern int _stat64_r (struct _reent *, const char *, struct stat64 *);
/* Don't pollute namespace if not building newlib. */
#if defined (__CYGWIN__) && !defined (_COMPILING_NEWLIB)
diff --git a/newlib/libc/include/sys/_default_fcntl.h b/newlib/libc/include/sys/_default_fcntl.h
index 006e4efd5..33b462285 100644
--- a/newlib/libc/include/sys/_default_fcntl.h
+++ b/newlib/libc/include/sys/_default_fcntl.h
@@ -199,27 +199,27 @@ struct eflock {
#include <sys/types.h>
#include <sys/stat.h> /* sigh. for the mode bits for open/creat */
-extern int open _PARAMS ((const char *, int, ...));
+extern int open (const char *, int, ...);
#if __ATFILE_VISIBLE
-extern int openat _PARAMS ((int, const char *, int, ...));
+extern int openat (int, const char *, int, ...);
#endif
-extern int creat _PARAMS ((const char *, mode_t));
-extern int fcntl _PARAMS ((int, int, ...));
+extern int creat (const char *, mode_t);
+extern int fcntl (int, int, ...);
#if __BSD_VISIBLE
-extern int flock _PARAMS ((int, int));
+extern int flock (int, int);
#endif
#if __GNU_VISIBLE
#include <sys/time.h>
-extern int futimesat _PARAMS ((int, const char *, const struct timeval *));
+extern int futimesat (int, const char *, const struct timeval *);
#endif
/* Provide _<systemcall> prototypes for functions provided by some versions
of newlib. */
#ifdef _COMPILING_NEWLIB
-extern int _open _PARAMS ((const char *, int, ...));
-extern int _fcntl _PARAMS ((int, int, ...));
+extern int _open (const char *, int, ...);
+extern int _fcntl (int, int, ...);
#ifdef __LARGE64_FILES
-extern int _open64 _PARAMS ((const char *, int, ...));
+extern int _open64 (const char *, int, ...);
#endif
#endif
diff --git a/newlib/libc/include/sys/errno.h b/newlib/libc/include/sys/errno.h
index 89fe1e052..025b461d4 100644
--- a/newlib/libc/include/sys/errno.h
+++ b/newlib/libc/include/sys/errno.h
@@ -12,7 +12,7 @@ extern "C" {
#ifndef _REENT_ONLY
#define errno (*__errno())
-extern int *__errno _PARAMS ((void));
+extern int *__errno (void);
#endif
/* Please don't use these variables directly.
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index 061f580fb..aa352dc08 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -775,7 +775,7 @@ extern __FILE __sf[3];
extern struct _reent *_impure_ptr __ATTRIBUTE_IMPURE_PTR__;
extern struct _reent *const _global_impure_ptr __ATTRIBUTE_IMPURE_PTR__;
-void _reclaim_reent _PARAMS ((struct _reent *));
+void _reclaim_reent (struct _reent *);
/* #define _REENT_ONLY define this to get only reentrant routines */
diff --git a/newlib/libc/include/sys/timeb.h b/newlib/libc/include/sys/timeb.h
index 793b48143..ccf664974 100644
--- a/newlib/libc/include/sys/timeb.h
+++ b/newlib/libc/include/sys/timeb.h
@@ -31,7 +31,7 @@ struct timeb
short dstflag;
};
-extern int ftime _PARAMS ((struct timeb *));
+extern int ftime (struct timeb *);
#ifdef __cplusplus
}
diff --git a/newlib/libc/machine/cris/sys/errno.h b/newlib/libc/machine/cris/sys/errno.h
index dc4ffe28c..3d573015d 100644
--- a/newlib/libc/machine/cris/sys/errno.h
+++ b/newlib/libc/machine/cris/sys/errno.h
@@ -16,7 +16,7 @@ extern "C" {
#ifndef _REENT_ONLY
#define errno (*__errno())
-extern int *__errno _PARAMS ((void));
+extern int *__errno (void);
#endif
/* Please don't use these variables directly.
diff --git a/newlib/libc/machine/cris/sys/fcntl.h b/newlib/libc/machine/cris/sys/fcntl.h
index 6017a190f..7630a9874 100644
--- a/newlib/libc/machine/cris/sys/fcntl.h
+++ b/newlib/libc/machine/cris/sys/fcntl.h
@@ -143,17 +143,17 @@ struct eflock {
#include <sys/types.h>
#include <sys/stat.h> /* sigh. for the mode bits for open/creat */
-extern int open _PARAMS ((const char *, int, ...));
-extern int creat _PARAMS ((const char *, mode_t));
-extern int fcntl _PARAMS ((int, int, ...));
+extern int open (const char *, int, ...);
+extern int creat (const char *, mode_t);
+extern int fcntl (int, int, ...);
/* Provide _<systemcall> prototypes for functions provided by some versions
of newlib. */
#ifdef _COMPILING_NEWLIB
-extern int _open _PARAMS ((const char *, int, ...));
-extern int _fcntl _PARAMS ((int, int, ...));
+extern int _open (const char *, int, ...);
+extern int _fcntl (int, int, ...);
#ifdef __LARGE64_FILES
-extern int _open64 _PARAMS ((const char *, int, ...));
+extern int _open64 (const char *, int, ...);
#endif
#endif
diff --git a/newlib/libc/machine/powerpc/ufix64toa.c b/newlib/libc/machine/powerpc/ufix64toa.c
index 125ab67fa..bf13894e6 100644
--- a/newlib/libc/machine/powerpc/ufix64toa.c
+++ b/newlib/libc/machine/powerpc/ufix64toa.c
@@ -15,8 +15,8 @@
#include <reent.h>
#include "fix64.h"
-extern char *_simdldtoa_r _PARAMS((struct _reent *, LONG_DOUBLE_UNION *, int,
- int, int *, int *, char **));
+extern char *_simdldtoa_r (struct _reent *, LONG_DOUBLE_UNION *, int,
+ int, int *, int *, char **);
/*
* Convert an unsigned fixed-point 64-bit value to string.
diff --git a/newlib/libc/machine/powerpc/vfprintf.c b/newlib/libc/machine/powerpc/vfprintf.c
index e926a7340..1615d4b25 100644
--- a/newlib/libc/machine/powerpc/vfprintf.c
+++ b/newlib/libc/machine/powerpc/vfprintf.c
@@ -223,16 +223,16 @@ __sbprintf_r(rptr, fp, fmt, ap)
#define DEFPREC 6
#ifdef _NO_LONGDBL
-static char *cvt _PARAMS((struct _reent *, double, int, int, char *, int *, int, int *));
+static char *cvt (struct _reent *, double, int, int, char *, int *, int, int *);
#else
-static char *cvt _PARAMS((struct _reent *, _LONG_DOUBLE, int, int, char *, int *, int, int *));
-extern int _ldcheck _PARAMS((_LONG_DOUBLE *));
+static char *cvt (struct _reent *, _LONG_DOUBLE, int, int, char *, int *, int, int *);
+extern int _ldcheck (_LONG_DOUBLE *);
#endif
-static int exponent _PARAMS((char *, int, int));
+static int exponent (char *, int, int);
#ifdef __SPE__
-static char *cvt_ufix64 _PARAMS((struct _reent *, unsigned long long, int, int *, int *));
+static char *cvt_ufix64 (struct _reent *, unsigned long long, int, int *, int *);
#endif /* __SPE__ */
#else /* no FLOATING_POINT */
@@ -1247,11 +1247,11 @@ error:
#ifdef FLOATING_POINT
#ifdef _NO_LONGDBL
-extern char *_dtoa_r _PARAMS((struct _reent *, double, int,
- int, int *, int *, char **));
+extern char *_dtoa_r (struct _reent *, double, int,
+ int, int *, int *, char **);
#else
-extern char *_ldtoa_r _PARAMS((struct _reent *, _LONG_DOUBLE, int,
- int, int *, int *, char **));
+extern char *_ldtoa_r (struct _reent *, _LONG_DOUBLE, int,
+ int, int *, int *, char **);
#undef word0
#define word0(x) ldword0(x)
#endif
@@ -1358,8 +1358,8 @@ exponent(p0, exp, fmtch)
#endif /* FLOATING_POINT */
#ifdef __SPE__
-extern char *_ufix64toa_r _PARAMS((struct _reent *, unsigned long long, int,
- int, int *, int *, char **));
+extern char *_ufix64toa_r (struct _reent *, unsigned long long, int,
+ int, int *, int *, char **);
static char *
cvt_ufix64 (data, value, ndigits, decpt, length)
struct _reent *data;
diff --git a/newlib/libc/search/qsort.c b/newlib/libc/search/qsort.c
index e24a62a55..6c84b95b7 100644
--- a/newlib/libc/search/qsort.c
+++ b/newlib/libc/search/qsort.c
@@ -77,8 +77,8 @@ typedef int cmp_t(const void *, const void *, void *);
#else
typedef int cmp_t(const void *, const void *);
#endif
-static inline char *med3 _PARAMS((char *, char *, char *, cmp_t *, void *));
-static inline void swapfunc _PARAMS((char *, char *, int, int));
+static inline char *med3 (char *, char *, char *, cmp_t *, void *);
+static inline void swapfunc (char *, char *, int, int);
#define min(a, b) (a) < (b) ? a : b
diff --git a/newlib/libc/stdio/nano-vfprintf_local.h b/newlib/libc/stdio/nano-vfprintf_local.h
index 51e1df815..f883741d2 100644
--- a/newlib/libc/stdio/nano-vfprintf_local.h
+++ b/newlib/libc/stdio/nano-vfprintf_local.h
@@ -88,8 +88,8 @@
# define MAXEXPLEN 7
# define DEFPREC 6
-extern char *_dtoa_r _PARAMS((struct _reent *, double, int,
- int, int *, int *, char **));
+extern char *_dtoa_r (struct _reent *, double, int,
+ int, int *, int *, char **);
# define _DTOA_R _dtoa_r
# define FREXP frexp
diff --git a/newlib/libc/stdio/nano-vfscanf_i.c b/newlib/libc/stdio/nano-vfscanf_i.c
index aba74b0d8..fc8011717 100644
--- a/newlib/libc/stdio/nano-vfscanf_i.c
+++ b/newlib/libc/stdio/nano-vfscanf_i.c
@@ -95,7 +95,7 @@ _scanf_i (struct _reent *rptr,
struct _scan_data_t *pdata,
FILE *fp, va_list *ap)
{
-#define CCFN_PARAMS _PARAMS((struct _reent *, const char *, char **, int))
+#define CCFN_PARAMS (struct _reent *, const char *, char **, int)
/* Conversion function (strtol/strtoul). */
u_long (*ccfn)CCFN_PARAMS=0;
char *p;
diff --git a/newlib/libc/stdio/vfprintf.c b/newlib/libc/stdio/vfprintf.c
index d574928ee..b9b17fe58 100644
--- a/newlib/libc/stdio/vfprintf.c
+++ b/newlib/libc/stdio/vfprintf.c
@@ -510,8 +510,8 @@ _DEFUN(__sbprintf, (rptr, fp, fmt, ap),
# ifdef _NO_LONGDBL
-extern char *_dtoa_r _PARAMS((struct _reent *, double, int,
- int, int *, int *, char **));
+extern char *_dtoa_r (struct _reent *, double, int,
+ int, int *, int *, char **);
# define _PRINTF_FLOAT_TYPE double
# define _DTOA_R _dtoa_r
@@ -519,8 +519,8 @@ extern char *_dtoa_r _PARAMS((struct _reent *, double, int,
# else /* !_NO_LONGDBL */
-extern char *_ldtoa_r _PARAMS((struct _reent *, _LONG_DOUBLE, int,
- int, int *, int *, char **));
+extern char *_ldtoa_r (struct _reent *, _LONG_DOUBLE, int,
+ int, int *, int *, char **);
extern int _EXFUN(_ldcheck,(_LONG_DOUBLE *));
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index bf91dad35..38ef36ea5 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -554,7 +554,7 @@ _DEFUN(__SVFSCANF_R, (rptr, fp, fmt0, ap),
while (0)
#endif
- #define CCFN_PARAMS _PARAMS((struct _reent *, const char *, char **, int))
+ #define CCFN_PARAMS (struct _reent *, const char *, char **, int)
u_long (*ccfn)CCFN_PARAMS=0; /* conversion function (strtol/strtoul) */
char ccltab[256]; /* character class table for %[...] */
char buf[BUF]; /* buffer for numeric conversions */
diff --git a/newlib/libc/stdio/vfwprintf.c b/newlib/libc/stdio/vfwprintf.c
index ad684a249..1054eb942 100644
--- a/newlib/libc/stdio/vfwprintf.c
+++ b/newlib/libc/stdio/vfwprintf.c
@@ -228,8 +228,8 @@ _DEFUN(__sbwprintf, (rptr, fp, fmt, ap),
# ifdef _NO_LONGDBL
-extern char *_dtoa_r _PARAMS((struct _reent *, double, int,
- int, int *, int *, char **));
+extern char *_dtoa_r (struct _reent *, double, int,
+ int, int *, int *, char **);
# define _PRINTF_FLOAT_TYPE double
# define _DTOA_R _dtoa_r
@@ -237,8 +237,8 @@ extern char *_dtoa_r _PARAMS((struct _reent *, double, int,
# else /* !_NO_LONGDBL */
-extern char *_ldtoa_r _PARAMS((struct _reent *, _LONG_DOUBLE, int,
- int, int *, int *, char **));
+extern char *_ldtoa_r (struct _reent *, _LONG_DOUBLE, int,
+ int, int *, int *, char **);
extern int _EXFUN(_ldcheck,(_LONG_DOUBLE *));
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
index 27b06232b..73d8f3209 100644
--- a/newlib/libc/stdio/vfwscanf.c
+++ b/newlib/libc/stdio/vfwscanf.c
@@ -138,7 +138,7 @@ C99, POSIX-1.2008
#define _NO_LONGDBL
#if defined _WANT_IO_LONG_DOUBLE && (LDBL_MANT_DIG > DBL_MANT_DIG)
#undef _NO_LONGDBL
-extern _LONG_DOUBLE _wcstold_r _PARAMS((wchar_t *s, wchar_t **sptr));
+extern _LONG_DOUBLE _wcstold_r (wchar_t *s, wchar_t **sptr);
#endif
#include "floatio.h"
@@ -322,7 +322,7 @@ _DEFUN(_sungetwc_r, (data, fp, ch),
return wc;
}
-extern int __ssrefill_r _PARAMS ((struct _reent *ptr, register FILE * fp));
+extern int __ssrefill_r (struct _reent *ptr, register FILE * fp);
static size_t
_DEFUN(_sfgetwc_r, (ptr, fp),
@@ -367,7 +367,7 @@ _DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap),
mbstate_t mbs; /* value to keep track of multibyte state */
- #define CCFN_PARAMS _PARAMS((struct _reent *, const wchar_t *, wchar_t **, int))
+ #define CCFN_PARAMS (struct _reent *, const wchar_t *, wchar_t **, int)
unsigned long (*ccfn)CCFN_PARAMS=0; /* conversion function (wcstol/wcstoul) */
wchar_t buf[BUF]; /* buffer for numeric conversions */
const wchar_t *ccls; /* character class start */
diff --git a/newlib/libc/stdlib/atexit.h b/newlib/libc/stdlib/atexit.h
index e37a146a0..eadc7d13d 100644
--- a/newlib/libc/stdlib/atexit.h
+++ b/newlib/libc/stdlib/atexit.h
@@ -9,6 +9,6 @@ enum __atexit_types
__et_cxa
};
-void __call_exitprocs _PARAMS ((int, _PTR));
-int __register_exitproc _PARAMS ((int, void (*fn) (void), _PTR, _PTR));
+void __call_exitprocs (int, _PTR);
+int __register_exitproc (int, void (*fn) (void), _PTR, _PTR);
diff --git a/newlib/libc/stdlib/cxa_atexit.c b/newlib/libc/stdlib/cxa_atexit.c
index c66b28e7d..c03894c4a 100644
--- a/newlib/libc/stdlib/cxa_atexit.c
+++ b/newlib/libc/stdlib/cxa_atexit.c
@@ -30,7 +30,7 @@ _DEFUN (__cxa_atexit,
{
#ifdef _LITE_EXIT
/* Refer to comments in __atexit.c for more details of lite exit. */
- int __register_exitproc _PARAMS ((int, void (*fn) (void), _PTR, _PTR))
+ int __register_exitproc (int, void (*fn) (void), _PTR, _PTR)
__attribute__ ((weak));
if (!__register_exitproc)
diff --git a/newlib/libc/stdlib/exit.c b/newlib/libc/stdlib/exit.c
index 8d1be9d3a..481985cd1 100644
--- a/newlib/libc/stdlib/exit.c
+++ b/newlib/libc/stdlib/exit.c
@@ -55,7 +55,7 @@ _DEFUN (exit, (code),
{
#ifdef _LITE_EXIT
/* Refer to comments in __atexit.c for more details of lite exit. */
- void __call_exitprocs _PARAMS ((int, _PTR)) __attribute__((weak));
+ void __call_exitprocs (int, _PTR)) __attribute__((weak);
if (__call_exitprocs)
#endif
__call_exitprocs (code, NULL);
diff --git a/newlib/libc/stdlib/setenv.c b/newlib/libc/stdlib/setenv.c
index c963a3343..e68e91d14 100644
--- a/newlib/libc/stdlib/setenv.c
+++ b/newlib/libc/stdlib/setenv.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
-extern int _unsetenv_r _PARAMS ((struct _reent *, const char *));
+extern int _unsetenv_r (struct _reent *, const char *);
/*
* setenv --
diff --git a/newlib/libc/stdlib/setenv_r.c b/newlib/libc/stdlib/setenv_r.c
index b3bc1fcce..31d4fc70d 100644
--- a/newlib/libc/stdlib/setenv_r.c
+++ b/newlib/libc/stdlib/setenv_r.c
@@ -38,7 +38,7 @@ extern char **environ;
static char ***p_environ = &environ;
/* _findenv_r is defined in getenv_r.c. */
-extern char *_findenv_r _PARAMS ((struct _reent *, const char *, int *));
+extern char *_findenv_r (struct _reent *, const char *, int *);
/*
* _setenv_r --
diff --git a/newlib/libc/string/strerror.c b/newlib/libc/string/strerror.c
index 43fa1f592..8d5c188f8 100644
--- a/newlib/libc/string/strerror.c
+++ b/newlib/libc/string/strerror.c
@@ -392,7 +392,7 @@ _DEFUN (_strerror_r, (ptr, errnum, internal, errptr),
int *errptr)
{
char *error;
- extern char *_user_strerror _PARAMS ((int, int, int *));
+ extern char *_user_strerror (int, int, int *);
switch (errnum)
{
diff --git a/newlib/libc/sys/arm/syscalls.c b/newlib/libc/sys/arm/syscalls.c
index 04dde4558..474618dd7 100644
--- a/newlib/libc/sys/arm/syscalls.c
+++ b/newlib/libc/sys/arm/syscalls.c
@@ -18,37 +18,37 @@
#include "swi.h"
/* Forward prototypes. */
-int _system _PARAMS ((const char *));
-int _rename _PARAMS ((const char *, const char *));
-int _isatty _PARAMS ((int));
-clock_t _times _PARAMS ((struct tms *));
-int _gettimeofday _PARAMS ((struct timeval *, void *));
-void _raise _PARAMS ((void));
-int _unlink _PARAMS ((const char *));
-int _link _PARAMS ((void));
-int _stat _PARAMS ((const char *, struct stat *));
-int _fstat _PARAMS ((int, struct stat *));
-caddr_t _sbrk _PARAMS ((int));
-int _getpid _PARAMS ((int));
-int _kill _PARAMS ((int, int));
-void _exit _PARAMS ((int));
-int _close _PARAMS ((int));
-int _swiclose _PARAMS ((int));
-int _open _PARAMS ((const char *, int, ...));
-int _swiopen _PARAMS ((const char *, int));
-int _write _PARAMS ((int, char *, int));
-int _swiwrite _PARAMS ((int, char *, int));
-int _lseek _PARAMS ((int, int, int));
-int _swilseek _PARAMS ((int, int, int));
-int _read _PARAMS ((int, char *, int));
-int _swiread _PARAMS ((int, char *, int));
-void initialise_monitor_handles _PARAMS ((void));
-
-static int wrap _PARAMS ((int));
-static int error _PARAMS ((int));
-static int get_errno _PARAMS ((void));
-static int remap_handle _PARAMS ((int));
-static int findslot _PARAMS ((int));
+int _system (const char *);
+int _rename (const char *, const char *);
+int _isatty (int);
+clock_t _times (struct tms *);
+int _gettimeofday (struct timeval *, void *);
+void _raise (void);
+int _unlink (const char *);
+int _link (void);
+int _stat (const char *, struct stat *);
+int _fstat (int, struct stat *);
+caddr_t _sbrk (int);
+int _getpid (int);
+int _kill (int, int);
+void _exit (int);
+int _close (int);
+int _swiclose (int);
+int _open (const char *, int, ...);
+int _swiopen (const char *, int);
+int _write (int, char *, int);
+int _swiwrite (int, char *, int);
+int _lseek (int, int, int);
+int _swilseek (int, int, int);
+int _read (int, char *, int);
+int _swiread (int, char *, int);
+void initialise_monitor_handles (void);
+
+static int wrap (int);
+static int error (int);
+static int get_errno (void);
+static int remap_handle (int);
+static int findslot (int);
/* Register name faking - works in collusion with the linker. */
register char * stack_ptr asm ("sp");
diff --git a/newlib/libc/sys/linux/sys/errno.h b/newlib/libc/sys/linux/sys/errno.h
index 86a6968fe..049afc18a 100644
--- a/newlib/libc/sys/linux/sys/errno.h
+++ b/newlib/libc/sys/linux/sys/errno.h
@@ -12,7 +12,7 @@
#ifndef _REENT_ONLY
#define errno (*__errno())
-extern int *__errno _PARAMS ((void));
+extern int *__errno (void);
#endif
extern __IMPORT const char * const _sys_errlist[];
diff --git a/newlib/libc/sys/linux/sys/fcntl.h b/newlib/libc/sys/linux/sys/fcntl.h
index 78914fd8f..0fb8ae970 100644
--- a/newlib/libc/sys/linux/sys/fcntl.h
+++ b/newlib/libc/sys/linux/sys/fcntl.h
@@ -13,17 +13,17 @@
#include <_ansi.h>
-extern int creat _PARAMS ((const char *, mode_t));
-extern int _open _PARAMS ((const char *, int, ...));
+extern int creat (const char *, mode_t);
+extern int _open (const char *, int, ...);
#ifdef __KERNEL_PROTOTYPES
extern int open(const char *pathname, int flags, mode_t mode);
extern int fcntl(int fd, int cmd, long arg);
#else
-extern int open _PARAMS ((const char *, int, ...));
-extern int fcntl _PARAMS ((int, int, ...));
+extern int open (const char *, int, ...);
+extern int fcntl (int, int, ...);
#endif
-extern int _fcntl _PARAMS ((int, int, ...));
+extern int _fcntl (int, int, ...);
#endif
diff --git a/newlib/libc/sys/phoenix/sys/errno.h b/newlib/libc/sys/phoenix/sys/errno.h
index 82aab6d0c..6d5b001c3 100644
--- a/newlib/libc/sys/phoenix/sys/errno.h
+++ b/newlib/libc/sys/phoenix/sys/errno.h
@@ -30,7 +30,7 @@
#ifndef _REENT_ONLY
#define errno (*__errno())
-extern int *__errno _PARAMS ((void));
+extern int *__errno (void);
#endif
/* Don't use these variables directly. Use strerror instead. */
diff --git a/newlib/libc/sys/sparc64/sys/fcntl.h b/newlib/libc/sys/sparc64/sys/fcntl.h
index b52932b3f..67d2b4072 100644
--- a/newlib/libc/sys/sparc64/sys/fcntl.h
+++ b/newlib/libc/sys/sparc64/sys/fcntl.h
@@ -167,9 +167,9 @@ struct eflock {
#include <sys/types.h>
#include <sys/stat.h> /* sigh. for the mode bits for open/creat */
-extern int open _PARAMS ((const char *, int, ...));
-extern int creat _PARAMS ((const char *, mode_t));
-extern int fcntl _PARAMS ((int, int, ...));
+extern int open (const char *, int, ...);
+extern int creat (const char *, mode_t);
+extern int fcntl (int, int, ...);
#ifdef __cplusplus
}
diff --git a/winsup/cygwin/include/cygwin/stdlib.h b/winsup/cygwin/include/cygwin/stdlib.h
index a8eb4de31..fc8bc8486 100644
--- a/winsup/cygwin/include/cygwin/stdlib.h
+++ b/winsup/cygwin/include/cygwin/stdlib.h
@@ -45,9 +45,9 @@ int posix_openpt (int);
#define _unsetenv_r UNUSED__unsetenv_r
#endif
-extern _PTR memalign _PARAMS ((size_t, size_t));
+extern _PTR memalign (size_t, size_t);
#if __BSD_VISIBLE || (__XSI_VISIBLE >= 4 && __POSIX_VISIBLE < 200112)
-extern _PTR valloc _PARAMS ((size_t));
+extern _PTR valloc (size_t);
#endif
#undef _malloc_r
diff --git a/winsup/cygwin/include/fcntl.h b/winsup/cygwin/include/fcntl.h
index 3dad0889f..22adacaf2 100644
--- a/winsup/cygwin/include/fcntl.h
+++ b/winsup/cygwin/include/fcntl.h
@@ -43,8 +43,8 @@ details. */
#ifdef __cplusplus
extern "C" {
#endif
-extern int posix_fadvise _PARAMS ((int, off_t, off_t, int));
-extern int posix_fallocate _PARAMS ((int, off_t, off_t));
+extern int posix_fadvise (int, off_t, off_t, int);
+extern int posix_fallocate (int, off_t, off_t);
#ifdef __cplusplus
}
#endif
diff --git a/winsup/cygwin/include/sys/file.h b/winsup/cygwin/include/sys/file.h
index 6dabeb70c..4d51fd5fe 100644
--- a/winsup/cygwin/include/sys/file.h
+++ b/winsup/cygwin/include/sys/file.h
@@ -44,7 +44,7 @@ extern "C"
{
#endif
-extern int flock _PARAMS ((int, int));
+extern int flock (int, int);
#ifdef __cplusplus
}
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 10/17] ansification: remove _VOID
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
` (11 preceding siblings ...)
2017-12-07 18:27 ` [PATCH v2 05/17] ansification: remove _PARAMS Yaakov Selkowitz
@ 2017-12-07 18:28 ` Yaakov Selkowitz
2017-12-07 18:29 ` [PATCH v2 15/17] ansification: remove _HAVE_STDC Yaakov Selkowitz
` (4 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:28 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
libgloss/bfin/_exit.c | 2 +-
libgloss/libnosys/_exit.c | 2 +-
newlib/libc/iconv/lib/conv.h | 2 +-
newlib/libc/iconv/lib/iconvnls.c | 2 +-
newlib/libc/iconv/lib/nullconv.c | 2 +-
newlib/libc/iconv/lib/ucsconv.c | 2 +-
newlib/libc/iconv/lib/ucsconv.h | 4 +--
newlib/libc/include/_ansi.h | 2 --
newlib/libc/include/malloc.h | 8 ++---
newlib/libc/include/stdio.h | 2 +-
newlib/libc/include/stdlib.h | 54 ++++++++++++++--------------
newlib/libc/include/sys/iconvnls.h | 2 +-
newlib/libc/include/sys/reent.h | 2 +-
newlib/libc/include/time.h | 8 ++---
newlib/libc/machine/microblaze/abort.c | 2 +-
newlib/libc/machine/nds32/abort.c | 2 +-
newlib/libc/machine/powerpc/machine/malloc.h | 2 +-
newlib/libc/machine/powerpc/machine/stdlib.h | 2 +-
newlib/libc/machine/spu/clearerr.c | 2 +-
newlib/libc/machine/spu/stdio.c | 6 ++--
newlib/libc/signal/psignal.c | 2 +-
newlib/libc/stdio/clearerr.c | 2 +-
newlib/libc/stdio/clearerr_u.c | 2 +-
newlib/libc/stdio/findfp.c | 22 ++++++------
newlib/libc/stdio/local.h | 14 ++++----
newlib/libc/stdio/makebuf.c | 2 +-
newlib/libc/stdio/perror.c | 4 +--
newlib/libc/stdio/rewind.c | 4 +--
newlib/libc/stdio/setbuf.c | 2 +-
newlib/libc/stdio/setbuffer.c | 2 +-
newlib/libc/stdlib/abort.c | 2 +-
newlib/libc/stdlib/atexit.c | 2 +-
newlib/libc/stdlib/lcong48.c | 4 +--
newlib/libc/stdlib/on_exit.c | 2 +-
newlib/libc/stdlib/srand48.c | 4 +--
newlib/libc/sys/linux/include/time.h | 8 ++---
newlib/libc/sys/rtems/crt0.c | 2 +-
newlib/libc/time/local.h | 8 ++---
newlib/libc/time/tzlock.c | 4 +--
newlib/libc/time/tzset.c | 4 +--
newlib/libc/time/tzset_r.c | 4 +--
41 files changed, 104 insertions(+), 106 deletions(-)
diff --git a/libgloss/bfin/_exit.c b/libgloss/bfin/_exit.c
index d7fb9e033..e8186326a 100644
--- a/libgloss/bfin/_exit.c
+++ b/libgloss/bfin/_exit.c
@@ -16,7 +16,7 @@
#include <_ansi.h>
-_VOID
+void
_DEFUN (_exit, (rc),
int rc)
{
diff --git a/libgloss/libnosys/_exit.c b/libgloss/libnosys/_exit.c
index 3fdf7f081..44d845b8c 100644
--- a/libgloss/libnosys/_exit.c
+++ b/libgloss/libnosys/_exit.c
@@ -5,7 +5,7 @@
#include <_ansi.h>
#include <_syslist.h>
-_VOID
+void
_DEFUN (_exit, (rc),
int rc)
{
diff --git a/newlib/libc/iconv/lib/conv.h b/newlib/libc/iconv/lib/conv.h
index 59b6fe810..89da4b224 100644
--- a/newlib/libc/iconv/lib/conv.h
+++ b/newlib/libc/iconv/lib/conv.h
@@ -135,7 +135,7 @@ typedef struct
* If 'direction' is 0, "from" encoding is tested, else
* "to" encoding is tested.
*/
- _VOID _EXFNPTR(get_state, (void *data,
+ void _EXFNPTR(get_state, (void *data,
mbstate_t *state,
int direction));
diff --git a/newlib/libc/iconv/lib/iconvnls.c b/newlib/libc/iconv/lib/iconvnls.c
index 1996bdd8f..dfb6a18dd 100644
--- a/newlib/libc/iconv/lib/iconvnls.c
+++ b/newlib/libc/iconv/lib/iconvnls.c
@@ -219,7 +219,7 @@ _DEFUN(_iconv_nls_conv, (rptr, cd, inbuf, inbytesleft, outbuf, outbytesleft),
* shift state if 'direction' is 0 and "to" encodings's shift state
* if 'direction' isn't 0.
*/
-_VOID
+void
_DEFUN(_iconv_nls_get_state, (cd, ps, direction),
iconv_t cd,
mbstate_t *ps,
diff --git a/newlib/libc/iconv/lib/nullconv.c b/newlib/libc/iconv/lib/nullconv.c
index 3c87cbb83..8040c24e7 100644
--- a/newlib/libc/iconv/lib/nullconv.c
+++ b/newlib/libc/iconv/lib/nullconv.c
@@ -101,7 +101,7 @@ _DEFUN(null_conversion_get_mb_cur_max, (data, direction),
}
-static _VOID
+static void
_DEFUN(null_conversion_get_state, (data, state, size),
void *data,
mbstate_t *state,
diff --git a/newlib/libc/iconv/lib/ucsconv.c b/newlib/libc/iconv/lib/ucsconv.c
index c91007209..f480aee63 100644
--- a/newlib/libc/iconv/lib/ucsconv.c
+++ b/newlib/libc/iconv/lib/ucsconv.c
@@ -251,7 +251,7 @@ _DEFUN(ucs_based_conversion_get_mb_cur_max, (data, direction),
}
-static _VOID
+static void
_DEFUN(ucs_based_conversion_get_state, (data, state, direction),
void *data,
mbstate_t *state,
diff --git a/newlib/libc/iconv/lib/ucsconv.h b/newlib/libc/iconv/lib/ucsconv.h
index d3333161c..391daed35 100644
--- a/newlib/libc/iconv/lib/ucsconv.h
+++ b/newlib/libc/iconv/lib/ucsconv.h
@@ -108,7 +108,7 @@ typedef struct
* DESCRIPTION:
* Returns encoding's current shift sequence.
*/
- _VOID _EXFNPTR(get_state, (void *data,
+ void _EXFNPTR(get_state, (void *data,
mbstate_t *state));
/*
@@ -183,7 +183,7 @@ typedef struct
int _EXFNPTR(get_mb_cur_max, (void *data));
/* Same as in iconv_to_ucs_ces_handlers_t */
- _VOID _EXFNPTR(get_state, (void *data,
+ void _EXFNPTR(get_state, (void *data,
mbstate_t *state));
/* Same as in iconv_to_ucs_ces_handlers_t */
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index b8d27b24e..9c3a04695 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -49,7 +49,6 @@
#ifdef _HAVE_STDC
#define _VOLATILE volatile
#define _SIGNED signed
-#define _VOID void
#ifdef __CYGWIN__
#define _EXFUN_NOTHROW(name, proto) __cdecl name proto _NOTHROW
#define _EXFUN(name, proto) __cdecl name proto
@@ -68,7 +67,6 @@
#else
#define _VOLATILE
#define _SIGNED
-#define _VOID void
#define _EXFUN(name, proto) name()
#define _EXFUN_NOTHROW(name, proto) name()
#define _DEFUN(name, arglist, args) name arglist args;
diff --git a/newlib/libc/include/malloc.h b/newlib/libc/include/malloc.h
index f9144cdca..e12a13244 100644
--- a/newlib/libc/include/malloc.h
+++ b/newlib/libc/include/malloc.h
@@ -42,12 +42,12 @@ extern void *malloc (size_t);
extern void *_malloc_r (struct _reent *, size_t);
#endif
-extern _VOID free (void *);
+extern void free (void *);
#ifdef __CYGWIN__
#undef _free_r
#define _free_r(r, p) free (p)
#else
-extern _VOID _free_r (struct _reent *, void *);
+extern void _free_r (struct _reent *, void *);
#endif
extern void *realloc (void *, size_t);
@@ -135,12 +135,12 @@ extern int _malloc_trim_r (struct _reent *, size_t);
/* A compatibility routine for an earlier version of the allocator. */
-extern _VOID mstats (char *);
+extern void mstats (char *);
#ifdef __CYGWIN__
#undef _mstats_r
#define _mstats_r(r, p) mstats (p)
#else
-extern _VOID _mstats_r (struct _reent *, char *);
+extern void _mstats_r (struct _reent *, char *);
#endif
/* SVID2/XPG mallopt options */
diff --git a/newlib/libc/include/stdio.h b/newlib/libc/include/stdio.h
index fe0a31827..127145083 100644
--- a/newlib/libc/include/stdio.h
+++ b/newlib/libc/include/stdio.h
@@ -259,7 +259,7 @@ off_t _EXFUN(ftello, ( FILE *));
#endif
#endif
#if __GNU_VISIBLE
-int _EXFUN(fcloseall, (_VOID));
+int _EXFUN(fcloseall, (void));
#endif
#ifndef _REENT_ONLY
#if __ISO_C_VISIBLE >= 1999
diff --git a/newlib/libc/include/stdlib.h b/newlib/libc/include/stdlib.h
index 7213a3c16..80f15f4e9 100644
--- a/newlib/libc/include/stdlib.h
+++ b/newlib/libc/include/stdlib.h
@@ -62,18 +62,18 @@ typedef int (*__compar_fn_t) (const void *, const void *);
#define RAND_MAX __RAND_MAX
-int _EXFUN(__locale_mb_cur_max,(_VOID));
+int _EXFUN(__locale_mb_cur_max,(void));
#define MB_CUR_MAX __locale_mb_cur_max()
-_VOID _EXFUN(abort,(_VOID) _ATTRIBUTE ((__noreturn__)));
+void _EXFUN(abort,(void) _ATTRIBUTE ((__noreturn__)));
int _EXFUN(abs,(int));
#if __BSD_VISIBLE
__uint32_t _EXFUN(arc4random, (void));
__uint32_t _EXFUN(arc4random_uniform, (__uint32_t));
void _EXFUN(arc4random_buf, (void *, size_t));
#endif
-int _EXFUN(atexit,(_VOID (*__func)(_VOID)));
+int _EXFUN(atexit,(void (*__func)(void)));
double _EXFUN(atof,(const char *__nptr));
#if __MISC_VISIBLE
float _EXFUN(atoff,(const char *__nptr));
@@ -89,8 +89,8 @@ void * _EXFUN(bsearch,(const void *__key,
__compar_fn_t _compar));
void * _EXFUN_NOTHROW(calloc,(size_t __nmemb, size_t __size));
div_t _EXFUN(div,(int __numer, int __denom));
-_VOID _EXFUN(exit,(int __status) _ATTRIBUTE ((__noreturn__)));
-_VOID _EXFUN_NOTHROW(free,(void *));
+void _EXFUN(exit,(int __status) _ATTRIBUTE ((__noreturn__)));
+void _EXFUN_NOTHROW(free,(void *));
char * _EXFUN(getenv,(const char *__string));
char * _EXFUN(_getenv_r,(struct _reent *, const char *__string));
char * _EXFUN(_findenv,(const char *, int *));
@@ -136,8 +136,8 @@ int _EXFUN(_mkostemps_r, (struct _reent *, char *, int, int));
int _EXFUN(_mkstemp_r, (struct _reent *, char *));
int _EXFUN(_mkstemps_r, (struct _reent *, char *, int));
char * _EXFUN(_mktemp_r, (struct _reent *, char *) _ATTRIBUTE ((__deprecated__("the use of `mktemp' is dangerous; use `mkstemp' instead"))));
-_VOID _EXFUN(qsort,(void *__base, size_t __nmemb, size_t __size, __compar_fn_t _compar));
-int _EXFUN(rand,(_VOID));
+void _EXFUN(qsort,(void *__base, size_t __nmemb, size_t __size, __compar_fn_t _compar));
+int _EXFUN(rand,(void));
void * _EXFUN_NOTHROW(realloc,(void *__r, size_t __size));
#if __BSD_VISIBLE
void *reallocarray(void *, size_t, size_t) __result_use_check __alloc_size(2)
@@ -151,9 +151,9 @@ char * _EXFUN(realpath, (const char *__restrict path, char *__restrict resolved_
int _EXFUN(rpmatch, (const char *response));
#endif
#if __XSI_VISIBLE
-_VOID _EXFUN(setkey, (const char *__key));
+void _EXFUN(setkey, (const char *__key));
#endif
-_VOID _EXFUN(srand,(unsigned __seed));
+void _EXFUN(srand,(unsigned __seed));
double _EXFUN(strtod,(const char *__restrict __n, char **__restrict __end_PTR));
double _EXFUN(_strtod_r,(struct _reent *,const char *__restrict __n, char **__restrict __end_PTR));
#if __ISO_C_VISIBLE >= 1999
@@ -193,10 +193,10 @@ char * _EXFUN(l64a,(long __input));
char * _EXFUN(_l64a_r,(struct _reent *,long __input));
#endif
#if __MISC_VISIBLE
-int _EXFUN(on_exit,(_VOID (*__func)(int, void *),void *__arg));
+int _EXFUN(on_exit,(void (*__func)(int, void *),void *__arg));
#endif
#if __ISO_C_VISIBLE >= 1999
-_VOID _EXFUN(_Exit,(int __status) _ATTRIBUTE ((__noreturn__)));
+void _EXFUN(_Exit,(int __status) _ATTRIBUTE ((__noreturn__)));
#endif
#if __SVID_VISIBLE || __XSI_VISIBLE
int _EXFUN(putenv,(char *__string));
@@ -229,17 +229,17 @@ int _EXFUN(rand_r,(unsigned *__seed));
#endif
#if __SVID_VISIBLE || __XSI_VISIBLE
-double _EXFUN(drand48,(_VOID));
+double _EXFUN(drand48,(void));
double _EXFUN(_drand48_r,(struct _reent *));
double _EXFUN(erand48,(unsigned short [3]));
double _EXFUN(_erand48_r,(struct _reent *, unsigned short [3]));
long _EXFUN(jrand48,(unsigned short [3]));
long _EXFUN(_jrand48_r,(struct _reent *, unsigned short [3]));
-_VOID _EXFUN(lcong48,(unsigned short [7]));
-_VOID _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7]));
-long _EXFUN(lrand48,(_VOID));
+void _EXFUN(lcong48,(unsigned short [7]));
+void _EXFUN(_lcong48_r,(struct _reent *, unsigned short [7]));
+long _EXFUN(lrand48,(void));
long _EXFUN(_lrand48_r,(struct _reent *));
-long _EXFUN(mrand48,(_VOID));
+long _EXFUN(mrand48,(void));
long _EXFUN(_mrand48_r,(struct _reent *));
long _EXFUN(nrand48,(unsigned short [3]));
long _EXFUN(_nrand48_r,(struct _reent *, unsigned short [3]));
@@ -247,14 +247,14 @@ unsigned short *
_EXFUN(seed48,(unsigned short [3]));
unsigned short *
_EXFUN(_seed48_r,(struct _reent *, unsigned short [3]));
-_VOID _EXFUN(srand48,(long));
-_VOID _EXFUN(_srand48_r,(struct _reent *, long));
+void _EXFUN(srand48,(long));
+void _EXFUN(_srand48_r,(struct _reent *, long));
#endif /* __SVID_VISIBLE || __XSI_VISIBLE */
#if __SVID_VISIBLE || __XSI_VISIBLE >= 4 || __BSD_VISIBLE
char * _EXFUN(initstate,(unsigned, char *, size_t));
-long _EXFUN(random,(_VOID));
+long _EXFUN(random,(void));
char * _EXFUN(setstate,(char *));
-_VOID _EXFUN(srandom,(unsigned));
+void _EXFUN(srandom,(unsigned));
#endif
#if __ISO_C_VISIBLE >= 1999
long long _EXFUN(atoll,(const char *__nptr));
@@ -273,7 +273,7 @@ unsigned long long _EXFUN(_strtoull_r,(struct _reent *, const char *__restrict _
#ifndef __CYGWIN__
#if __MISC_VISIBLE
-_VOID _EXFUN(cfree,(void *));
+void _EXFUN(cfree,(void *));
#endif
#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112
int _EXFUN(unsetenv,(const char *__string));
@@ -289,26 +289,26 @@ char * _EXFUN(_dtoa_r,(struct _reent *, double, int, int, int *, int*, char**));
#ifndef __CYGWIN__
void * _EXFUN_NOTHROW(_malloc_r,(struct _reent *, size_t));
void * _EXFUN_NOTHROW(_calloc_r,(struct _reent *, size_t, size_t));
-_VOID _EXFUN_NOTHROW(_free_r,(struct _reent *, void *));
+void _EXFUN_NOTHROW(_free_r,(struct _reent *, void *));
void * _EXFUN_NOTHROW(_realloc_r,(struct _reent *, void *, size_t));
-_VOID _EXFUN(_mstats_r,(struct _reent *, char *));
+void _EXFUN(_mstats_r,(struct _reent *, char *));
#endif
int _EXFUN(_system_r,(struct _reent *, const char *));
-_VOID _EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *));
+void _EXFUN(__eprintf,(const char *, const char *, unsigned int, const char *));
/* There are two common qsort_r variants. If you request
_BSD_SOURCE, you get the BSD version; otherwise you get the GNU
version. We want that #undef qsort_r will still let you
invoke the underlying function, but that requires gcc support. */
#if __GNU_VISIBLE
-_VOID _EXFUN(qsort_r,(void *__base, size_t __nmemb, size_t __size, int (*_compar)(const void *, const void *, void *), void *__thunk));
+void _EXFUN(qsort_r,(void *__base, size_t __nmemb, size_t __size, int (*_compar)(const void *, const void *, void *), void *__thunk));
#elif __BSD_VISIBLE
# ifdef __GNUC__
-_VOID _EXFUN(qsort_r,(void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *)))
+void _EXFUN(qsort_r,(void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *)))
__asm__ (__ASMNAME ("__bsd_qsort_r"));
# else
-_VOID _EXFUN(__bsd_qsort_r,(void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *)));
+void _EXFUN(__bsd_qsort_r,(void *__base, size_t __nmemb, size_t __size, void *__thunk, int (*_compar)(void *, const void *, const void *)));
# define qsort_r __bsd_qsort_r
# endif
#endif
diff --git a/newlib/libc/include/sys/iconvnls.h b/newlib/libc/include/sys/iconvnls.h
index 7475ed21b..aa0b78441 100644
--- a/newlib/libc/include/sys/iconvnls.h
+++ b/newlib/libc/include/sys/iconvnls.h
@@ -44,7 +44,7 @@
#define ICONV_NLS_FROM 0
#define ICONV_NLS_TO 1
-_VOID
+void
_EXFUN(_iconv_nls_get_state, (iconv_t cd, mbstate_t *ps, int direction));
int
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index 1381db67b..cfb79edd3 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -165,7 +165,7 @@ struct __sFILE_fake {
/* Following is needed both in libc/stdio and libc/stdlib so we put it
* here instead of libc/stdio/local.h where it was previously. */
-extern _VOID _EXFUN(__sinit,(struct _reent *));
+extern void _EXFUN(__sinit,(struct _reent *));
# define _REENT_SMALL_CHECK_INIT(ptr) \
do \
diff --git a/newlib/libc/include/time.h b/newlib/libc/include/time.h
index 8806b98c7..6f6ff86c8 100644
--- a/newlib/libc/include/time.h
+++ b/newlib/libc/include/time.h
@@ -98,9 +98,9 @@ char *strptime_l (const char *__restrict, const char *__restrict,
#endif
#if __POSIX_VISIBLE
-_VOID _EXFUN(tzset, (_VOID));
+void _EXFUN(tzset, (void));
#endif
-_VOID _EXFUN(_tzset_r, (struct _reent *));
+void _EXFUN(_tzset_r, (struct _reent *));
typedef struct __tzrule_struct
{
@@ -120,7 +120,7 @@ typedef struct __tzinfo_struct
__tzrule_type __tzrule[2];
} __tzinfo_type;
-__tzinfo_type *_EXFUN (__gettzinfo, (_VOID));
+__tzinfo_type *_EXFUN (__gettzinfo, (void));
/* getdate functions */
@@ -128,7 +128,7 @@ __tzinfo_type *_EXFUN (__gettzinfo, (_VOID));
#if __XSI_VISIBLE >= 4
#ifndef _REENT_ONLY
#define getdate_err (*__getdate_err())
-int *_EXFUN(__getdate_err,(_VOID));
+int *_EXFUN(__getdate_err,(void));
struct tm * _EXFUN(getdate, (const char *));
/* getdate_err is set to one of the following values to indicate the error.
diff --git a/newlib/libc/machine/microblaze/abort.c b/newlib/libc/machine/microblaze/abort.c
index a2bb535e0..1af7b368f 100644
--- a/newlib/libc/machine/microblaze/abort.c
+++ b/newlib/libc/machine/microblaze/abort.c
@@ -46,7 +46,7 @@ Supporting OS subroutines required: <<_exit>> and optionally, <<write>>.
#include <unistd.h>
#include <signal.h>
-_VOID
+void
abort (void)
{
#ifdef ABORT_MESSAGE
diff --git a/newlib/libc/machine/nds32/abort.c b/newlib/libc/machine/nds32/abort.c
index c952ce569..5fa0b6e7f 100644
--- a/newlib/libc/machine/nds32/abort.c
+++ b/newlib/libc/machine/nds32/abort.c
@@ -28,7 +28,7 @@ Supporting OS subroutines required: <<_exit>>.
#include <unistd.h>
-_VOID
+void
abort (void)
{
while (1)
diff --git a/newlib/libc/machine/powerpc/machine/malloc.h b/newlib/libc/machine/powerpc/machine/malloc.h
index 6be7eac80..394ad4e4e 100644
--- a/newlib/libc/machine/powerpc/machine/malloc.h
+++ b/newlib/libc/machine/powerpc/machine/malloc.h
@@ -5,7 +5,7 @@
void *_EXFUN(vec_calloc,(size_t __nmemb, size_t __size));
void *_EXFUN(_vec_calloc_r,(struct _reent *, size_t __nmemb, size_t __size));
-_VOID _EXFUN(vec_free,(void *));
+void _EXFUN(vec_free,(void *));
#define _vec_freer _freer
void *_EXFUN(vec_malloc,(size_t __size));
#define _vec_mallocr _memalign_r
diff --git a/newlib/libc/machine/powerpc/machine/stdlib.h b/newlib/libc/machine/powerpc/machine/stdlib.h
index bc9b9cfe9..ea597102b 100644
--- a/newlib/libc/machine/powerpc/machine/stdlib.h
+++ b/newlib/libc/machine/powerpc/machine/stdlib.h
@@ -7,7 +7,7 @@
void *_EXFUN(vec_calloc,(size_t __nmemb, size_t __size));
void *_EXFUN(_vec_calloc_r,(struct _reent *, size_t __nmemb, size_t __size));
-_VOID _EXFUN(vec_free,(void *));
+void _EXFUN(vec_free,(void *));
#define _vec_freer _freer
void *_EXFUN(vec_malloc,(size_t __size));
#define _vec_mallocr _memalign_r
diff --git a/newlib/libc/machine/spu/clearerr.c b/newlib/libc/machine/spu/clearerr.c
index b4034f8ff..667667a91 100644
--- a/newlib/libc/machine/spu/clearerr.c
+++ b/newlib/libc/machine/spu/clearerr.c
@@ -36,7 +36,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#ifndef _REENT_ONLY
-_VOID
+void
_DEFUN (clearerr, (fp),
FILE * fp)
diff --git a/newlib/libc/machine/spu/stdio.c b/newlib/libc/machine/spu/stdio.c
index e8b9dd9fa..14332b475 100644
--- a/newlib/libc/machine/spu/stdio.c
+++ b/newlib/libc/machine/spu/stdio.c
@@ -52,7 +52,7 @@ _DEFUN (__sfp, (d),
return NULL;
}
-static _VOID
+static void
_DEFUN (__cleanup, (s),
struct _reent *s)
{
@@ -64,7 +64,7 @@ _DEFUN (__cleanup, (s),
}
}
-_VOID
+void
_DEFUN (__sinit, (s),
struct _reent *s)
{
@@ -81,7 +81,7 @@ _DEFUN (__sinit, (s),
s->_stderr->_fp = SPE_STDERR;
}
-_VOID
+void
__check_init (void)
{
CHECK_INIT(_REENT);
diff --git a/newlib/libc/signal/psignal.c b/newlib/libc/signal/psignal.c
index 6263c3f70..a62f8ae01 100644
--- a/newlib/libc/signal/psignal.c
+++ b/newlib/libc/signal/psignal.c
@@ -33,7 +33,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include <stdio.h>
#include <string.h>
-_VOID
+void
_DEFUN(psignal, (sig, s),
int sig,
const char *s)
diff --git a/newlib/libc/stdio/clearerr.c b/newlib/libc/stdio/clearerr.c
index 4174a7425..23e3c18e3 100644
--- a/newlib/libc/stdio/clearerr.c
+++ b/newlib/libc/stdio/clearerr.c
@@ -71,7 +71,7 @@ No supporting OS subroutines are required.
#undef clearerr
-_VOID
+void
_DEFUN(clearerr, (fp),
FILE * fp)
{
diff --git a/newlib/libc/stdio/clearerr_u.c b/newlib/libc/stdio/clearerr_u.c
index 00c5e8efa..7514fa2e9 100644
--- a/newlib/libc/stdio/clearerr_u.c
+++ b/newlib/libc/stdio/clearerr_u.c
@@ -32,7 +32,7 @@
#undef clearerr_unlocked
-_VOID
+void
_DEFUN(clearerr_unlocked, (fp),
FILE * fp)
{
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index fb437515d..031b98b49 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -40,9 +40,9 @@ __FILE __sf[3];
#endif
#if (defined (__OPTIMIZE_SIZE__) || defined (PREFER_SIZE_OVER_SPEED))
-_NOINLINE_STATIC _VOID
+_NOINLINE_STATIC void
#else
-static _VOID
+static void
#endif
_DEFUN(std, (ptr, flags, file),
FILE *ptr,
@@ -203,7 +203,7 @@ found:
* The name `_cleanup' is, alas, fairly well known outside stdio.
*/
-_VOID
+void
_DEFUN(_cleanup_r, (ptr),
struct _reent *ptr)
{
@@ -234,7 +234,7 @@ _DEFUN(_cleanup_r, (ptr),
}
#ifndef _REENT_ONLY
-_VOID
+void
_cleanup (void)
{
_cleanup_r (_GLOBAL_REENT);
@@ -245,7 +245,7 @@ _cleanup (void)
* __sinit() is called whenever stdio's internal variables must be set up.
*/
-_VOID
+void
_DEFUN(__sinit, (s),
struct _reent *s)
{
@@ -303,25 +303,25 @@ _DEFUN(__sinit, (s),
__LOCK_INIT_RECURSIVE(static, __sfp_recursive_mutex);
__LOCK_INIT_RECURSIVE(static, __sinit_recursive_mutex);
-_VOID
+void
__sfp_lock_acquire (void)
{
__lock_acquire_recursive (__sfp_recursive_mutex);
}
-_VOID
+void
__sfp_lock_release (void)
{
__lock_release_recursive (__sfp_recursive_mutex);
}
-_VOID
+void
__sinit_lock_acquire (void)
{
__lock_acquire_recursive (__sinit_recursive_mutex);
}
-_VOID
+void
__sinit_lock_release (void)
{
__lock_release_recursive (__sinit_recursive_mutex);
@@ -349,7 +349,7 @@ _DEFUN(__fp_unlock, (ptr),
return 0;
}
-_VOID
+void
__fp_lock_all (void)
{
__sfp_lock_acquire ();
@@ -357,7 +357,7 @@ __fp_lock_all (void)
(void) _fwalk (_REENT, __fp_lock);
}
-_VOID
+void
__fp_unlock_all (void)
{
(void) _fwalk (_REENT, __fp_unlock);
diff --git a/newlib/libc/stdio/local.h b/newlib/libc/stdio/local.h
index b5fd1198a..68a36e054 100644
--- a/newlib/libc/stdio/local.h
+++ b/newlib/libc/stdio/local.h
@@ -179,9 +179,9 @@ extern _READ_WRITE_RETURN_TYPE _EXFUN(__swrite,(struct _reent *, void *,
extern _fpos_t _EXFUN(__sseek,(struct _reent *, void *, _fpos_t, int));
extern int _EXFUN(__sclose,(struct _reent *, void *));
extern int _EXFUN(__stextmode,(int));
-extern _VOID _EXFUN(__sinit,(struct _reent *));
-extern _VOID _EXFUN(_cleanup_r,(struct _reent *));
-extern _VOID _EXFUN(__smakebuf_r,(struct _reent *, FILE *));
+extern void _EXFUN(__sinit,(struct _reent *));
+extern void _EXFUN(_cleanup_r,(struct _reent *));
+extern void _EXFUN(__smakebuf_r,(struct _reent *, FILE *));
extern int _EXFUN(__swhatbuf_r,(struct _reent *, FILE *, size_t *, int *));
extern int _EXFUN(_fwalk,(struct _reent *, int (*)(FILE *)));
extern int _EXFUN(_fwalk_reent,(struct _reent *, int (*)(struct _reent *, FILE *)));
@@ -297,10 +297,10 @@ char *_EXFUN(_llicvt,(char *, long long, char));
#define __sinit_lock_acquire()
#define __sinit_lock_release()
#else
-_VOID _EXFUN(__sfp_lock_acquire,(_VOID));
-_VOID _EXFUN(__sfp_lock_release,(_VOID));
-_VOID _EXFUN(__sinit_lock_acquire,(_VOID));
-_VOID _EXFUN(__sinit_lock_release,(_VOID));
+void _EXFUN(__sfp_lock_acquire,(void));
+void _EXFUN(__sfp_lock_release,(void));
+void _EXFUN(__sinit_lock_acquire,(void));
+void _EXFUN(__sinit_lock_release,(void));
#endif
/* Types used in positional argument support in vfprinf/vfwprintf.
diff --git a/newlib/libc/stdio/makebuf.c b/newlib/libc/stdio/makebuf.c
index c76527da6..37a50d47d 100644
--- a/newlib/libc/stdio/makebuf.c
+++ b/newlib/libc/stdio/makebuf.c
@@ -34,7 +34,7 @@
* optimization) right after the _fstat() that finds the buffer size.
*/
-_VOID
+void
_DEFUN(__smakebuf_r, (ptr, fp),
struct _reent *ptr,
register FILE *fp)
diff --git a/newlib/libc/stdio/perror.c b/newlib/libc/stdio/perror.c
index cda8a1112..e3e70a6f1 100644
--- a/newlib/libc/stdio/perror.c
+++ b/newlib/libc/stdio/perror.c
@@ -58,7 +58,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include <string.h>
#include "local.h"
-_VOID
+void
_DEFUN(_perror_r, (ptr, s),
struct _reent *ptr,
const char *s)
@@ -81,7 +81,7 @@ _DEFUN(_perror_r, (ptr, s),
#ifndef _REENT_ONLY
-_VOID
+void
_DEFUN(perror, (s),
const char *s)
{
diff --git a/newlib/libc/stdio/rewind.c b/newlib/libc/stdio/rewind.c
index a09186bb0..745c93974 100644
--- a/newlib/libc/stdio/rewind.c
+++ b/newlib/libc/stdio/rewind.c
@@ -51,7 +51,7 @@ static char sccsid[] = "%W% (Berkeley) %G%";
#include <reent.h>
#include <stdio.h>
-_VOID
+void
_DEFUN(_rewind_r, (ptr, fp),
struct _reent * ptr,
register FILE * fp)
@@ -62,7 +62,7 @@ _DEFUN(_rewind_r, (ptr, fp),
#ifndef _REENT_ONLY
-_VOID
+void
_DEFUN(rewind, (fp),
register FILE * fp)
{
diff --git a/newlib/libc/stdio/setbuf.c b/newlib/libc/stdio/setbuf.c
index 7308ab8c2..1538762a1 100644
--- a/newlib/libc/stdio/setbuf.c
+++ b/newlib/libc/stdio/setbuf.c
@@ -64,7 +64,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include <stdio.h>
#include "local.h"
-_VOID
+void
_DEFUN(setbuf, (fp, buf),
FILE *__restrict fp,
char *__restrict buf)
diff --git a/newlib/libc/stdio/setbuffer.c b/newlib/libc/stdio/setbuffer.c
index 6914ca7f2..2b93e7df3 100644
--- a/newlib/libc/stdio/setbuffer.c
+++ b/newlib/libc/stdio/setbuffer.c
@@ -64,7 +64,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include <stdio.h>
#include "local.h"
-_VOID
+void
_DEFUN(setbuffer, (fp, buf, size),
FILE * fp,
char *buf,
diff --git a/newlib/libc/stdlib/abort.c b/newlib/libc/stdlib/abort.c
index ae0c2fb62..065dee5b6 100644
--- a/newlib/libc/stdlib/abort.c
+++ b/newlib/libc/stdlib/abort.c
@@ -46,7 +46,7 @@ Supporting OS subroutines required: <<_exit>> and optionally, <<write>>.
#include <unistd.h>
#include <signal.h>
-_VOID
+void
abort (void)
{
#ifdef ABORT_MESSAGE
diff --git a/newlib/libc/stdlib/atexit.c b/newlib/libc/stdlib/atexit.c
index 78180895c..1710aff14 100644
--- a/newlib/libc/stdlib/atexit.c
+++ b/newlib/libc/stdlib/atexit.c
@@ -55,7 +55,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
int
_DEFUN (atexit,
(fn),
- _VOID _EXFNPTR(fn, (_VOID)))
+ void _EXFNPTR(fn, (void)))
{
return __register_exitproc (__et_atexit, fn, NULL, NULL);
}
diff --git a/newlib/libc/stdlib/lcong48.c b/newlib/libc/stdlib/lcong48.c
index f40dede82..a16d49ecc 100644
--- a/newlib/libc/stdlib/lcong48.c
+++ b/newlib/libc/stdlib/lcong48.c
@@ -13,7 +13,7 @@
#include "rand48.h"
-_VOID
+void
_DEFUN (_lcong48_r, (r, p),
struct _reent *r,
unsigned short p[7])
@@ -29,7 +29,7 @@ _DEFUN (_lcong48_r, (r, p),
}
#ifndef _REENT_ONLY
-_VOID
+void
_DEFUN (lcong48, (p),
unsigned short p[7])
{
diff --git a/newlib/libc/stdlib/on_exit.c b/newlib/libc/stdlib/on_exit.c
index 329b25425..97d107e7d 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, void *)),
+ void _EXFNPTR(fn, (int, void *)),
void *arg)
{
return __register_exitproc (__et_onexit, (void (*)(void)) fn, arg, NULL);
diff --git a/newlib/libc/stdlib/srand48.c b/newlib/libc/stdlib/srand48.c
index 7042e834c..1eac2a11f 100644
--- a/newlib/libc/stdlib/srand48.c
+++ b/newlib/libc/stdlib/srand48.c
@@ -13,7 +13,7 @@
#include "rand48.h"
-_VOID
+void
_DEFUN (_srand48_r, (r, seed),
struct _reent *r,
long seed)
@@ -29,7 +29,7 @@ _DEFUN (_srand48_r, (r, seed),
}
#ifndef _REENT_ONLY
-_VOID
+void
_DEFUN (srand48, (seed),
long seed)
{
diff --git a/newlib/libc/sys/linux/include/time.h b/newlib/libc/sys/linux/include/time.h
index 64ade9463..e5456766e 100644
--- a/newlib/libc/sys/linux/include/time.h
+++ b/newlib/libc/sys/linux/include/time.h
@@ -81,8 +81,8 @@ struct tm *_EXFUN(localtime_r, (const time_t *, struct tm *));
#ifndef __STRICT_ANSI__
char *_EXFUN(strptime, (const char *, const char *, struct tm *));
-_VOID _EXFUN(tzset, (_VOID));
-_VOID _EXFUN(_tzset_r, (struct _reent *));
+void _EXFUN(tzset, (void));
+void _EXFUN(_tzset_r, (struct _reent *));
typedef struct __tzrule_struct
{
@@ -102,13 +102,13 @@ typedef struct __tzinfo_struct
__tzrule_type __tzrule[2];
} __tzinfo_type;
-__tzinfo_type *_EXFUN (__gettzinfo, (_VOID));
+__tzinfo_type *_EXFUN (__gettzinfo, (void));
/* getdate functions */
#ifndef _REENT_ONLY
#define getdate_err (*__getdate_err())
-int *_EXFUN(__getdate_err,(_VOID));
+int *_EXFUN(__getdate_err,(void));
struct tm * _EXFUN(getdate, (const char *));
/* getdate_err is set to one of the following values to indicate the error.
diff --git a/newlib/libc/sys/rtems/crt0.c b/newlib/libc/sys/rtems/crt0.c
index dca5fc8bc..ff3e7e6a3 100644
--- a/newlib/libc/sys/rtems/crt0.c
+++ b/newlib/libc/sys/rtems/crt0.c
@@ -189,7 +189,7 @@ RTEMS_STUB(int, issetugid (void), { return 0; })
RTEMS_STUB(void *, _realloc_r(struct _reent *r, void *p, size_t s), { return 0; })
RTEMS_STUB(void *, _calloc_r(struct _reent *r, size_t s1, size_t s2), { return 0; })
RTEMS_STUB(void *, _malloc_r(struct _reent * r, size_t s), { return 0; })
-RTEMS_STUB(_VOID, _free_r(struct _reent *r, void **p), { })
+RTEMS_STUB(void, _free_r(struct _reent *r, void **p), { })
/* stubs for functions required by libc/stdlib */
RTEMS_STUB(void, __assert_func(const char *file, int line, const char *failedexpr), { })
diff --git a/newlib/libc/time/local.h b/newlib/libc/time/local.h
index dd9d76666..10c5b445d 100644
--- a/newlib/libc/time/local.h
+++ b/newlib/libc/time/local.h
@@ -23,8 +23,8 @@ int _EXFUN (__tzcalc_limits, (int __year));
extern const int __month_lengths[2][MONSPERYEAR];
-_VOID _EXFUN(_tzset_unlocked_r, (struct _reent *));
-_VOID _EXFUN(_tzset_unlocked, (_VOID));
+void _EXFUN(_tzset_unlocked_r, (struct _reent *));
+void _EXFUN(_tzset_unlocked, (void));
/* locks for multi-threading */
#ifdef __SINGLE_THREAD__
@@ -35,6 +35,6 @@ _VOID _EXFUN(_tzset_unlocked, (_VOID));
#define TZ_UNLOCK __tz_unlock()
#endif
-void _EXFUN(__tz_lock,(_VOID));
-void _EXFUN(__tz_unlock,(_VOID));
+void _EXFUN(__tz_lock,(void));
+void _EXFUN(__tz_unlock,(void));
diff --git a/newlib/libc/time/tzlock.c b/newlib/libc/time/tzlock.c
index 153dfd3a5..4a3ee016f 100644
--- a/newlib/libc/time/tzlock.c
+++ b/newlib/libc/time/tzlock.c
@@ -35,7 +35,7 @@ until the corresponding <<__tz_unlock>> call on the same thread is made.
__LOCK_INIT(static, __tz_mutex);
#endif
-_VOID
+void
__tz_lock (void)
{
#ifndef __SINGLE_THREAD__
@@ -43,7 +43,7 @@ __tz_lock (void)
#endif
}
-_VOID
+void
__tz_unlock (void)
{
#ifndef __SINGLE_THREAD__
diff --git a/newlib/libc/time/tzset.c b/newlib/libc/time/tzset.c
index ca1e1d91f..3b4c01c66 100644
--- a/newlib/libc/time/tzset.c
+++ b/newlib/libc/time/tzset.c
@@ -61,13 +61,13 @@ Supporting OS subroutine required: None
#include <time.h>
#include "local.h"
-_VOID
+void
_tzset_unlocked (void)
{
_tzset_unlocked_r (_REENT);
}
-_VOID
+void
tzset (void)
{
TZ_LOCK;
diff --git a/newlib/libc/time/tzset_r.c b/newlib/libc/time/tzset_r.c
index 6c21e822e..211ddc8af 100644
--- a/newlib/libc/time/tzset_r.c
+++ b/newlib/libc/time/tzset_r.c
@@ -13,7 +13,7 @@ static char __tzname_std[11];
static char __tzname_dst[11];
static char *prev_tzenv = NULL;
-_VOID
+void
_DEFUN (_tzset_unlocked_r, (reent_ptr),
struct _reent *reent_ptr)
{
@@ -183,7 +183,7 @@ _DEFUN (_tzset_unlocked_r, (reent_ptr),
_daylight = tz->__tzrule[0].offset != tz->__tzrule[1].offset;
}
-_VOID
+void
_DEFUN (_tzset_r, (reent_ptr),
struct _reent *reent_ptr)
{
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 08/17] ansification: remove _CAST_VOID
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
` (14 preceding siblings ...)
2017-12-07 18:29 ` [PATCH v2 16/17] ansification: fix makedoc for ANSI C Yaakov Selkowitz
@ 2017-12-07 18:29 ` Yaakov Selkowitz
2017-12-07 18:55 ` [PATCH v2 17/17] ansification: remove ansidecl.h from makedoc Yaakov Selkowitz
2017-12-12 12:51 ` [PATCH v2 00/17] Newlib ANSI-fication Corinna Vinschen
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:29 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
newlib/libc/include/_ansi.h | 2 --
newlib/libc/include/sys/lock.h | 20 ++++++++++----------
newlib/libc/include/sys/stdio.h | 4 ++--
newlib/libc/machine/powerpc/vfscanf.c | 6 +++---
newlib/libc/stdio/fgets.c | 4 ++--
newlib/libc/stdio/findfp.c | 6 +++---
newlib/libc/stdio/fread.c | 6 +++---
newlib/libc/stdio/fvwrite.c | 2 +-
newlib/libc/stdio/refill.c | 2 +-
newlib/libc/stdio/rewind.c | 2 +-
newlib/libc/stdio/setbuf.c | 2 +-
newlib/libc/stdio/setbuffer.c | 2 +-
newlib/libc/stdio/tmpfile.c | 2 +-
newlib/libc/stdio/ungetc.c | 2 +-
newlib/libc/stdio/vfscanf.c | 4 ++--
newlib/libc/stdio64/tmpfile64.c | 2 +-
newlib/libc/string/u_strerr.c | 6 +++---
17 files changed, 36 insertions(+), 38 deletions(-)
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index e955138fe..5e0cce4c8 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -63,7 +63,6 @@
#endif
#define _DEFUN(name, arglist, args) name(args)
#define _DEFUN_VOID(name) name(void)
-#define _CAST_VOID (void)
#ifndef _LONG_DOUBLE
#define _LONG_DOUBLE long double
#endif
@@ -75,7 +74,6 @@
#define _EXFUN_NOTHROW(name, proto) name()
#define _DEFUN(name, arglist, args) name arglist args;
#define _DEFUN_VOID(name) name()
-#define _CAST_VOID
#define _LONG_DOUBLE double
#endif
diff --git a/newlib/libc/include/sys/lock.h b/newlib/libc/include/sys/lock.h
index 42f9c4cd9..528904957 100644
--- a/newlib/libc/include/sys/lock.h
+++ b/newlib/libc/include/sys/lock.h
@@ -13,16 +13,16 @@ typedef int _LOCK_RECURSIVE_T;
#define __LOCK_INIT(class,lock) static int lock = 0;
#define __LOCK_INIT_RECURSIVE(class,lock) static int lock = 0;
-#define __lock_init(lock) (_CAST_VOID 0)
-#define __lock_init_recursive(lock) (_CAST_VOID 0)
-#define __lock_close(lock) (_CAST_VOID 0)
-#define __lock_close_recursive(lock) (_CAST_VOID 0)
-#define __lock_acquire(lock) (_CAST_VOID 0)
-#define __lock_acquire_recursive(lock) (_CAST_VOID 0)
-#define __lock_try_acquire(lock) (_CAST_VOID 0)
-#define __lock_try_acquire_recursive(lock) (_CAST_VOID 0)
-#define __lock_release(lock) (_CAST_VOID 0)
-#define __lock_release_recursive(lock) (_CAST_VOID 0)
+#define __lock_init(lock) ((void) 0)
+#define __lock_init_recursive(lock) ((void) 0)
+#define __lock_close(lock) ((void) 0)
+#define __lock_close_recursive(lock) ((void) 0)
+#define __lock_acquire(lock) ((void) 0)
+#define __lock_acquire_recursive(lock) ((void) 0)
+#define __lock_try_acquire(lock) ((void) 0)
+#define __lock_try_acquire_recursive(lock) ((void) 0)
+#define __lock_release(lock) ((void) 0)
+#define __lock_release_recursive(lock) ((void) 0)
#else
diff --git a/newlib/libc/include/sys/stdio.h b/newlib/libc/include/sys/stdio.h
index 0918fe157..91a274596 100644
--- a/newlib/libc/include/sys/stdio.h
+++ b/newlib/libc/include/sys/stdio.h
@@ -12,7 +12,7 @@
#ifndef __SINGLE_THREAD__
# define _flockfile(fp) (((fp)->_flags & __SSTR) ? 0 : __lock_acquire_recursive((fp)->_lock))
#else
-# define _flockfile(fp) (_CAST_VOID 0)
+# define _flockfile(fp) ((void) 0)
#endif
#endif
@@ -20,7 +20,7 @@
#ifndef __SINGLE_THREAD__
# define _funlockfile(fp) (((fp)->_flags & __SSTR) ? 0 : __lock_release_recursive((fp)->_lock))
#else
-# define _funlockfile(fp) (_CAST_VOID 0)
+# define _funlockfile(fp) ((void) 0)
#endif
#endif
diff --git a/newlib/libc/machine/powerpc/vfscanf.c b/newlib/libc/machine/powerpc/vfscanf.c
index b27a0b81c..4a3e48c22 100644
--- a/newlib/libc/machine/powerpc/vfscanf.c
+++ b/newlib/libc/machine/powerpc/vfscanf.c
@@ -912,7 +912,7 @@ __svfscanf_r (rptr, fp, fmt0, ap)
if (flags & NDIGITS)
{
if (p > buf)
- _CAST_VOID ungetc (*(u_char *)-- p, fp);
+ (void) ungetc (*(u_char *)-- p, fp);
goto match_failure;
}
c = ((u_char *) p)[-1];
@@ -1112,11 +1112,11 @@ __svfscanf_r (rptr, fp, fmt0, ap)
--nread;
if (c != 'e' && c != 'E')
{
- _CAST_VOID ungetc (c, fp); /* sign */
+ (void) ungetc (c, fp); /* sign */
c = *(u_char *)-- p;
--nread;
}
- _CAST_VOID ungetc (c, fp);
+ (void) ungetc (c, fp);
}
if ((flags & SUPPRESS) == 0)
{
diff --git a/newlib/libc/stdio/fgets.c b/newlib/libc/stdio/fgets.c
index d4e0af35c..c6ef6d3d5 100644
--- a/newlib/libc/stdio/fgets.c
+++ b/newlib/libc/stdio/fgets.c
@@ -170,14 +170,14 @@ _DEFUN(_fgets_r, (ptr, buf, n, fp),
len = ++t - p;
fp->_r -= len;
fp->_p = t;
- _CAST_VOID memcpy ((void *) s, (void *) p, len);
+ (void) memcpy ((void *) s, (void *) p, len);
s[len] = 0;
_newlib_flockfile_exit (fp);
return (buf);
}
fp->_r -= len;
fp->_p += len;
- _CAST_VOID memcpy ((void *) s, (void *) p, len);
+ (void) memcpy ((void *) s, (void *) p, len);
s += len;
}
while ((n -= len) != 0);
diff --git a/newlib/libc/stdio/findfp.c b/newlib/libc/stdio/findfp.c
index 3d928c15d..a7ea76bb5 100644
--- a/newlib/libc/stdio/findfp.c
+++ b/newlib/libc/stdio/findfp.c
@@ -230,7 +230,7 @@ _DEFUN(_cleanup_r, (ptr),
if (ptr->_stderr != &__sf[2])
(*cleanup_func) (ptr, ptr->_stderr);
#endif
- _CAST_VOID _fwalk_reent (ptr, cleanup_func);
+ (void) _fwalk_reent (ptr, cleanup_func);
}
#ifndef _REENT_ONLY
@@ -354,13 +354,13 @@ _DEFUN_VOID(__fp_lock_all)
{
__sfp_lock_acquire ();
- _CAST_VOID _fwalk (_REENT, __fp_lock);
+ (void) _fwalk (_REENT, __fp_lock);
}
_VOID
_DEFUN_VOID(__fp_unlock_all)
{
- _CAST_VOID _fwalk (_REENT, __fp_unlock);
+ (void) _fwalk (_REENT, __fp_unlock);
__sfp_lock_release ();
}
diff --git a/newlib/libc/stdio/fread.c b/newlib/libc/stdio/fread.c
index 58aa2c68d..c9180b833 100644
--- a/newlib/libc/stdio/fread.c
+++ b/newlib/libc/stdio/fread.c
@@ -173,7 +173,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp),
{
/* First copy any available characters from ungetc buffer. */
int copy_size = resid > fp->_r ? fp->_r : resid;
- _CAST_VOID memcpy ((void *) p, (void *) fp->_p, (size_t) copy_size);
+ (void) memcpy ((void *) p, (void *) fp->_p, (size_t) copy_size);
fp->_p += copy_size;
fp->_r -= copy_size;
p += copy_size;
@@ -222,7 +222,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp),
{
while (resid > (r = fp->_r))
{
- _CAST_VOID memcpy ((void *) p, (void *) fp->_p, (size_t) r);
+ (void) memcpy ((void *) p, (void *) fp->_p, (size_t) r);
fp->_p += r;
/* fp->_r = 0 ... done in __srefill */
p += r;
@@ -241,7 +241,7 @@ _DEFUN(_fread_r, (ptr, buf, size, count, fp),
return (total - resid) / size;
}
}
- _CAST_VOID memcpy ((void *) p, (void *) fp->_p, resid);
+ (void) memcpy ((void *) p, (void *) fp->_p, resid);
fp->_r -= resid;
fp->_p += resid;
}
diff --git a/newlib/libc/stdio/fvwrite.c b/newlib/libc/stdio/fvwrite.c
index 95bd34c6d..d742784e5 100644
--- a/newlib/libc/stdio/fvwrite.c
+++ b/newlib/libc/stdio/fvwrite.c
@@ -26,7 +26,7 @@
#include "fvwrite.h"
#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define COPY(n) _CAST_VOID memmove ((void *) fp->_p, (void *) p, (size_t) (n))
+#define COPY(n) (void) memmove ((void *) fp->_p, (void *) p, (size_t) (n))
#define GETIOV(extra_work) \
while (len == 0) \
diff --git a/newlib/libc/stdio/refill.c b/newlib/libc/stdio/refill.c
index fc738d455..6158f3ec0 100644
--- a/newlib/libc/stdio/refill.c
+++ b/newlib/libc/stdio/refill.c
@@ -107,7 +107,7 @@ _DEFUN(__srefill_r, (ptr, fp),
/* Ignore this file in _fwalk to avoid potential deadlock. */
short orig_flags = fp->_flags;
fp->_flags = 1;
- _CAST_VOID _fwalk (_GLOBAL_REENT, lflush);
+ (void) _fwalk (_GLOBAL_REENT, lflush);
fp->_flags = orig_flags;
/* Now flush this file without locking it. */
diff --git a/newlib/libc/stdio/rewind.c b/newlib/libc/stdio/rewind.c
index 873083b85..a09186bb0 100644
--- a/newlib/libc/stdio/rewind.c
+++ b/newlib/libc/stdio/rewind.c
@@ -56,7 +56,7 @@ _DEFUN(_rewind_r, (ptr, fp),
struct _reent * ptr,
register FILE * fp)
{
- _CAST_VOID _fseek_r (ptr, fp, 0L, SEEK_SET);
+ (void) _fseek_r (ptr, fp, 0L, SEEK_SET);
clearerr (fp);
}
diff --git a/newlib/libc/stdio/setbuf.c b/newlib/libc/stdio/setbuf.c
index a7df3a1f4..7308ab8c2 100644
--- a/newlib/libc/stdio/setbuf.c
+++ b/newlib/libc/stdio/setbuf.c
@@ -69,5 +69,5 @@ _DEFUN(setbuf, (fp, buf),
FILE *__restrict fp,
char *__restrict buf)
{
- _CAST_VOID setvbuf (fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
+ (void) setvbuf (fp, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
}
diff --git a/newlib/libc/stdio/setbuffer.c b/newlib/libc/stdio/setbuffer.c
index cbcbde3db..6914ca7f2 100644
--- a/newlib/libc/stdio/setbuffer.c
+++ b/newlib/libc/stdio/setbuffer.c
@@ -70,5 +70,5 @@ _DEFUN(setbuffer, (fp, buf, size),
char *buf,
int size)
{
- _CAST_VOID setvbuf (fp, buf, buf ? _IOFBF : _IONBF, (size_t) size);
+ (void) setvbuf (fp, buf, buf ? _IOFBF : _IONBF, (size_t) size);
}
diff --git a/newlib/libc/stdio/tmpfile.c b/newlib/libc/stdio/tmpfile.c
index 6145ad0bc..30e9040fd 100644
--- a/newlib/libc/stdio/tmpfile.c
+++ b/newlib/libc/stdio/tmpfile.c
@@ -73,7 +73,7 @@ _DEFUN(_tmpfile_r, (ptr),
e = ptr->_errno;
if (!fp)
_close_r (ptr, fd);
- _CAST_VOID _remove_r (ptr, f);
+ (void) _remove_r (ptr, f);
ptr->_errno = e;
return fp;
}
diff --git a/newlib/libc/stdio/ungetc.c b/newlib/libc/stdio/ungetc.c
index f7e12880e..c673365b1 100644
--- a/newlib/libc/stdio/ungetc.c
+++ b/newlib/libc/stdio/ungetc.c
@@ -103,7 +103,7 @@ _DEFUN(__submore, (rptr, fp),
p = (unsigned char *) _realloc_r (rptr, (void *) (fp->_ub._base), i << 1);
if (p == NULL)
return EOF;
- _CAST_VOID memcpy ((void *) (p + i), (void *) p, (size_t) i);
+ (void) memcpy ((void *) (p + i), (void *) p, (size_t) i);
fp->_p = p + i;
fp->_ub._base = p;
fp->_ub._size = i << 1;
diff --git a/newlib/libc/stdio/vfscanf.c b/newlib/libc/stdio/vfscanf.c
index 8009699e4..d76d94b8c 100644
--- a/newlib/libc/stdio/vfscanf.c
+++ b/newlib/libc/stdio/vfscanf.c
@@ -367,7 +367,7 @@ _DEFUN(_sfread_r, (ptr, buf, size, count, fp),
while (resid > (r = fp->_r))
{
- _CAST_VOID memcpy ((void *) p, (void *) fp->_p, (size_t) r);
+ (void) memcpy ((void *) p, (void *) fp->_p, (size_t) r);
fp->_p += r;
fp->_r = 0;
p += r;
@@ -378,7 +378,7 @@ _DEFUN(_sfread_r, (ptr, buf, size, count, fp),
return (total - resid) / size;
}
}
- _CAST_VOID memcpy ((void *) p, (void *) fp->_p, resid);
+ (void) memcpy ((void *) p, (void *) fp->_p, resid);
fp->_r -= resid;
fp->_p += resid;
return count;
diff --git a/newlib/libc/stdio64/tmpfile64.c b/newlib/libc/stdio64/tmpfile64.c
index d58aa1472..58b945d5b 100644
--- a/newlib/libc/stdio64/tmpfile64.c
+++ b/newlib/libc/stdio64/tmpfile64.c
@@ -76,7 +76,7 @@ _DEFUN (_tmpfile64_r, (ptr),
e = ptr->_errno;
if (!fp)
_close_r (ptr, fd);
- _CAST_VOID _remove_r (ptr, f);
+ (void) _remove_r (ptr, f);
ptr->_errno = e;
return fp;
}
diff --git a/newlib/libc/string/u_strerr.c b/newlib/libc/string/u_strerr.c
index d3204df72..174d9170f 100644
--- a/newlib/libc/string/u_strerr.c
+++ b/newlib/libc/string/u_strerr.c
@@ -7,9 +7,9 @@ _DEFUN(_user_strerror, (errnum, internal, errptr),
int *errptr)
{
/* prevent warning about unused parameters */
- _CAST_VOID errnum;
- _CAST_VOID internal;
- _CAST_VOID errptr;
+ (void) errnum;
+ (void) internal;
+ (void) errptr;
return 0;
}
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 15/17] ansification: remove _HAVE_STDC
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
` (12 preceding siblings ...)
2017-12-07 18:28 ` [PATCH v2 10/17] ansification: remove _VOID Yaakov Selkowitz
@ 2017-12-07 18:29 ` Yaakov Selkowitz
2017-12-07 18:29 ` [PATCH v2 16/17] ansification: fix makedoc for ANSI C Yaakov Selkowitz
` (3 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:29 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
libgloss/sparc_leon/console_dbg.c | 4 ----
newlib/doc/ansidecl.h | 21 ---------------------
newlib/libc/include/_ansi.h | 19 +------------------
newlib/libc/include/machine/fastmath.h | 2 --
newlib/libc/machine/powerpc/vfprintf.c | 4 ----
newlib/libc/machine/powerpc/vfscanf.c | 4 ----
newlib/libc/machine/spu/vfprintf.c | 4 ----
newlib/libc/machine/spu/vfscanf.c | 4 ----
newlib/libc/machine/spu/vprintf.c | 4 ----
newlib/libc/machine/spu/vscanf.c | 4 ----
newlib/libc/machine/spu/vsnprintf.c | 4 ----
newlib/libc/machine/spu/vsprintf.c | 4 ----
newlib/libc/machine/spu/vsscanf.c | 4 ----
newlib/libc/posix/execl.c | 11 -----------
newlib/libc/posix/execle.c | 11 -----------
newlib/libc/posix/execlp.c | 11 -----------
newlib/libc/stdio/fiscanf.c | 27 ---------------------------
newlib/libc/stdio/fscanf.c | 27 ---------------------------
newlib/libc/stdio/iscanf.c | 25 -------------------------
newlib/libc/stdio/scanf.c | 25 -------------------------
newlib/libc/stdio/siprintf.c | 27 ---------------------------
newlib/libc/stdio/siscanf.c | 29 -----------------------------
newlib/libc/stdio/sniprintf.c | 29 -----------------------------
newlib/libc/stdio/snprintf.c | 29 -----------------------------
newlib/libc/stdio/sprintf.c | 27 ---------------------------
newlib/libc/stdio/sscanf.c | 29 -----------------------------
newlib/libc/stdio/viprintf.c | 4 ----
newlib/libc/stdio/viscanf.c | 4 ----
newlib/libc/stdio/vprintf.c | 4 ----
newlib/libc/stdio/vscanf.c | 4 ----
newlib/libc/stdio/vsiscanf.c | 4 ----
newlib/libc/stdio/vsscanf.c | 4 ----
newlib/libc/stdio/vswscanf.c | 4 ----
newlib/libc/stdio/vwscanf.c | 4 ----
newlib/libc/stdlib/std.h | 6 ------
newlib/libc/syscalls/sysopen.c | 13 -------------
newlib/libm/math/wf_acos.c | 5 -----
37 files changed, 1 insertion(+), 444 deletions(-)
diff --git a/libgloss/sparc_leon/console_dbg.c b/libgloss/sparc_leon/console_dbg.c
index 57c258fb4..f4bfc5c27 100644
--- a/libgloss/sparc_leon/console_dbg.c
+++ b/libgloss/sparc_leon/console_dbg.c
@@ -25,11 +25,7 @@
#include <stdlib.h>
#include <ctype.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include <asm-leon/leoncompat.h>
#include <asm-leon/leon.h>
diff --git a/newlib/doc/ansidecl.h b/newlib/doc/ansidecl.h
index 1c7708fd5..f67f93bea 100644
--- a/newlib/doc/ansidecl.h
+++ b/newlib/doc/ansidecl.h
@@ -74,7 +74,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
/* LINTLIBRARY */
-#ifdef _HAVE_STDC
#define PTR void *
#define PTRCONST void *CONST
@@ -91,26 +90,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#define DEFUN(name, arglist, args) name(args)
#define DEFUN_VOID(name) name(NOARGS)
-#else /* Not ANSI C. */
-
-#define PTR char *
-#define PTRCONST PTR
-#define LONG_DOUBLE double
-
-#define AND ;
-#define NOARGS
-#define CONST
-#define VOLATILE
-#define SIGNED
-#define DOTS
-
-#define const
-
-#define EXFUN(name, proto) name()
-#define DEFUN(name, arglist, args) name arglist args;
-#define DEFUN_VOID(name) name()
-
-#endif /* ANSI C. */
#endif /* ansidecl.h */
diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
index e2737ed48..6c7497efd 100644
--- a/newlib/libc/include/_ansi.h
+++ b/newlib/libc/include/_ansi.h
@@ -1,11 +1,6 @@
/* Provide support for both ANSI and non-ANSI environments. */
-/* Some ANSI environments are "broken" in the sense that __STDC__ cannot be
- relied upon to have it's intended meaning. Therefore we must use our own
- concoction: _HAVE_STDC. Always use _HAVE_STDC instead of __STDC__ in newlib
- sources!
-
- To get a strict ANSI C environment, define macro __STRICT_ANSI__. This will
+/* To get a strict ANSI C environment, define macro __STRICT_ANSI__. This will
"comment out" the non-ANSI parts of the ANSI header files (non-ANSI header
files aren't affected). */
@@ -15,14 +10,6 @@
#include <newlib.h>
#include <sys/config.h>
-/* First try to figure out whether we really are in an ANSI C environment. */
-/* FIXME: This probably needs some work. Perhaps sys/config.h can be
- prevailed upon to give us a clue. */
-
-#ifdef __STDC__
-#define _HAVE_STDC
-#endif
-
/* ISO C++. */
#ifdef __cplusplus
@@ -46,13 +33,9 @@
#define _NOTHROW
#endif
-#ifdef _HAVE_STDC
#ifndef _LONG_DOUBLE
#define _LONG_DOUBLE long double
#endif
-#else
-#define _LONG_DOUBLE double
-#endif
/* Support gcc's __attribute__ facility. */
diff --git a/newlib/libc/include/machine/fastmath.h b/newlib/libc/include/machine/fastmath.h
index b13befa22..d13ab3b73 100644
--- a/newlib/libc/include/machine/fastmath.h
+++ b/newlib/libc/include/machine/fastmath.h
@@ -46,7 +46,6 @@ double EXFUN(fast_loge,(double));
#define log2(x) fast_log2(x)
#define loge(x) fast_loge(x)
-#ifdef _HAVE_STDC
/* These functions are in assembler, they really do take floats. This
can only be used with a real ANSI compiler */
@@ -94,7 +93,6 @@ float EXFUN(fast_logef,(float));
#define log10f(x) fast_log10f(x)
#define log2f(x) fast_log2f(x)
#define logef(x) fast_logef(x)
-#endif
/* Override the functions defined in math.h */
#endif /* __sysvnecv70_target */
diff --git a/newlib/libc/machine/powerpc/vfprintf.c b/newlib/libc/machine/powerpc/vfprintf.c
index 2cae2aaa1..1244f39f1 100644
--- a/newlib/libc/machine/powerpc/vfprintf.c
+++ b/newlib/libc/machine/powerpc/vfprintf.c
@@ -120,11 +120,7 @@ static char *rcsid = "$Id$";
#include <altivec.h>
#endif
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
#include "fvwrite.h"
diff --git a/newlib/libc/machine/powerpc/vfscanf.c b/newlib/libc/machine/powerpc/vfscanf.c
index f0443bf4a..111fe5f9e 100644
--- a/newlib/libc/machine/powerpc/vfscanf.c
+++ b/newlib/libc/machine/powerpc/vfscanf.c
@@ -77,11 +77,7 @@ Supporting OS subroutines required:
#include <limits.h>
#include <wchar.h>
#include <string.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
#ifndef NO_FLOATING_POINT
diff --git a/newlib/libc/machine/spu/vfprintf.c b/newlib/libc/machine/spu/vfprintf.c
index 6e436421b..deda41571 100644
--- a/newlib/libc/machine/spu/vfprintf.c
+++ b/newlib/libc/machine/spu/vfprintf.c
@@ -35,11 +35,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#include "c99ppe.h"
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#ifdef INTEGER_ONLY
# define vfprintf vfiprintf
diff --git a/newlib/libc/machine/spu/vfscanf.c b/newlib/libc/machine/spu/vfscanf.c
index 9af12e91a..9e093ba28 100644
--- a/newlib/libc/machine/spu/vfscanf.c
+++ b/newlib/libc/machine/spu/vfscanf.c
@@ -35,11 +35,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#include "c99ppe.h"
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#ifdef INTEGER_ONLY
# define vfscanf vfiscanf
diff --git a/newlib/libc/machine/spu/vprintf.c b/newlib/libc/machine/spu/vprintf.c
index 29cac0c8d..de98c0a33 100644
--- a/newlib/libc/machine/spu/vprintf.c
+++ b/newlib/libc/machine/spu/vprintf.c
@@ -3,11 +3,7 @@
#include "c99ppe.h"
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#ifdef INTEGER_ONLY
# define vprintf viprintf
diff --git a/newlib/libc/machine/spu/vscanf.c b/newlib/libc/machine/spu/vscanf.c
index 39348905d..e2d324ed7 100644
--- a/newlib/libc/machine/spu/vscanf.c
+++ b/newlib/libc/machine/spu/vscanf.c
@@ -35,11 +35,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#include "c99ppe.h"
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#ifdef INTEGER_ONLY
# define vscanf viscanf
diff --git a/newlib/libc/machine/spu/vsnprintf.c b/newlib/libc/machine/spu/vsnprintf.c
index 81ba7bef2..298165f5a 100644
--- a/newlib/libc/machine/spu/vsnprintf.c
+++ b/newlib/libc/machine/spu/vsnprintf.c
@@ -3,11 +3,7 @@
#include "c99ppe.h"
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#ifdef INTEGER_ONLY
# define vsnprintf vsniprintf
diff --git a/newlib/libc/machine/spu/vsprintf.c b/newlib/libc/machine/spu/vsprintf.c
index 8b0e414de..8317a6636 100644
--- a/newlib/libc/machine/spu/vsprintf.c
+++ b/newlib/libc/machine/spu/vsprintf.c
@@ -4,11 +4,7 @@
#include "c99ppe.h"
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#ifdef INTEGER_ONLY
# define vsprintf vsiprintf
diff --git a/newlib/libc/machine/spu/vsscanf.c b/newlib/libc/machine/spu/vsscanf.c
index a94b152d2..ed6421422 100644
--- a/newlib/libc/machine/spu/vsscanf.c
+++ b/newlib/libc/machine/spu/vsscanf.c
@@ -35,11 +35,7 @@ Author: Joel Schopp <jschopp@austin.ibm.com>
#include "c99ppe.h"
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#ifdef INTEGER_ONLY
# define vsscanf vsiscanf
diff --git a/newlib/libc/posix/execl.c b/newlib/libc/posix/execl.c
index 6ba95e2dc..c3b4e55bd 100644
--- a/newlib/libc/posix/execl.c
+++ b/newlib/libc/posix/execl.c
@@ -13,7 +13,6 @@
'environ'. */
static char ***p_environ = &environ;
-#ifdef _HAVE_STDC
#include <stdarg.h>
@@ -21,16 +20,6 @@ int
execl (const char *path,
const char *arg0, ...)
-#else
-
-#include <varargs.h>
-
-int
-execl (const char *path,
- const char *arg0,
- va_dcl)
-
-#endif
{
int i;
diff --git a/newlib/libc/posix/execle.c b/newlib/libc/posix/execle.c
index 641bdac72..34f0ea373 100644
--- a/newlib/libc/posix/execle.c
+++ b/newlib/libc/posix/execle.c
@@ -8,7 +8,6 @@
#include <_ansi.h>
#include <unistd.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
@@ -16,16 +15,6 @@ int
execle (const char *path,
const char *arg0, ...)
-#else
-
-#include <varargs.h>
-
-int
-execle (const char *path,
- const char *arg0,
- va_dcl)
-
-#endif
{
int i;
diff --git a/newlib/libc/posix/execlp.c b/newlib/libc/posix/execlp.c
index 41b300d8f..b845c88c5 100644
--- a/newlib/libc/posix/execlp.c
+++ b/newlib/libc/posix/execlp.c
@@ -8,7 +8,6 @@
#include <_ansi.h>
#include <unistd.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
@@ -16,16 +15,6 @@ int
execlp (const char *path,
const char *arg0, ...)
-#else
-
-#include <varargs.h>
-
-int
-execlp (const char *path,
- const char *arg0,
- va_dcl)
-
-#endif
{
int i;
diff --git a/newlib/libc/stdio/fiscanf.c b/newlib/libc/stdio/fiscanf.c
index 7b497bddb..ea93f7542 100644
--- a/newlib/libc/stdio/fiscanf.c
+++ b/newlib/libc/stdio/fiscanf.c
@@ -18,33 +18,18 @@
#include <_ansi.h>
#include <reent.h>
#include <stdio.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
#ifndef _REENT_ONLY
int
-#ifdef _HAVE_STDC
fiscanf(FILE *fp, const char *fmt, ...)
-#else
-fiscanf(FILE *fp, fmt, va_alist)
- FILE *fp;
- char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = __svfiscanf_r (_REENT, fp, fmt, ap);
va_end (ap);
return ret;
@@ -53,24 +38,12 @@ fiscanf(FILE *fp, fmt, va_alist)
#endif /* !_REENT_ONLY */
int
-#ifdef _HAVE_STDC
_fiscanf_r(struct _reent *ptr, FILE *fp, const char *fmt, ...)
-#else
-_fiscanf_r(ptr, FILE *fp, fmt, va_alist)
- struct _reent *ptr;
- FILE *fp;
- char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = __svfiscanf_r (ptr, fp, fmt, ap);
va_end (ap);
return (ret);
diff --git a/newlib/libc/stdio/fscanf.c b/newlib/libc/stdio/fscanf.c
index 94096a22b..af01eedbe 100644
--- a/newlib/libc/stdio/fscanf.c
+++ b/newlib/libc/stdio/fscanf.c
@@ -18,33 +18,18 @@
#include <_ansi.h>
#include <reent.h>
#include <stdio.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
#ifndef _REENT_ONLY
int
-#ifdef _HAVE_STDC
fscanf(FILE *__restrict fp, const char *__restrict fmt, ...)
-#else
-fscanf(FILE *fp, fmt, va_alist)
- FILE *fp;
- char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = _vfscanf_r (_REENT, fp, fmt, ap);
va_end (ap);
return ret;
@@ -59,24 +44,12 @@ fiscanf (FILE *, const char *, ...)
#endif /* !_REENT_ONLY */
int
-#ifdef _HAVE_STDC
_fscanf_r(struct _reent *ptr, FILE *__restrict fp, const char *__restrict fmt, ...)
-#else
-_fscanf_r(ptr, FILE *fp, fmt, va_alist)
- struct _reent *ptr;
- FILE *fp;
- char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = _vfscanf_r (ptr, fp, fmt, ap);
va_end (ap);
return (ret);
diff --git a/newlib/libc/stdio/iscanf.c b/newlib/libc/stdio/iscanf.c
index aefd1a4ac..980dabd29 100644
--- a/newlib/libc/stdio/iscanf.c
+++ b/newlib/libc/stdio/iscanf.c
@@ -18,33 +18,19 @@
#include <_ansi.h>
#include <reent.h>
#include <stdio.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
#ifndef _REENT_ONLY
int
-#ifdef _HAVE_STDC
iscanf(const char *fmt, ...)
-#else
-iscanf(fmt, va_alist)
- char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
_REENT_SMALL_CHECK_INIT (_REENT);
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = __svfiscanf_r (_REENT, _stdin_r (_REENT), fmt, ap);
va_end (ap);
return ret;
@@ -53,24 +39,13 @@ iscanf(fmt, va_alist)
#endif /* !_REENT_ONLY */
int
-#ifdef _HAVE_STDC
_iscanf_r(struct _reent *ptr, const char *fmt, ...)
-#else
-_iscanf_r(ptr, fmt, va_alist)
- struct _reent *ptr;
- char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
_REENT_SMALL_CHECK_INIT (ptr);
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = __svfiscanf_r (ptr, _stdin_r (ptr), fmt, ap);
va_end (ap);
return (ret);
diff --git a/newlib/libc/stdio/scanf.c b/newlib/libc/stdio/scanf.c
index a5a9391c0..898c6e7af 100644
--- a/newlib/libc/stdio/scanf.c
+++ b/newlib/libc/stdio/scanf.c
@@ -18,34 +18,20 @@
#include <_ansi.h>
#include <reent.h>
#include <stdio.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
#ifndef _REENT_ONLY
int
-#ifdef _HAVE_STDC
scanf(const char *__restrict fmt, ...)
-#else
-scanf(fmt, va_alist)
- char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
struct _reent *reent = _REENT;
_REENT_SMALL_CHECK_INIT (reent);
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = _vfscanf_r (reent, _stdin_r (reent), fmt, ap);
va_end (ap);
return ret;
@@ -60,24 +46,13 @@ iscanf (const char *, ...)
#endif /* !_REENT_ONLY */
int
-#ifdef _HAVE_STDC
_scanf_r(struct _reent *ptr, const char *__restrict fmt, ...)
-#else
-_scanf_r(ptr, fmt, va_alist)
- struct _reent *ptr;
- char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
_REENT_SMALL_CHECK_INIT (ptr);
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = _vfscanf_r (ptr, _stdin_r (ptr), fmt, ap);
va_end (ap);
return (ret);
diff --git a/newlib/libc/stdio/siprintf.c b/newlib/libc/stdio/siprintf.c
index 6ec24777e..be000f629 100644
--- a/newlib/libc/stdio/siprintf.c
+++ b/newlib/libc/stdio/siprintf.c
@@ -94,26 +94,14 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include <_ansi.h>
#include <reent.h>
#include <stdio.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include <limits.h>
#include "local.h"
int
-#ifdef _HAVE_STDC
_siprintf_r (struct _reent *ptr,
char *str,
const char *fmt, ...)
-#else
-_siprintf_r(ptr, str, fmt, va_alist)
- struct _reent *ptr;
- char *str;
- const char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
@@ -123,11 +111,7 @@ _siprintf_r(ptr, str, fmt, va_alist)
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = INT_MAX;
f._file = -1; /* No file. */
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = _svfiprintf_r (ptr, &f, fmt, ap);
va_end (ap);
*f._p = 0;
@@ -137,15 +121,8 @@ _siprintf_r(ptr, str, fmt, va_alist)
#ifndef _REENT_ONLY
int
-#ifdef _HAVE_STDC
siprintf (char *str,
const char *fmt, ...)
-#else
-siprintf(str, fmt, va_alist)
- char *str;
- const char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
@@ -155,11 +132,7 @@ siprintf(str, fmt, va_alist)
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = INT_MAX;
f._file = -1; /* No file. */
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = _svfiprintf_r (_REENT, &f, fmt, ap);
va_end (ap);
*f._p = 0;
diff --git a/newlib/libc/stdio/siscanf.c b/newlib/libc/stdio/siscanf.c
index 9b45ecdbb..355d2662a 100644
--- a/newlib/libc/stdio/siscanf.c
+++ b/newlib/libc/stdio/siscanf.c
@@ -76,26 +76,14 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include <reent.h>
#include <stdio.h>
#include <string.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
#ifndef _REENT_ONLY
-#ifdef _HAVE_STDC
int
siscanf (const char *str,
const char *fmt, ...)
-#else
-int
-siscanf(str, fmt, va_alist)
- const char *str;
- const char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
@@ -108,11 +96,7 @@ siscanf(str, fmt, va_alist)
f._ub._base = NULL;
f._lb._base = NULL;
f._file = -1; /* No file. */
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = __ssvfiscanf_r (_REENT, &f, fmt, ap);
va_end (ap);
return ret;
@@ -120,19 +104,10 @@ siscanf(str, fmt, va_alist)
#endif /* !_REENT_ONLY */
-#ifdef _HAVE_STDC
int
_siscanf_r (struct _reent *ptr,
const char *str,
const char *fmt, ...)
-#else
-int
-_siscanf_r(ptr, str, fmt, va_alist)
- struct _reent *ptr;
- const char *str;
- const char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
@@ -145,11 +120,7 @@ _siscanf_r(ptr, str, fmt, va_alist)
f._ub._base = NULL;
f._lb._base = NULL;
f._file = -1; /* No file. */
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = __ssvfiscanf_r (ptr, &f, fmt, ap);
va_end (ap);
return ret;
diff --git a/newlib/libc/stdio/sniprintf.c b/newlib/libc/stdio/sniprintf.c
index d13278437..840c564dc 100644
--- a/newlib/libc/stdio/sniprintf.c
+++ b/newlib/libc/stdio/sniprintf.c
@@ -21,29 +21,16 @@
#include <_ansi.h>
#include <reent.h>
#include <stdio.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include <limits.h>
#include <errno.h>
#include "local.h"
int
-#ifdef _HAVE_STDC
_sniprintf_r (struct _reent *ptr,
char *str,
size_t size,
const char *fmt, ...)
-#else
-_sniprintf_r (ptr, str, size, fmt, va_alist)
- struct _reent *ptr;
- char *str;
- size_t size;
- const char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
@@ -58,11 +45,7 @@ _sniprintf_r (ptr, str, size, fmt, va_alist)
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = (size > 0 ? size - 1 : 0);
f._file = -1; /* No file. */
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = _svfiprintf_r (ptr, &f, fmt, ap);
va_end (ap);
if (ret < EOF)
@@ -75,17 +58,9 @@ _sniprintf_r (ptr, str, size, fmt, va_alist)
#ifndef _REENT_ONLY
int
-#ifdef _HAVE_STDC
sniprintf (char *str,
size_t size,
const char *fmt, ...)
-#else
-sniprintf (str, size, fmt, va_alist)
- char *str;
- size_t size;
- const char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
@@ -101,11 +76,7 @@ sniprintf (str, size, fmt, va_alist)
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = (size > 0 ? size - 1 : 0);
f._file = -1; /* No file. */
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = _svfiprintf_r (ptr, &f, fmt, ap);
va_end (ap);
if (ret < EOF)
diff --git a/newlib/libc/stdio/snprintf.c b/newlib/libc/stdio/snprintf.c
index d73cdbf3a..809b52b51 100644
--- a/newlib/libc/stdio/snprintf.c
+++ b/newlib/libc/stdio/snprintf.c
@@ -20,29 +20,16 @@
#include <_ansi.h>
#include <reent.h>
#include <stdio.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include <limits.h>
#include <errno.h>
#include "local.h"
int
-#ifdef _HAVE_STDC
_snprintf_r (struct _reent *ptr,
char *__restrict str,
size_t size,
const char *__restrict fmt, ...)
-#else
-_snprintf_r(ptr, str, size, fmt, va_alist)
- struct _reent *ptr;
- char *str;
- size_t size;
- const char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
@@ -57,11 +44,7 @@ _snprintf_r(ptr, str, size, fmt, va_alist)
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = (size > 0 ? size - 1 : 0);
f._file = -1; /* No file. */
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = _svfprintf_r (ptr, &f, fmt, ap);
va_end (ap);
if (ret < EOF)
@@ -80,17 +63,9 @@ _sniprintf_r (struct _reent *, char *, size_t, const char *, ...)
#ifndef _REENT_ONLY
int
-#ifdef _HAVE_STDC
snprintf (char *__restrict str,
size_t size,
const char *__restrict fmt, ...)
-#else
-snprintf(str, size, fmt, va_alist)
- char *str;
- size_t size;
- const char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
@@ -106,11 +81,7 @@ snprintf(str, size, fmt, va_alist)
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = (size > 0 ? size - 1 : 0);
f._file = -1; /* No file. */
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = _svfprintf_r (ptr, &f, fmt, ap);
va_end (ap);
if (ret < EOF)
diff --git a/newlib/libc/stdio/sprintf.c b/newlib/libc/stdio/sprintf.c
index 37d92f93e..096ca216a 100644
--- a/newlib/libc/stdio/sprintf.c
+++ b/newlib/libc/stdio/sprintf.c
@@ -570,26 +570,14 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include <_ansi.h>
#include <reent.h>
#include <stdio.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include <limits.h>
#include "local.h"
int
-#ifdef _HAVE_STDC
_sprintf_r (struct _reent *ptr,
char *__restrict str,
const char *__restrict fmt, ...)
-#else
-_sprintf_r(ptr, str, fmt, va_alist)
- struct _reent *ptr;
- char *__restrict str;
- const char *__restrict fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
@@ -599,11 +587,7 @@ _sprintf_r(ptr, str, fmt, va_alist)
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = INT_MAX;
f._file = -1; /* No file. */
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = _svfprintf_r (ptr, &f, fmt, ap);
va_end (ap);
*f._p = '\0'; /* terminate the string */
@@ -619,15 +603,8 @@ _siprintf_r (struct _reent *, char *, const char *, ...)
#ifndef _REENT_ONLY
int
-#ifdef _HAVE_STDC
sprintf (char *__restrict str,
const char *__restrict fmt, ...)
-#else
-sprintf(str, fmt, va_alist)
- char *str;
- const char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
@@ -637,11 +614,7 @@ sprintf(str, fmt, va_alist)
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = INT_MAX;
f._file = -1; /* No file. */
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = _svfprintf_r (_REENT, &f, fmt, ap);
va_end (ap);
*f._p = '\0'; /* terminate the string */
diff --git a/newlib/libc/stdio/sscanf.c b/newlib/libc/stdio/sscanf.c
index 971db439d..99054e245 100644
--- a/newlib/libc/stdio/sscanf.c
+++ b/newlib/libc/stdio/sscanf.c
@@ -415,26 +415,14 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include <reent.h>
#include <stdio.h>
#include <string.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
#ifndef _REENT_ONLY
-#ifdef _HAVE_STDC
int
sscanf (const char *__restrict str,
const char * fmt, ...)
-#else
-int
-sscanf(str, fmt, va_alist)
- const char *str;
- const char *fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
@@ -447,11 +435,7 @@ sscanf(str, fmt, va_alist)
f._ub._base = NULL;
f._lb._base = NULL;
f._file = -1; /* No file. */
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = __ssvfscanf_r (_REENT, &f, fmt, ap);
va_end (ap);
return ret;
@@ -465,19 +449,10 @@ siscanf (const char *, const char *, ...)
#endif /* !_REENT_ONLY */
-#ifdef _HAVE_STDC
int
_sscanf_r (struct _reent *ptr,
const char *__restrict str,
const char *__restrict fmt, ...)
-#else
-int
-_sscanf_r(ptr, str, fmt, va_alist)
- struct _reent *ptr;
- const char *__restrict str;
- const char *__restrict fmt;
- va_dcl
-#endif
{
int ret;
va_list ap;
@@ -490,11 +465,7 @@ _sscanf_r(ptr, str, fmt, va_alist)
f._ub._base = NULL;
f._lb._base = NULL;
f._file = -1; /* No file. */
-#ifdef _HAVE_STDC
va_start (ap, fmt);
-#else
- va_start (ap);
-#endif
ret = __ssvfscanf_r (ptr, &f, fmt, ap);
va_end (ap);
return ret;
diff --git a/newlib/libc/stdio/viprintf.c b/newlib/libc/stdio/viprintf.c
index 9678815f1..a59bc9c19 100644
--- a/newlib/libc/stdio/viprintf.c
+++ b/newlib/libc/stdio/viprintf.c
@@ -95,11 +95,7 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>,
#include <_ansi.h>
#include <reent.h>
#include <stdio.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
#ifndef _REENT_ONLY
diff --git a/newlib/libc/stdio/viscanf.c b/newlib/libc/stdio/viscanf.c
index e5ad1dbbd..c19d1b16a 100644
--- a/newlib/libc/stdio/viscanf.c
+++ b/newlib/libc/stdio/viscanf.c
@@ -79,11 +79,7 @@ Supporting OS subroutines required:
#include <_ansi.h>
#include <reent.h>
#include <stdio.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
#ifndef _REENT_ONLY
diff --git a/newlib/libc/stdio/vprintf.c b/newlib/libc/stdio/vprintf.c
index fb46c1c1a..b195a1ecf 100644
--- a/newlib/libc/stdio/vprintf.c
+++ b/newlib/libc/stdio/vprintf.c
@@ -19,11 +19,7 @@
#include <_ansi.h>
#include <reent.h>
#include <stdio.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
#ifndef _REENT_ONLY
diff --git a/newlib/libc/stdio/vscanf.c b/newlib/libc/stdio/vscanf.c
index bbbbd0a83..567f5cb3e 100644
--- a/newlib/libc/stdio/vscanf.c
+++ b/newlib/libc/stdio/vscanf.c
@@ -20,11 +20,7 @@
#include <_ansi.h>
#include <reent.h>
#include <stdio.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
#ifndef _REENT_ONLY
diff --git a/newlib/libc/stdio/vsiscanf.c b/newlib/libc/stdio/vsiscanf.c
index 5679df056..b21dcb1a2 100644
--- a/newlib/libc/stdio/vsiscanf.c
+++ b/newlib/libc/stdio/vsiscanf.c
@@ -21,11 +21,7 @@
#include <reent.h>
#include <stdio.h>
#include <string.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
/*
diff --git a/newlib/libc/stdio/vsscanf.c b/newlib/libc/stdio/vsscanf.c
index 97c7bae80..f4e096b50 100644
--- a/newlib/libc/stdio/vsscanf.c
+++ b/newlib/libc/stdio/vsscanf.c
@@ -21,11 +21,7 @@
#include <reent.h>
#include <stdio.h>
#include <string.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
/*
diff --git a/newlib/libc/stdio/vswscanf.c b/newlib/libc/stdio/vswscanf.c
index 90393f528..7687001ab 100644
--- a/newlib/libc/stdio/vswscanf.c
+++ b/newlib/libc/stdio/vswscanf.c
@@ -23,11 +23,7 @@
#include <stdio.h>
#include <wchar.h>
#include <string.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
/*
diff --git a/newlib/libc/stdio/vwscanf.c b/newlib/libc/stdio/vwscanf.c
index 3945e79c8..1f33db6af 100644
--- a/newlib/libc/stdio/vwscanf.c
+++ b/newlib/libc/stdio/vwscanf.c
@@ -22,11 +22,7 @@
#include <reent.h>
#include <stdio.h>
#include <wchar.h>
-#ifdef _HAVE_STDC
#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
#include "local.h"
#ifndef _REENT_ONLY
diff --git a/newlib/libc/stdlib/std.h b/newlib/libc/stdlib/std.h
index b20820be4..c000a67c6 100644
--- a/newlib/libc/stdlib/std.h
+++ b/newlib/libc/stdlib/std.h
@@ -22,12 +22,6 @@
#define ESIGN 0x02
#define DECP 0x04
-#ifdef _HAVE_STDC
int __ten_mul(double *acc, int digit);
double __adjust(struct _reent *ptr, double *acc, int dexp, int sign);
double __exp10(unsigned x);
-#else
-int __ten_mul();
-double __adjust();
-double __exp10();
-#endif
diff --git a/newlib/libc/syscalls/sysopen.c b/newlib/libc/syscalls/sysopen.c
index 4d1a29953..bc8d9d59f 100644
--- a/newlib/libc/syscalls/sysopen.c
+++ b/newlib/libc/syscalls/sysopen.c
@@ -3,7 +3,6 @@
#include <reent.h>
#include <fcntl.h>
-#ifdef _HAVE_STDC
/* The prototype in <fcntl.h> uses ..., so we must correspond. */
@@ -22,15 +21,3 @@ open (const char *file,
return ret;
}
-#else /* ! _HAVE_STDC */
-
-int
-open (file, flags, mode)
- const char *file;
- int flags;
- int mode;
-{
- return _open_r (_REENT, file, flags, mode);
-}
-
-#endif /* ! _HAVE_STDC */
diff --git a/newlib/libm/math/wf_acos.c b/newlib/libm/math/wf_acos.c
index ff9f80b26..8154c795e 100644
--- a/newlib/libm/math/wf_acos.c
+++ b/newlib/libm/math/wf_acos.c
@@ -20,12 +20,7 @@
#include "fdlibm.h"
#include <errno.h>
-#ifdef _HAVE_STDC
float acosf(float x) /* wrapper acosf */
-#else
- float acosf(x) /* wrapper acosf */
- float x;
-#endif
{
#ifdef _IEEE_LIBM
return __ieee754_acosf(x);
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 16/17] ansification: fix makedoc for ANSI C
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
` (13 preceding siblings ...)
2017-12-07 18:29 ` [PATCH v2 15/17] ansification: remove _HAVE_STDC Yaakov Selkowitz
@ 2017-12-07 18:29 ` Yaakov Selkowitz
2017-12-07 18:29 ` [PATCH v2 08/17] ansification: remove _CAST_VOID Yaakov Selkowitz
` (2 subsequent siblings)
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:29 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
newlib/doc/makedoc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/newlib/doc/makedoc.c b/newlib/doc/makedoc.c
index 45ddfb81e..23d5e2a04 100644
--- a/newlib/doc/makedoc.c
+++ b/newlib/doc/makedoc.c
@@ -1276,13 +1276,13 @@ DEFUN(compile, (string),
/* Got a number, embedd the magic push number
function */
add_to_definition(ptr, push_number);
- add_to_definition(ptr, atol(word));
+ add_to_definition(ptr, (stinst_type)atol(word));
break;
default:
add_to_definition(ptr, call);
lookup = lookup_word(word);
if (!lookup) ret++;
- add_to_definition(ptr, lookup);
+ add_to_definition(ptr, (stinst_type)lookup);
}
string = nextword(string, &word);
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 17/17] ansification: remove ansidecl.h from makedoc
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
` (15 preceding siblings ...)
2017-12-07 18:29 ` [PATCH v2 08/17] ansification: remove _CAST_VOID Yaakov Selkowitz
@ 2017-12-07 18:55 ` Yaakov Selkowitz
2017-12-12 12:51 ` [PATCH v2 00/17] Newlib ANSI-fication Corinna Vinschen
17 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-07 18:55 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
newlib/doc/ansidecl.h | 95 ------------------------------------
newlib/doc/makedoc.c | 132 +++++++++++++++++++-------------------------------
2 files changed, 51 insertions(+), 176 deletions(-)
delete mode 100644 newlib/doc/ansidecl.h
diff --git a/newlib/doc/ansidecl.h b/newlib/doc/ansidecl.h
deleted file mode 100644
index f67f93bea..000000000
--- a/newlib/doc/ansidecl.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* ANSI and traditional C compatability macros
- Copyright 1991 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-/* ANSI and traditional C compatibility macros
-
- Some ANSI environments are "broken" in the sense that __STDC__ cannot be
- relied upon to have it's intended meaning. Therefore we must use our own
- concoction: _HAVE_STDC. Always use _HAVE_STDC instead of __STDC__ in newlib
- sources!
-
- ANSI C is assumed if _HAVE_STDC is #defined.
-
- Macro ANSI C definition Traditional C definition
- ----- ---- - ---------- ----------- - ----------
- PTR `void *' `char *'
- LONG_DOUBLE `long double' `double'
- CONST `const' `'
- VOLATILE `volatile' `'
- SIGNED `signed' `'
- PTRCONST `void *const' `char *'
-
- DEFUN(name, arglist, args)
-
- Defines function NAME.
-
- ARGLIST lists the arguments, separated by commas and enclosed in
- parentheses. ARGLIST becomes the argument list in traditional C.
-
- ARGS list the arguments with their types. It becomes a prototype in
- ANSI C, and the type declarations in traditional C. Arguments should
- be separated with `AND'. For functions with a variable number of
- arguments, the last thing listed should be `DOTS'.
-
- DEFUN_VOID(name)
-
- Defines a function NAME, which takes no arguments.
-
- EXFUN(name, prototype)
-
- Is used in an external function declaration.
- In ANSI C it is `NAMEPROTOTYPE' (so PROTOTYPE should be enclosed in
- parentheses). In traditional C it is `NAME()'.
- For a function that takes no arguments, PROTOTYPE should be `(NOARGS)'.
-
- For example:
- extern int EXFUN(printf, (CONST char *format DOTS));
- int DEFUN(fprintf, (stream, format),
- FILE *stream AND CONST char *format DOTS) { ... }
- void DEFUN_VOID(abort) { ... }
-*/
-
-#ifndef _ANSIDECL_H
-
-#define _ANSIDECL_H 1
-
-
-/* Every source file includes this file,
- so they will all get the switch for lint. */
-/* LINTLIBRARY */
-
-
-
-#define PTR void *
-#define PTRCONST void *CONST
-#define LONG_DOUBLE long double
-
-#define AND ,
-#define NOARGS void
-#define CONST const
-#define VOLATILE volatile
-#define SIGNED signed
-#define DOTS , ...
-
-#define EXFUN(name, proto) name proto
-#define DEFUN(name, arglist, args) name(args)
-#define DEFUN_VOID(name) name(NOARGS)
-
-
-
-#endif /* ansidecl.h */
diff --git a/newlib/doc/makedoc.c b/newlib/doc/makedoc.c
index 23d5e2a04..1df08a13d 100644
--- a/newlib/doc/makedoc.c
+++ b/newlib/doc/makedoc.c
@@ -35,7 +35,6 @@ There is no
-#include "ansidecl.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -67,25 +66,23 @@ typedef struct buffer
-static void DEFUN(init_string_with_size,(buffer, size),
- string_type *buffer AND
- unsigned int size )
+static void
+init_string_with_size (string_type *buffer, unsigned int size)
{
buffer->write_idx = 0;
buffer->size = size;
buffer->ptr = malloc(size);
}
-static void DEFUN(init_string,(buffer),
- string_type *buffer)
+static void
+init_string (string_type *buffer)
{
init_string_with_size(buffer, DEF_SIZE);
}
-static int DEFUN(find, (str, what),
- string_type *str AND
- char *what)
+static int
+find (string_type *str, char *what)
{
unsigned int i;
char *p;
@@ -101,30 +98,28 @@ static int DEFUN(find, (str, what),
}
-static void DEFUN(write_buffer,(buffer),
- string_type *buffer)
+static void
+write_buffer (string_type *buffer)
{
fwrite(buffer->ptr, buffer->write_idx, 1, stdout);
}
-static void DEFUN(delete_string,(buffer),
- string_type *buffer)
+static void
+delete_string (string_type *buffer)
{
free(buffer->ptr);
}
-static char *DEFUN(addr, (buffer, idx),
- string_type *buffer AND
- unsigned int idx)
+static char *
+addr (string_type *buffer, unsigned int idx)
{
return buffer->ptr + idx;
}
-static char DEFUN(at,(buffer, pos),
- string_type *buffer AND
- unsigned int pos)
+static char
+at (string_type *buffer, unsigned int pos)
{
if ( pos >= buffer->write_idx)
{
@@ -133,9 +128,8 @@ static char DEFUN(at,(buffer, pos),
return buffer->ptr[pos];
}
-static void DEFUN(catchar,(buffer, ch),
- string_type *buffer AND
- char ch)
+static void
+catchar (string_type *buffer, char ch)
{
if (buffer->write_idx == buffer->size)
{
@@ -147,9 +141,8 @@ static void DEFUN(catchar,(buffer, ch),
}
-static void DEFUN(overwrite_string,(dst, src),
- string_type *dst AND
- string_type *src)
+static void
+overwrite_string (string_type *dst, string_type *src)
{
free(dst->ptr);
dst->size = src->size;
@@ -157,9 +150,8 @@ static void DEFUN(overwrite_string,(dst, src),
dst->ptr = src->ptr;
}
-static void DEFUN(catstr,(dst, src),
- string_type *dst AND
- string_type *src)
+static void
+catstr (string_type *dst, string_type *src)
{
unsigned int i;
for (i = 0; i < src->write_idx; i++)
@@ -169,9 +161,8 @@ static void DEFUN(catstr,(dst, src),
}
-static void DEFUN(cattext,(buffer, string),
- string_type *buffer AND
- char *string)
+static void
+cattext (string_type *buffer, char *string)
{
while (*string)
@@ -181,10 +172,8 @@ static void DEFUN(cattext,(buffer, string),
}
}
-static void DEFUN(catbuf,(buffer, buf, len),
- string_type *buffer AND
- char *buf AND
- unsigned int len)
+static void
+catbuf (string_type *buffer, char *buf, unsigned int len)
{
while (len--)
@@ -197,9 +186,7 @@ static void DEFUN(catbuf,(buffer, buf, len),
static unsigned int
-DEFUN(skip_white_and_stars,(src, idx),
- string_type *src AND
- unsigned int idx)
+skip_white_and_stars (string_type *src, unsigned int idx)
{
while (isspace(at(src,idx))
|| (at(src,idx) == '*' && at(src,idx +1) !='/'))
@@ -216,7 +203,7 @@ string_type *tos;
unsigned int idx = 0; /* Pos in input buffer */
string_type *ptr; /* and the buffer */
-typedef void (*stinst_type)(NOARGS);
+typedef void (*stinst_type)(void);
stinst_type *pc;
stinst_type sstack[STACK];
stinst_type *ssp = &sstack[0];
@@ -238,10 +225,10 @@ struct dict_struct
};
typedef struct dict_struct dict_type;
-#define WORD(x) static void x(NOARGS)
+#define WORD(x) static void x(void)
-static void DEFUN(exec,(word),
- dict_type *word)
+static void
+exec (dict_type *word)
{
pc = word->code;
while (*pc)
@@ -299,9 +286,7 @@ WORD(push_text)
*/
static void
-DEFUN(remove_noncomments,(src,dst),
- string_type *src AND
- string_type *dst)
+remove_noncomments (string_type *src, string_type *dst)
{
unsigned int idx = 0;
@@ -354,7 +339,7 @@ DEFUN(remove_noncomments,(src,dst),
*/
static void
-DEFUN_VOID(exfunstuff)
+exfunstuff (void)
{
unsigned int openp;
unsigned int fname;
@@ -482,7 +467,7 @@ WORD(manglecomments)
/* Mod tos so that only lines with leading dots remain */
static void
-DEFUN_VOID(outputdots)
+outputdots (void)
{
unsigned int idx = 0;
string_type out;
@@ -726,9 +711,7 @@ WORD(do_fancy_stuff)
}
/* A command is all upper case,and alone on a line */
static int
-DEFUN( iscommand,(ptr, idx),
- string_type *ptr AND
- unsigned int idx)
+iscommand (string_type *ptr, unsigned int idx)
{
unsigned int len = 0;
@@ -757,10 +740,7 @@ DEFUN( iscommand,(ptr, idx),
unsigned int
-DEFUN(copy_past_newline,(ptr, idx, dst),
- string_type *ptr AND
- unsigned int idx AND
- string_type *dst)
+copy_past_newline (string_type *ptr, unsigned int idx, string_type *dst)
{
while (at(ptr, idx) && at(ptr, idx) != '\n')
{
@@ -1020,9 +1000,7 @@ WORD(maybecatstr)
}
char *
-DEFUN(nextword,(string, word),
- char *string AND
- char **word)
+nextword (char *string, char **word)
{
char *word_start;
int idx;
@@ -1098,8 +1076,7 @@ DEFUN(nextword,(string, word),
}
dict_type *root;
dict_type *
-DEFUN(lookup_word,(word),
- char *word)
+lookup_word (char *word)
{
dict_type *ptr = root;
while (ptr) {
@@ -1113,7 +1090,8 @@ DEFUN(lookup_word,(word),
}
-static int DEFUN_VOID(perform)
+static int
+perform (void)
{
tos = stack;
int errors = 0;
@@ -1153,8 +1131,7 @@ static int DEFUN_VOID(perform)
}
dict_type *
-DEFUN(newentry,(word),
- char *word)
+newentry (char *word)
{
dict_type *new = (dict_type *)malloc(sizeof(dict_type));
new->word = word;
@@ -1169,9 +1146,7 @@ DEFUN(newentry,(word),
unsigned int
-DEFUN(add_to_definition,(entry, word),
- dict_type *entry AND
- stinst_type word)
+add_to_definition (dict_type *entry, stinst_type word)
{
if (entry->code_end == entry->code_length)
{
@@ -1192,9 +1167,7 @@ return entry->code_end++;
void
-DEFUN(add_intrinsic,(name, func),
- char *name AND
- void (*func)(NOARGS))
+add_intrinsic (char *name, void (*func)(void))
{
dict_type *new = newentry(name);
add_to_definition(new, func);
@@ -1202,8 +1175,7 @@ DEFUN(add_intrinsic,(name, func),
}
void
-DEFUN(add_var,(name),
- char *name)
+add_var (char *name)
{
dict_type *new = newentry(name);
add_to_definition(new, push_number);
@@ -1216,9 +1188,7 @@ DEFUN(add_var,(name),
int
-DEFUN(compile, (string),
- char *string)
-
+compile (char *string)
{
int ret=0;
/* add words to the dictionary */
@@ -1301,7 +1271,8 @@ return(ret);
}
-static void DEFUN_VOID(bang)
+static void
+bang (void)
{
*(uintptr_t *)((isp[0])) = isp[-1];
isp-=2;
@@ -1324,9 +1295,8 @@ WORD(hello)
-static void DEFUN(read_in, (str, file),
- string_type *str AND
- FILE *file)
+static void
+read_in (string_type *str, FILE *file)
{
char buff[10000];
unsigned int r;
@@ -1344,16 +1314,16 @@ static void DEFUN(read_in, (str, file),
#if 0
-static void DEFUN_VOID(usage)
+static void
+usage (void)
{
fprintf(stderr,"usage: -[i|v] -f macrofile <file >file\n");
exit(33);
}
#endif
-int DEFUN(main,(ac,av),
-int ac AND
-char *av[])
+int
+main (int ac, char *av[])
{
unsigned int i;
int status = 0;
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 14/17] ansification: remove _EXFUN, _EXFUN_NOTHROW
2017-12-07 18:20 ` [PATCH v2 14/17] ansification: remove _EXFUN, _EXFUN_NOTHROW Yaakov Selkowitz
@ 2017-12-07 19:08 ` Craig Howland
2017-12-12 0:08 ` Yaakov Selkowitz
0 siblings, 1 reply; 28+ messages in thread
From: Craig Howland @ 2017-12-07 19:08 UTC (permalink / raw)
To: newlib
On 12/07/2017 01:19 PM, Yaakov Selkowitz wrote:
> diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
> index 3e2490088..e2737ed48 100644
> --- a/newlib/libc/include/_ansi.h
> +++ b/newlib/libc/include/_ansi.h
> @@ -47,19 +47,10 @@
> #endif
>
> #ifdef _HAVE_STDC
> -#ifdef __CYGWIN__
> -#define _EXFUN_NOTHROW(name, proto) __cdecl name proto _NOTHROW
> -#define _EXFUN(name, proto) __cdecl name proto
> -#else
> -#define _EXFUN_NOTHROW(name, proto) name proto _NOTHROW
> -#define _EXFUN(name, proto) name proto
> -#endif
For patches 13 and 14, the replacements for _EXFUN_NOTHROW(), _EXFUN(),
_EXPARM(), and _EXFNPTR() are all dropping the __cdecl which is applied when
__CYGWIN__ is defined. I would expect this would wreak havoc for Cygwin, and
will need to be addressed, somehow.
Craig
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 14/17] ansification: remove _EXFUN, _EXFUN_NOTHROW
2017-12-07 19:08 ` Craig Howland
@ 2017-12-12 0:08 ` Yaakov Selkowitz
0 siblings, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2017-12-12 0:08 UTC (permalink / raw)
To: newlib
[-- Attachment #1.1: Type: text/plain, Size: 1116 bytes --]
On 2017-12-07 12:55, Craig Howland wrote:
> On 12/07/2017 01:19 PM, Yaakov Selkowitz wrote:
>> diff --git a/newlib/libc/include/_ansi.h b/newlib/libc/include/_ansi.h
>> index 3e2490088..e2737ed48 100644
>> --- a/newlib/libc/include/_ansi.h
>> +++ b/newlib/libc/include/_ansi.h
>> @@ -47,19 +47,10 @@
>> #endif
>> #ifdef _HAVE_STDC
>> -#ifdef __CYGWIN__
>> -#define _EXFUN_NOTHROW(name, proto) __cdecl name proto _NOTHROW
>> -#define _EXFUN(name, proto) __cdecl name proto
>> -#else
>> -#define _EXFUN_NOTHROW(name, proto) name proto _NOTHROW
>> -#define _EXFUN(name, proto) name proto
>> -#endif
> For patches 13 and 14, the replacements for _EXFUN_NOTHROW(), _EXFUN(),
> _EXPARM(), and _EXFNPTR() are all dropping the __cdecl which is applied
> when __CYGWIN__ is defined. I would expect this would wreak havoc for
> Cygwin, and will need to be addressed, somehow.
cdecl has been the default on Cygwin for as long as I remember; we think
this dates back to a time when perhaps that wasn't the case.
--
Yaakov
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 00/17] Newlib ANSI-fication
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
` (16 preceding siblings ...)
2017-12-07 18:55 ` [PATCH v2 17/17] ansification: remove ansidecl.h from makedoc Yaakov Selkowitz
@ 2017-12-12 12:51 ` Corinna Vinschen
2017-12-19 4:50 ` Jeff Johnston
17 siblings, 1 reply; 28+ messages in thread
From: Corinna Vinschen @ 2017-12-12 12:51 UTC (permalink / raw)
To: newlib
[-- Attachment #1: Type: text/plain, Size: 799 bytes --]
On Dec 7 12:18, Yaakov Selkowitz wrote:
> Yaakov Selkowitz (17):
> ansification: remove _AND
> ansification: remove _CONST
> ansification: remove _DOTS
> ansification: remove _NOARGS
> ansification: remove _PARAMS
> ansification: remove _VOID_PTR
> ansification: remove _PTR
> ansification: remove _CAST_VOID
> ansification: remove _DEFUN_VOID
> ansification: remove _VOID
> ansification: remove _VOLATILE, _SIGNED
> ansification: remove _DEFUN
> ansification: remove _EXFNPTR, _EXPARM
> ansification: remove _EXFUN, _EXFUN_NOTHROW
> ansification: remove _HAVE_STDC
> ansification: fix makedoc for ANSI C
> ansification: remove ansidecl.h from makedoc
ACK to series.
Thanks,
Corinna
--
Corinna Vinschen
Cygwin Maintainer
Red Hat
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 00/17] Newlib ANSI-fication
2017-12-12 12:51 ` [PATCH v2 00/17] Newlib ANSI-fication Corinna Vinschen
@ 2017-12-19 4:50 ` Jeff Johnston
2018-01-09 14:34 ` Sebastian Huber
2018-01-10 15:58 ` Yaakov Selkowitz
0 siblings, 2 replies; 28+ messages in thread
From: Jeff Johnston @ 2017-12-19 4:50 UTC (permalink / raw)
To: Newlib
ACK as well, but please add some documentation. We can bump the major
release
for the yearly snapshot so you can doc that as of 3.0.0, K&R compiler
support has been dropped.
-- Jeff J.
On Tue, Dec 12, 2017 at 7:49 AM, Corinna Vinschen <vinschen@redhat.com>
wrote:
> On Dec 7 12:18, Yaakov Selkowitz wrote:
> > Yaakov Selkowitz (17):
> > ansification: remove _AND
> > ansification: remove _CONST
> > ansification: remove _DOTS
> > ansification: remove _NOARGS
> > ansification: remove _PARAMS
> > ansification: remove _VOID_PTR
> > ansification: remove _PTR
> > ansification: remove _CAST_VOID
> > ansification: remove _DEFUN_VOID
> > ansification: remove _VOID
> > ansification: remove _VOLATILE, _SIGNED
> > ansification: remove _DEFUN
> > ansification: remove _EXFNPTR, _EXPARM
> > ansification: remove _EXFUN, _EXFUN_NOTHROW
> > ansification: remove _HAVE_STDC
> > ansification: fix makedoc for ANSI C
> > ansification: remove ansidecl.h from makedoc
>
> ACK to series.
>
>
> Thanks,
> Corinna
>
> --
> Corinna Vinschen
> Cygwin Maintainer
> Red Hat
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 00/17] Newlib ANSI-fication
2017-12-19 4:50 ` Jeff Johnston
@ 2018-01-09 14:34 ` Sebastian Huber
2018-01-18 12:35 ` Sebastian Huber
2018-01-10 15:58 ` Yaakov Selkowitz
1 sibling, 1 reply; 28+ messages in thread
From: Sebastian Huber @ 2018-01-09 14:34 UTC (permalink / raw)
To: Newlib
Hello,
On 18/12/17 23:29, Jeff Johnston wrote:
> ACK as well, but please add some documentation. We can bump the major
> release
> for the yearly snapshot so you can doc that as of 3.0.0, K&R compiler
> support has been dropped.
what is the status of this patch set? Would it be possible to get a
release candidate snapshot once this is committed? This would greatly
simplify the testing on our side.
--
Sebastian Huber, embedded brains GmbH
Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone : +49 89 189 47 41-16
Fax : +49 89 189 47 41-09
E-Mail : sebastian.huber@embedded-brains.de
PGP : Public key available on request.
Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 00/17] Newlib ANSI-fication
2017-12-19 4:50 ` Jeff Johnston
2018-01-09 14:34 ` Sebastian Huber
@ 2018-01-10 15:58 ` Yaakov Selkowitz
2018-01-17 2:49 ` Yaakov Selkowitz
1 sibling, 1 reply; 28+ messages in thread
From: Yaakov Selkowitz @ 2018-01-10 15:58 UTC (permalink / raw)
To: newlib
[-- Attachment #1.1: Type: text/plain, Size: 130 bytes --]
On 2017-12-18 16:29, Jeff Johnston wrote:
> ACK as well, but please add some documentation.
Where, exactly?
--
Yaakov
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 00/17] Newlib ANSI-fication
2018-01-10 15:58 ` Yaakov Selkowitz
@ 2018-01-17 2:49 ` Yaakov Selkowitz
2018-01-17 4:42 ` [PATCH] Bump release to 3.0.0 for removal of K&R compatibility Yaakov Selkowitz
2018-01-17 15:58 ` [PATCH v2 00/17] Newlib ANSI-fication Jeff Johnston
0 siblings, 2 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2018-01-17 2:49 UTC (permalink / raw)
To: newlib
[-- Attachment #1.1: Type: text/plain, Size: 450 bytes --]
On 2018-01-10 09:58, Yaakov Selkowitz wrote:
> On 2017-12-18 16:29, Jeff Johnston wrote:
>> ACK as well, but please add some documentation.
>
> Where, exactly?
newlib/README already says the following since at least 2000:
NOTE THAT YOU MUST HAVE ALREADY BUILT AND INSTALLED GCC and BINUTILS.
Which would already rule out any ancient or custom K&R compilers, so I'm
really not sure if and how to further specify this.
--
Yaakov
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH] Bump release to 3.0.0 for removal of K&R compatibility
2018-01-17 2:49 ` Yaakov Selkowitz
@ 2018-01-17 4:42 ` Yaakov Selkowitz
2018-01-17 15:58 ` [PATCH v2 00/17] Newlib ANSI-fication Jeff Johnston
1 sibling, 0 replies; 28+ messages in thread
From: Yaakov Selkowitz @ 2018-01-17 4:42 UTC (permalink / raw)
To: newlib
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
newlib/NEWS | 21 +++++++++++++++++++++
newlib/README | 18 +++++++++---------
newlib/acinclude.m4 | 4 ++--
newlib/configure | 22 +++++++++++-----------
newlib/doc/configure | 20 ++++++++++----------
newlib/iconvdata/configure | 20 ++++++++++----------
newlib/libc/configure | 20 ++++++++++----------
newlib/libc/libc.texinfo | 2 +-
newlib/libc/machine/a29k/configure | 20 ++++++++++----------
newlib/libc/machine/aarch64/configure | 20 ++++++++++----------
newlib/libc/machine/arc/configure | 20 ++++++++++----------
newlib/libc/machine/arm/configure | 20 ++++++++++----------
newlib/libc/machine/bfin/configure | 20 ++++++++++----------
newlib/libc/machine/configure | 20 ++++++++++----------
newlib/libc/machine/cr16/configure | 20 ++++++++++----------
newlib/libc/machine/cris/configure | 20 ++++++++++----------
newlib/libc/machine/crx/configure | 20 ++++++++++----------
newlib/libc/machine/d10v/configure | 20 ++++++++++----------
newlib/libc/machine/d30v/configure | 20 ++++++++++----------
newlib/libc/machine/epiphany/configure | 20 ++++++++++----------
newlib/libc/machine/fr30/configure | 20 ++++++++++----------
newlib/libc/machine/frv/configure | 20 ++++++++++----------
newlib/libc/machine/ft32/configure | 20 ++++++++++----------
newlib/libc/machine/h8300/configure | 20 ++++++++++----------
newlib/libc/machine/h8500/configure | 20 ++++++++++----------
newlib/libc/machine/hppa/configure | 20 ++++++++++----------
newlib/libc/machine/i386/configure | 20 ++++++++++----------
newlib/libc/machine/i960/configure | 20 ++++++++++----------
newlib/libc/machine/iq2000/configure | 20 ++++++++++----------
newlib/libc/machine/lm32/configure | 20 ++++++++++----------
newlib/libc/machine/m32c/configure | 20 ++++++++++----------
newlib/libc/machine/m32r/configure | 20 ++++++++++----------
newlib/libc/machine/m68hc11/configure | 20 ++++++++++----------
newlib/libc/machine/m68k/configure | 20 ++++++++++----------
newlib/libc/machine/m88k/configure | 20 ++++++++++----------
newlib/libc/machine/mep/configure | 20 ++++++++++----------
newlib/libc/machine/microblaze/configure | 20 ++++++++++----------
newlib/libc/machine/mips/configure | 20 ++++++++++----------
newlib/libc/machine/mn10200/configure | 20 ++++++++++----------
newlib/libc/machine/mn10300/configure | 20 ++++++++++----------
newlib/libc/machine/moxie/configure | 20 ++++++++++----------
newlib/libc/machine/msp430/configure | 20 ++++++++++----------
newlib/libc/machine/mt/configure | 20 ++++++++++----------
newlib/libc/machine/nds32/configure | 20 ++++++++++----------
newlib/libc/machine/necv70/configure | 20 ++++++++++----------
newlib/libc/machine/nios2/configure | 20 ++++++++++----------
newlib/libc/machine/or1k/configure | 20 ++++++++++----------
newlib/libc/machine/powerpc/configure | 20 ++++++++++----------
newlib/libc/machine/riscv/configure | 20 ++++++++++----------
newlib/libc/machine/rl78/configure | 20 ++++++++++----------
newlib/libc/machine/rx/configure | 20 ++++++++++----------
newlib/libc/machine/sh/configure | 20 ++++++++++----------
newlib/libc/machine/sparc/configure | 20 ++++++++++----------
newlib/libc/machine/spu/configure | 20 ++++++++++----------
newlib/libc/machine/tic4x/configure | 20 ++++++++++----------
newlib/libc/machine/tic6x/configure | 20 ++++++++++----------
newlib/libc/machine/tic80/configure | 20 ++++++++++----------
newlib/libc/machine/v850/configure | 20 ++++++++++----------
newlib/libc/machine/visium/configure | 20 ++++++++++----------
newlib/libc/machine/w65/configure | 20 ++++++++++----------
newlib/libc/machine/x86_64/configure | 20 ++++++++++----------
newlib/libc/machine/xc16x/configure | 20 ++++++++++----------
newlib/libc/machine/xscale/configure | 20 ++++++++++----------
newlib/libc/machine/xstormy16/configure | 20 ++++++++++----------
newlib/libc/machine/z8k/configure | 20 ++++++++++----------
newlib/libc/sys/a29khif/configure | 20 ++++++++++----------
newlib/libc/sys/arm/configure | 20 ++++++++++----------
newlib/libc/sys/configure | 20 ++++++++++----------
newlib/libc/sys/d10v/configure | 20 ++++++++++----------
newlib/libc/sys/decstation/configure | 20 ++++++++++----------
newlib/libc/sys/epiphany/configure | 20 ++++++++++----------
newlib/libc/sys/h8300hms/configure | 20 ++++++++++----------
newlib/libc/sys/h8500hms/configure | 20 ++++++++++----------
newlib/libc/sys/linux/configure | 20 ++++++++++----------
newlib/libc/sys/linux/linuxthreads/configure | 20 ++++++++++----------
.../libc/sys/linux/linuxthreads/machine/configure | 20 ++++++++++----------
.../sys/linux/linuxthreads/machine/i386/configure | 20 ++++++++++----------
newlib/libc/sys/linux/machine/configure | 20 ++++++++++----------
newlib/libc/sys/linux/machine/i386/configure | 20 ++++++++++----------
newlib/libc/sys/m88kbug/configure | 20 ++++++++++----------
newlib/libc/sys/mmixware/configure | 20 ++++++++++----------
newlib/libc/sys/netware/configure | 20 ++++++++++----------
newlib/libc/sys/or1k/configure | 20 ++++++++++----------
newlib/libc/sys/phoenix/configure | 20 ++++++++++----------
newlib/libc/sys/phoenix/machine/arm/configure | 20 ++++++++++----------
newlib/libc/sys/phoenix/machine/configure | 20 ++++++++++----------
newlib/libc/sys/rdos/configure | 20 ++++++++++----------
newlib/libc/sys/rtems/configure | 20 ++++++++++----------
newlib/libc/sys/sh/configure | 20 ++++++++++----------
newlib/libc/sys/sparc64/configure | 20 ++++++++++----------
newlib/libc/sys/sun4/configure | 20 ++++++++++----------
newlib/libc/sys/sysmec/configure | 20 ++++++++++----------
newlib/libc/sys/sysnec810/configure | 20 ++++++++++----------
newlib/libc/sys/sysnecv850/configure | 20 ++++++++++----------
newlib/libc/sys/sysvi386/configure | 20 ++++++++++----------
newlib/libc/sys/sysvnecv70/configure | 20 ++++++++++----------
newlib/libc/sys/tic80/configure | 20 ++++++++++----------
newlib/libc/sys/tirtos/configure | 20 ++++++++++----------
newlib/libc/sys/w65/configure | 20 ++++++++++----------
newlib/libc/sys/z8ksim/configure | 20 ++++++++++----------
newlib/libm/configure | 20 ++++++++++----------
newlib/libm/libm.texinfo | 2 +-
newlib/libm/machine/aarch64/configure | 20 ++++++++++----------
newlib/libm/machine/arm/configure | 20 ++++++++++----------
newlib/libm/machine/configure | 20 ++++++++++----------
newlib/libm/machine/i386/configure | 20 ++++++++++----------
newlib/libm/machine/nds32/configure | 20 ++++++++++----------
newlib/libm/machine/riscv/configure | 20 ++++++++++----------
newlib/libm/machine/spu/configure | 20 ++++++++++----------
109 files changed, 1075 insertions(+), 1054 deletions(-)
diff --git a/newlib/NEWS b/newlib/NEWS
index e10042dd3..b551521c6 100644
--- a/newlib/NEWS
+++ b/newlib/NEWS
@@ -1,3 +1,24 @@
+*** Major changes in newlib version 3.0.0:
+
+- K&R compiler support is dropped; ANSI C compiler required
+- new --enable-newlib-global-stdio-streams configure option
+- new --enable-newlib-long-time_t option, default is now 64-bit
+- new <elf.h> header
+- made <xlocale.h> header public
+- improved <sys/cdefs.h> compatibility with glibc
+- new RISC-V port
+- added Stack Smashing Protection implementation
+- added _FORTIFY_SOURCE guards for many functions
+- added long double complex math functions
+- new implementations of float logarithmic functions
+- added ffs*, fls*, strnstr, strverscmp, wmempcpy functions
+- added imaxabs, imaxdiv, strto[iu]max, wcsto[iu]max functions
+- added reallocarray function
+- scanf functions now support %m and %l[
+- srtptime now supports %F, %s
+- many doc fixes
+- additional feature test macro overhaul
+
*** Major changes in newlib version 2.5.0:
- memory.h added
diff --git a/newlib/README b/newlib/README
index 8c97e24aa..89fd16592 100644
--- a/newlib/README
+++ b/newlib/README
@@ -1,4 +1,4 @@
- README for newlib-2.5.0 release
+ README for newlib-3.0.0 release
(mostly cribbed from the README in the gdb-4.13 release)
This is `newlib', a simple ANSI C library, math library, and collection
@@ -17,8 +17,8 @@ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
Unpacking and Installation -- quick overview
==========================
-When you unpack the newlib-2.5.0.tar.gz file, you'll find a directory
-called `newlib-2.5.0', which contains:
+When you unpack the newlib-3.0.0.tar.gz file, you'll find a directory
+called `newlib-3.0.0', which contains:
COPYING config/ install-sh* mpw-configure
COPYING.LIB config-ml.in libgloss/ mpw-install
@@ -94,13 +94,13 @@ directory. If the path to `configure' would be the same as the
argument to `--srcdir', you can leave out the `--srcdir' option; it
will be assumed.)
- For example, with version 2.5.0, you can build NEWLIB in a separate
+ For example, with version 3.0.0, you can build NEWLIB in a separate
directory for a Sun 4 cross m68k-aout environment like this:
- cd newlib-2.5.0
+ cd newlib-3.0.0
mkdir ../newlib-m68k-aout
cd ../newlib-m68k-aout
- ../newlib-2.5.0/configure --host=sun4 --target=m68k-aout
+ ../newlib-3.0.0/configure --host=sun4 --target=m68k-aout
make
When `configure' builds a configuration using a remote source
@@ -116,8 +116,8 @@ called `configure' (or one of its subdirectories).
The `Makefile' that `configure' generates in each source directory
also runs recursively. If you type `make' in a source directory such
-as `newlib-2.5.0' (or in a separate configured directory configured with
-`--srcdir=PATH/newlib-2.5.0'), you will build all the required libraries.
+as `newlib-3.0.0' (or in a separate configured directory configured with
+`--srcdir=PATH/newlib-3.0.0'), you will build all the required libraries.
When you have multiple hosts or targets configured in separate
directories, you can run `make' on them in parallel (for example, if
@@ -601,7 +601,7 @@ Reporting Bugs
The correct address for reporting bugs found in NEWLIB is
"newlib@sourceware.org". Please email all bug reports to that
-address. Please include the NEWLIB version number (e.g., newlib-2.5.0),
+address. Please include the NEWLIB version number (e.g., newlib-3.0.0),
and how you configured it (e.g., "sun4 host and m68k-aout target").
Since NEWLIB supports many different configurations, it is important
that you be precise about this.
diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4
index 2b0dd5822..8b18097f4 100644
--- a/newlib/acinclude.m4
+++ b/newlib/acinclude.m4
@@ -1,8 +1,8 @@
dnl This provides configure definitions used by all the newlib
dnl configure.in files.
-AC_DEFUN([DEF_NEWLIB_MAJOR_VERSION],m4_define([NEWLIB_MAJOR_VERSION],[2]))
-AC_DEFUN([DEF_NEWLIB_MINOR_VERSION],m4_define([NEWLIB_MINOR_VERSION],[5]))
+AC_DEFUN([DEF_NEWLIB_MAJOR_VERSION],m4_define([NEWLIB_MAJOR_VERSION],[3]))
+AC_DEFUN([DEF_NEWLIB_MINOR_VERSION],m4_define([NEWLIB_MINOR_VERSION],[0]))
AC_DEFUN([DEF_NEWLIB_PATCHLEVEL_VERSION],m4_define([NEWLIB_PATCHLEVEL_VERSION],[0]))
AC_DEFUN([DEF_NEWLIB_VERSION],m4_define([NEWLIB_VERSION],[NEWLIB_MAJOR_VERSION.NEWLIB_MINOR_VERSION.NEWLIB_PATCHLEVEL_VERSION]))
diff --git a/newlib/configure b/newlib/configure
index 9613214eb..bcfd54977 100755
--- a/newlib/configure
+++ b/newlib/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1378,7 +1378,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1448,7 +1448,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1582,7 +1582,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1860,7 +1860,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3208,7 +3208,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -12406,7 +12406,7 @@ _ACEOF
fi
-$as_echo "#define _NEWLIB_VERSION \"2.5.0\"" >>confdefs.h
+$as_echo "#define _NEWLIB_VERSION \"3.0.0\"" >>confdefs.h
$as_echo "#define __NEWLIB__ 2" >>confdefs.h
@@ -13345,7 +13345,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13411,7 +13411,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/doc/configure b/newlib/doc/configure
index d51547b04..d41bb996f 100755
--- a/newlib/doc/configure
+++ b/newlib/doc/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1241,7 +1241,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1311,7 +1311,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1402,7 +1402,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1457,7 +1457,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2529,7 +2529,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4045,7 +4045,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4102,7 +4102,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/iconvdata/configure b/newlib/iconvdata/configure
index e520005ad..cce729aca 100755
--- a/newlib/iconvdata/configure
+++ b/newlib/iconvdata/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1322,7 +1322,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1392,7 +1392,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1503,7 +1503,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1781,7 +1781,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2853,7 +2853,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -12378,7 +12378,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12435,7 +12435,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/configure b/newlib/libc/configure
index 240c384d3..3f3baa970 100755
--- a/newlib/libc/configure
+++ b/newlib/libc/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1370,7 +1370,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1440,7 +1440,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1555,7 +1555,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1833,7 +1833,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2968,7 +2968,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -12777,7 +12777,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12834,7 +12834,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/libc.texinfo b/newlib/libc/libc.texinfo
index f8c820baf..f7baeec71 100644
--- a/newlib/libc/libc.texinfo
+++ b/newlib/libc/libc.texinfo
@@ -69,7 +69,7 @@ into another language, under the above conditions for modified versions.
@title The Red Hat newlib C Library
@subtitle Full Configuration
@sp 1
-@subtitle @code{libc} 2.5.0
+@subtitle @code{libc} 3.0.0
@subtitle December 2016
@author {Steve Chamberlain}
@author {Roland Pesch}
diff --git a/newlib/libc/machine/a29k/configure b/newlib/libc/machine/a29k/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/a29k/configure
+++ b/newlib/libc/machine/a29k/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/aarch64/configure b/newlib/libc/machine/aarch64/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/aarch64/configure
+++ b/newlib/libc/machine/aarch64/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/arc/configure b/newlib/libc/machine/arc/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/arc/configure
+++ b/newlib/libc/machine/arc/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/arm/configure b/newlib/libc/machine/arm/configure
index b3691a884..004919685 100755
--- a/newlib/libc/machine/arm/configure
+++ b/newlib/libc/machine/arm/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1240,7 +1240,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1310,7 +1310,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1401,7 +1401,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1456,7 +1456,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2528,7 +2528,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4010,7 +4010,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4067,7 +4067,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/bfin/configure b/newlib/libc/machine/bfin/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/bfin/configure
+++ b/newlib/libc/machine/bfin/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/configure b/newlib/libc/machine/configure
index c72010b6d..d4661f4ad 100755
--- a/newlib/libc/machine/configure
+++ b/newlib/libc/machine/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1380,7 +1380,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1450,7 +1450,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1561,7 +1561,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1839,7 +1839,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2911,7 +2911,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -12566,7 +12566,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12623,7 +12623,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/cr16/configure b/newlib/libc/machine/cr16/configure
index d3b535d2d..f788ab144 100644
--- a/newlib/libc/machine/cr16/configure
+++ b/newlib/libc/machine/cr16/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/cris/configure b/newlib/libc/machine/cris/configure
index 74996222e..786e50b6a 100755
--- a/newlib/libc/machine/cris/configure
+++ b/newlib/libc/machine/cris/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/crx/configure b/newlib/libc/machine/crx/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/crx/configure
+++ b/newlib/libc/machine/crx/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/d10v/configure b/newlib/libc/machine/d10v/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/d10v/configure
+++ b/newlib/libc/machine/d10v/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/d30v/configure b/newlib/libc/machine/d30v/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/d30v/configure
+++ b/newlib/libc/machine/d30v/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/epiphany/configure b/newlib/libc/machine/epiphany/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/epiphany/configure
+++ b/newlib/libc/machine/epiphany/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/fr30/configure b/newlib/libc/machine/fr30/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/fr30/configure
+++ b/newlib/libc/machine/fr30/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/frv/configure b/newlib/libc/machine/frv/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/frv/configure
+++ b/newlib/libc/machine/frv/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/ft32/configure b/newlib/libc/machine/ft32/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/ft32/configure
+++ b/newlib/libc/machine/ft32/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/h8300/configure b/newlib/libc/machine/h8300/configure
index 248592edb..d5199281f 100755
--- a/newlib/libc/machine/h8300/configure
+++ b/newlib/libc/machine/h8300/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/h8500/configure b/newlib/libc/machine/h8500/configure
index 6c55d0d5a..b1c558499 100755
--- a/newlib/libc/machine/h8500/configure
+++ b/newlib/libc/machine/h8500/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/hppa/configure b/newlib/libc/machine/hppa/configure
index 6f0bd2500..cbb42af80 100755
--- a/newlib/libc/machine/hppa/configure
+++ b/newlib/libc/machine/hppa/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/i386/configure b/newlib/libc/machine/i386/configure
index 4ee4707f6..7c21328a9 100755
--- a/newlib/libc/machine/i386/configure
+++ b/newlib/libc/machine/i386/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1324,7 +1324,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1394,7 +1394,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1505,7 +1505,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1783,7 +1783,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2855,7 +2855,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -12393,7 +12393,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12450,7 +12450,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/i960/configure b/newlib/libc/machine/i960/configure
index bb878bacf..3db5af7e7 100755
--- a/newlib/libc/machine/i960/configure
+++ b/newlib/libc/machine/i960/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/iq2000/configure b/newlib/libc/machine/iq2000/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/iq2000/configure
+++ b/newlib/libc/machine/iq2000/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/lm32/configure b/newlib/libc/machine/lm32/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/lm32/configure
+++ b/newlib/libc/machine/lm32/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/m32c/configure b/newlib/libc/machine/m32c/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/m32c/configure
+++ b/newlib/libc/machine/m32c/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/m32r/configure b/newlib/libc/machine/m32r/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/m32r/configure
+++ b/newlib/libc/machine/m32r/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/m68hc11/configure b/newlib/libc/machine/m68hc11/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/m68hc11/configure
+++ b/newlib/libc/machine/m68hc11/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/m68k/configure b/newlib/libc/machine/m68k/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/m68k/configure
+++ b/newlib/libc/machine/m68k/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/m88k/configure b/newlib/libc/machine/m88k/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/m88k/configure
+++ b/newlib/libc/machine/m88k/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/mep/configure b/newlib/libc/machine/mep/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/mep/configure
+++ b/newlib/libc/machine/mep/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/microblaze/configure b/newlib/libc/machine/microblaze/configure
index f80e155f3..6e2a1181e 100644
--- a/newlib/libc/machine/microblaze/configure
+++ b/newlib/libc/machine/microblaze/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/mips/configure b/newlib/libc/machine/mips/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/mips/configure
+++ b/newlib/libc/machine/mips/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/mn10200/configure b/newlib/libc/machine/mn10200/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/mn10200/configure
+++ b/newlib/libc/machine/mn10200/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/mn10300/configure b/newlib/libc/machine/mn10300/configure
index 6f0bd2500..cbb42af80 100755
--- a/newlib/libc/machine/mn10300/configure
+++ b/newlib/libc/machine/mn10300/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/moxie/configure b/newlib/libc/machine/moxie/configure
index d3b535d2d..f788ab144 100644
--- a/newlib/libc/machine/moxie/configure
+++ b/newlib/libc/machine/moxie/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/msp430/configure b/newlib/libc/machine/msp430/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/msp430/configure
+++ b/newlib/libc/machine/msp430/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/mt/configure b/newlib/libc/machine/mt/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/mt/configure
+++ b/newlib/libc/machine/mt/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/nds32/configure b/newlib/libc/machine/nds32/configure
index b990b39db..ad6741b09 100755
--- a/newlib/libc/machine/nds32/configure
+++ b/newlib/libc/machine/nds32/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1253,7 +1253,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1323,7 +1323,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1421,7 +1421,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1476,7 +1476,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2548,7 +2548,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -5069,7 +5069,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5126,7 +5126,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/necv70/configure b/newlib/libc/machine/necv70/configure
index 4c1042031..1978c3547 100755
--- a/newlib/libc/machine/necv70/configure
+++ b/newlib/libc/machine/necv70/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/nios2/configure b/newlib/libc/machine/nios2/configure
index 9fdf98864..2e33830dc 100755
--- a/newlib/libc/machine/nios2/configure
+++ b/newlib/libc/machine/nios2/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/or1k/configure b/newlib/libc/machine/or1k/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/or1k/configure
+++ b/newlib/libc/machine/or1k/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/powerpc/configure b/newlib/libc/machine/powerpc/configure
index feafc8bec..2b38b225a 100755
--- a/newlib/libc/machine/powerpc/configure
+++ b/newlib/libc/machine/powerpc/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1240,7 +1240,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1310,7 +1310,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1401,7 +1401,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1456,7 +1456,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2528,7 +2528,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4019,7 +4019,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4076,7 +4076,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/riscv/configure b/newlib/libc/machine/riscv/configure
index 2cf2d3a18..cfbc9e33d 100755
--- a/newlib/libc/machine/riscv/configure
+++ b/newlib/libc/machine/riscv/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/rl78/configure b/newlib/libc/machine/rl78/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/rl78/configure
+++ b/newlib/libc/machine/rl78/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/rx/configure b/newlib/libc/machine/rx/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/rx/configure
+++ b/newlib/libc/machine/rx/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/sh/configure b/newlib/libc/machine/sh/configure
index 32a819735..ad94a1282 100755
--- a/newlib/libc/machine/sh/configure
+++ b/newlib/libc/machine/sh/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -557,8 +557,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1258,7 +1258,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1328,7 +1328,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1427,7 +1427,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1519,7 +1519,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2593,7 +2593,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -5376,7 +5376,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5433,7 +5433,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/sparc/configure b/newlib/libc/machine/sparc/configure
index 20417c236..754a39bf5 100755
--- a/newlib/libc/machine/sparc/configure
+++ b/newlib/libc/machine/sparc/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/spu/configure b/newlib/libc/machine/spu/configure
index 0c094c57b..01638b6ea 100644
--- a/newlib/libc/machine/spu/configure
+++ b/newlib/libc/machine/spu/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1241,7 +1241,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1311,7 +1311,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1402,7 +1402,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1457,7 +1457,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2529,7 +2529,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4041,7 +4041,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4098,7 +4098,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/tic4x/configure b/newlib/libc/machine/tic4x/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/tic4x/configure
+++ b/newlib/libc/machine/tic4x/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/tic6x/configure b/newlib/libc/machine/tic6x/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/tic6x/configure
+++ b/newlib/libc/machine/tic6x/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/tic80/configure b/newlib/libc/machine/tic80/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/tic80/configure
+++ b/newlib/libc/machine/tic80/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/v850/configure b/newlib/libc/machine/v850/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/v850/configure
+++ b/newlib/libc/machine/v850/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/visium/configure b/newlib/libc/machine/visium/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/visium/configure
+++ b/newlib/libc/machine/visium/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/w65/configure b/newlib/libc/machine/w65/configure
index 6c55d0d5a..b1c558499 100755
--- a/newlib/libc/machine/w65/configure
+++ b/newlib/libc/machine/w65/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/x86_64/configure b/newlib/libc/machine/x86_64/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/x86_64/configure
+++ b/newlib/libc/machine/x86_64/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/xc16x/configure b/newlib/libc/machine/xc16x/configure
index 4cd1db78a..ea445657f 100644
--- a/newlib/libc/machine/xc16x/configure
+++ b/newlib/libc/machine/xc16x/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/xscale/configure b/newlib/libc/machine/xscale/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libc/machine/xscale/configure
+++ b/newlib/libc/machine/xscale/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/xstormy16/configure b/newlib/libc/machine/xstormy16/configure
index 4cd1db78a..ea445657f 100755
--- a/newlib/libc/machine/xstormy16/configure
+++ b/newlib/libc/machine/xstormy16/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/machine/z8k/configure b/newlib/libc/machine/z8k/configure
index 70a9593dd..fa69bd712 100755
--- a/newlib/libc/machine/z8k/configure
+++ b/newlib/libc/machine/z8k/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/a29khif/configure b/newlib/libc/sys/a29khif/configure
index eebae20f4..16e6e22d5 100755
--- a/newlib/libc/sys/a29khif/configure
+++ b/newlib/libc/sys/a29khif/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/arm/configure b/newlib/libc/sys/arm/configure
index 023065454..e53ccc550 100755
--- a/newlib/libc/sys/arm/configure
+++ b/newlib/libc/sys/arm/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/configure b/newlib/libc/sys/configure
index de5cf01ee..0362c1e29 100755
--- a/newlib/libc/sys/configure
+++ b/newlib/libc/sys/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1353,7 +1353,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1423,7 +1423,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1534,7 +1534,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1812,7 +1812,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2884,7 +2884,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -12489,7 +12489,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12546,7 +12546,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/d10v/configure b/newlib/libc/sys/d10v/configure
index f5079be5f..8090d5299 100755
--- a/newlib/libc/sys/d10v/configure
+++ b/newlib/libc/sys/d10v/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/decstation/configure b/newlib/libc/sys/decstation/configure
index bdfa6d3d7..a4021d8fb 100755
--- a/newlib/libc/sys/decstation/configure
+++ b/newlib/libc/sys/decstation/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/epiphany/configure b/newlib/libc/sys/epiphany/configure
index 376094df7..1be275a9f 100755
--- a/newlib/libc/sys/epiphany/configure
+++ b/newlib/libc/sys/epiphany/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/h8300hms/configure b/newlib/libc/sys/h8300hms/configure
index ae9bbae2b..b6db5cbb3 100755
--- a/newlib/libc/sys/h8300hms/configure
+++ b/newlib/libc/sys/h8300hms/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/h8500hms/configure b/newlib/libc/sys/h8500hms/configure
index a9889bf5b..96a2ca544 100755
--- a/newlib/libc/sys/h8500hms/configure
+++ b/newlib/libc/sys/h8500hms/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/linux/configure b/newlib/libc/sys/linux/configure
index 6552079a8..0a3f824cb 100755
--- a/newlib/libc/sys/linux/configure
+++ b/newlib/libc/sys/linux/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1328,7 +1328,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1398,7 +1398,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1509,7 +1509,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1787,7 +1787,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2859,7 +2859,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -12459,7 +12459,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12516,7 +12516,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/linux/linuxthreads/configure b/newlib/libc/sys/linux/linuxthreads/configure
index ba9e9ce7b..9b4b77339 100755
--- a/newlib/libc/sys/linux/linuxthreads/configure
+++ b/newlib/libc/sys/linux/linuxthreads/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1326,7 +1326,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1396,7 +1396,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1507,7 +1507,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1785,7 +1785,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2857,7 +2857,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -12436,7 +12436,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12493,7 +12493,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/configure b/newlib/libc/sys/linux/linuxthreads/machine/configure
index 123d855e8..3eb7c7109 100755
--- a/newlib/libc/sys/linux/linuxthreads/machine/configure
+++ b/newlib/libc/sys/linux/linuxthreads/machine/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1326,7 +1326,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1396,7 +1396,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1507,7 +1507,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1785,7 +1785,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2857,7 +2857,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -12404,7 +12404,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12461,7 +12461,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/configure b/newlib/libc/sys/linux/linuxthreads/machine/i386/configure
index 02705eb9f..ffb6f5d16 100755
--- a/newlib/libc/sys/linux/linuxthreads/machine/i386/configure
+++ b/newlib/libc/sys/linux/linuxthreads/machine/i386/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1322,7 +1322,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1392,7 +1392,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1503,7 +1503,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1781,7 +1781,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2853,7 +2853,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -12420,7 +12420,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12477,7 +12477,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/linux/machine/configure b/newlib/libc/sys/linux/machine/configure
index 020801a9e..cfd978007 100755
--- a/newlib/libc/sys/linux/machine/configure
+++ b/newlib/libc/sys/linux/machine/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1327,7 +1327,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1397,7 +1397,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1508,7 +1508,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1786,7 +1786,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2858,7 +2858,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -12411,7 +12411,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12468,7 +12468,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/linux/machine/i386/configure b/newlib/libc/sys/linux/machine/i386/configure
index 64370ac60..3216a54f3 100755
--- a/newlib/libc/sys/linux/machine/i386/configure
+++ b/newlib/libc/sys/linux/machine/i386/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1322,7 +1322,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1392,7 +1392,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1503,7 +1503,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1781,7 +1781,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2853,7 +2853,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -12420,7 +12420,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12477,7 +12477,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/m88kbug/configure b/newlib/libc/sys/m88kbug/configure
index a64814f4d..506eecc5e 100755
--- a/newlib/libc/sys/m88kbug/configure
+++ b/newlib/libc/sys/m88kbug/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/mmixware/configure b/newlib/libc/sys/mmixware/configure
index d5cfb0a10..d58e2714c 100755
--- a/newlib/libc/sys/mmixware/configure
+++ b/newlib/libc/sys/mmixware/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/netware/configure b/newlib/libc/sys/netware/configure
index 24be0fc9e..aca3c4bb9 100755
--- a/newlib/libc/sys/netware/configure
+++ b/newlib/libc/sys/netware/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/or1k/configure b/newlib/libc/sys/or1k/configure
index 1a7054d47..9239db769 100755
--- a/newlib/libc/sys/or1k/configure
+++ b/newlib/libc/sys/or1k/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/phoenix/configure b/newlib/libc/sys/phoenix/configure
index 555d7580c..e1adcdabc 100644
--- a/newlib/libc/sys/phoenix/configure
+++ b/newlib/libc/sys/phoenix/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1242,7 +1242,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1312,7 +1312,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1403,7 +1403,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1458,7 +1458,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2530,7 +2530,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4018,7 +4018,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4075,7 +4075,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/phoenix/machine/arm/configure b/newlib/libc/sys/phoenix/machine/arm/configure
index 308920367..51d408916 100644
--- a/newlib/libc/sys/phoenix/machine/arm/configure
+++ b/newlib/libc/sys/phoenix/machine/arm/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/phoenix/machine/configure b/newlib/libc/sys/phoenix/machine/configure
index 81880fe3d..360337009 100644
--- a/newlib/libc/sys/phoenix/machine/configure
+++ b/newlib/libc/sys/phoenix/machine/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1247,7 +1247,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1317,7 +1317,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1408,7 +1408,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1463,7 +1463,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2535,7 +2535,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4049,7 +4049,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4106,7 +4106,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/rdos/configure b/newlib/libc/sys/rdos/configure
index 72c73e446..b2db6e9c2 100755
--- a/newlib/libc/sys/rdos/configure
+++ b/newlib/libc/sys/rdos/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/rtems/configure b/newlib/libc/sys/rtems/configure
index 7f4a7b951..d12d513eb 100755
--- a/newlib/libc/sys/rtems/configure
+++ b/newlib/libc/sys/rtems/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/sh/configure b/newlib/libc/sys/sh/configure
index f5079be5f..8090d5299 100755
--- a/newlib/libc/sys/sh/configure
+++ b/newlib/libc/sys/sh/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/sparc64/configure b/newlib/libc/sys/sparc64/configure
index e89ca982a..1207e2199 100755
--- a/newlib/libc/sys/sparc64/configure
+++ b/newlib/libc/sys/sparc64/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/sun4/configure b/newlib/libc/sys/sun4/configure
index 9cccd1bfa..8e2d66b77 100755
--- a/newlib/libc/sys/sun4/configure
+++ b/newlib/libc/sys/sun4/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/sysmec/configure b/newlib/libc/sys/sysmec/configure
index ae9bbae2b..b6db5cbb3 100755
--- a/newlib/libc/sys/sysmec/configure
+++ b/newlib/libc/sys/sysmec/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/sysnec810/configure b/newlib/libc/sys/sysnec810/configure
index 5c808c8e3..ad258a946 100755
--- a/newlib/libc/sys/sysnec810/configure
+++ b/newlib/libc/sys/sysnec810/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/sysnecv850/configure b/newlib/libc/sys/sysnecv850/configure
index ae9bbae2b..b6db5cbb3 100755
--- a/newlib/libc/sys/sysnecv850/configure
+++ b/newlib/libc/sys/sysnecv850/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/sysvi386/configure b/newlib/libc/sys/sysvi386/configure
index 37559f825..7f19a9d1c 100755
--- a/newlib/libc/sys/sysvi386/configure
+++ b/newlib/libc/sys/sysvi386/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/sysvnecv70/configure b/newlib/libc/sys/sysvnecv70/configure
index cecd1c5ae..17a1f544c 100755
--- a/newlib/libc/sys/sysvnecv70/configure
+++ b/newlib/libc/sys/sysvnecv70/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/tic80/configure b/newlib/libc/sys/tic80/configure
index d5cfb0a10..d58e2714c 100755
--- a/newlib/libc/sys/tic80/configure
+++ b/newlib/libc/sys/tic80/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/tirtos/configure b/newlib/libc/sys/tirtos/configure
index 0004eb2c7..158cb6a08 100755
--- a/newlib/libc/sys/tirtos/configure
+++ b/newlib/libc/sys/tirtos/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/w65/configure b/newlib/libc/sys/w65/configure
index 2b25bc2fe..d0148494b 100755
--- a/newlib/libc/sys/w65/configure
+++ b/newlib/libc/sys/w65/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libc/sys/z8ksim/configure b/newlib/libc/sys/z8ksim/configure
index b32798ce6..2e1991cc5 100755
--- a/newlib/libc/sys/z8ksim/configure
+++ b/newlib/libc/sys/z8ksim/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libm/configure b/newlib/libm/configure
index 083708a70..961f0cb6d 100755
--- a/newlib/libm/configure
+++ b/newlib/libm/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1330,7 +1330,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1400,7 +1400,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1512,7 +1512,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1790,7 +1790,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2917,7 +2917,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -12466,7 +12466,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12523,7 +12523,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libm/libm.texinfo b/newlib/libm/libm.texinfo
index f55ad72d9..63d612dfc 100644
--- a/newlib/libm/libm.texinfo
+++ b/newlib/libm/libm.texinfo
@@ -46,7 +46,7 @@ into another language, under the above conditions for modified versions.
@titlepage
@title The Red Hat newlib C Math Library
@sp 1
-@subtitle @code{libm} 2.5.0
+@subtitle @code{libm} 3.0.0
@subtitle December 2016
@author {Steve Chamberlain}
@author {Roland Pesch}
diff --git a/newlib/libm/machine/aarch64/configure b/newlib/libm/machine/aarch64/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libm/machine/aarch64/configure
+++ b/newlib/libm/machine/aarch64/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libm/machine/arm/configure b/newlib/libm/machine/arm/configure
index d3b535d2d..f788ab144 100755
--- a/newlib/libm/machine/arm/configure
+++ b/newlib/libm/machine/arm/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libm/machine/configure b/newlib/libm/machine/configure
index 86ceca95a..de85ec34d 100755
--- a/newlib/libm/machine/configure
+++ b/newlib/libm/machine/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1332,7 +1332,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1402,7 +1402,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1513,7 +1513,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1791,7 +1791,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2863,7 +2863,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -12429,7 +12429,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12486,7 +12486,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libm/machine/i386/configure b/newlib/libm/machine/i386/configure
index a47184ef4..f6bf9892a 100755
--- a/newlib/libm/machine/i386/configure
+++ b/newlib/libm/machine/i386/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1322,7 +1322,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1392,7 +1392,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1503,7 +1503,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1781,7 +1781,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2853,7 +2853,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -12378,7 +12378,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12435,7 +12435,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libm/machine/nds32/configure b/newlib/libm/machine/nds32/configure
index 11dc416d2..65d850b42 100644
--- a/newlib/libm/machine/nds32/configure
+++ b/newlib/libm/machine/nds32/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1255,7 +1255,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1325,7 +1325,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1423,7 +1423,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1478,7 +1478,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2550,7 +2550,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -5104,7 +5104,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5161,7 +5161,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libm/machine/riscv/configure b/newlib/libm/machine/riscv/configure
index b43a01580..15f714c1e 100755
--- a/newlib/libm/machine/riscv/configure
+++ b/newlib/libm/machine/riscv/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.69 for newlib 3.0.0.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -576,8 +576,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1268,7 +1268,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1339,7 +1339,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1430,7 +1430,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1485,7 +1485,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2557,7 +2557,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4025,7 +4025,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4082,7 +4082,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/newlib/libm/machine/spu/configure b/newlib/libm/machine/spu/configure
index d3b535d2d..f788ab144 100644
--- a/newlib/libm/machine/spu/configure
+++ b/newlib/libm/machine/spu/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for newlib 2.5.0.
+# Generated by GNU Autoconf 2.68 for newlib 3.0.0.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -556,8 +556,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='newlib'
PACKAGE_TARNAME='newlib'
-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='newlib 2.5.0'
+PACKAGE_VERSION='3.0.0'
+PACKAGE_STRING='newlib 3.0.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1239,7 +1239,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures newlib 2.5.0 to adapt to many kinds of systems.
+\`configure' configures newlib 3.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1309,7 +1309,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of newlib 2.5.0:";;
+ short | recursive ) echo "Configuration of newlib 3.0.0:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-newlib configure 2.5.0
+newlib configure 3.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by newlib $as_me 2.5.0, which was
+It was created by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2527,7 +2527,7 @@ fi
# Define the identity of the package.
PACKAGE='newlib'
- VERSION='2.5.0'
+ VERSION='3.0.0'
# Some tools Automake needs.
@@ -4007,7 +4007,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by newlib $as_me 2.5.0, which was
+This file was extended by newlib $as_me 3.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4064,7 +4064,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-newlib config.status 2.5.0
+newlib config.status 3.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
--
2.15.1
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 00/17] Newlib ANSI-fication
2018-01-17 2:49 ` Yaakov Selkowitz
2018-01-17 4:42 ` [PATCH] Bump release to 3.0.0 for removal of K&R compatibility Yaakov Selkowitz
@ 2018-01-17 15:58 ` Jeff Johnston
1 sibling, 0 replies; 28+ messages in thread
From: Jeff Johnston @ 2018-01-17 15:58 UTC (permalink / raw)
To: Yaakov Selkowitz; +Cc: Newlib
I already mentioned I would do the docs if you checked in the patches. It
would be a simple
statement to say that K&R support used to exist but was removed as of 3.0.
As well, there
is a section on more documentation and you can state that docs used to have
multiple formats
supported, but no longer. Anyway, as I said, I will do the docs as part
of the 3.0 snapshot.
-- Jeff J.
On Tue, Jan 16, 2018 at 9:49 PM, Yaakov Selkowitz <yselkowitz@cygwin.com>
wrote:
> On 2018-01-10 09:58, Yaakov Selkowitz wrote:
> > On 2017-12-18 16:29, Jeff Johnston wrote:
> >> ACK as well, but please add some documentation.
> >
> > Where, exactly?
>
> newlib/README already says the following since at least 2000:
>
> NOTE THAT YOU MUST HAVE ALREADY BUILT AND INSTALLED GCC and BINUTILS.
>
> Which would already rule out any ancient or custom K&R compilers, so I'm
> really not sure if and how to further specify this.
>
> --
> Yaakov
>
>
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 00/17] Newlib ANSI-fication
2018-01-09 14:34 ` Sebastian Huber
@ 2018-01-18 12:35 ` Sebastian Huber
0 siblings, 0 replies; 28+ messages in thread
From: Sebastian Huber @ 2018-01-18 12:35 UTC (permalink / raw)
To: Newlib
On 09/01/18 15:33, Sebastian Huber wrote:
> Hello,
>
> On 18/12/17 23:29, Jeff Johnston wrote:
>> ACK as well, but please add some documentation. We can bump the major
>> release
>> for the yearly snapshot so you can doc that as of 3.0.0, K&R compiler
>> support has been dropped.
>
> what is the status of this patch set? Would it be possible to get a
> release candidate snapshot once this is committed? This would greatly
> simplify the testing on our side.
>
I was able to build all RTEMS targets (except m32c due to GCC bugs) with
the GCC 7.3 release candidate and the Newlib with these patches applied
(4cd1905add4404d995f1a7c77bc298957b01f91d).
--
Sebastian Huber, embedded brains GmbH
Address : Dornierstr. 4, D-82178 Puchheim, Germany
Phone : +49 89 189 47 41-16
Fax : +49 89 189 47 41-09
E-Mail : sebastian.huber@embedded-brains.de
PGP : Public key available on request.
Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2018-01-18 12:35 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-07 18:19 [PATCH v2 00/17] Newlib ANSI-fication Yaakov Selkowitz
2017-12-07 18:19 ` [PATCH v2 04/17] ansification: remove _NOARGS Yaakov Selkowitz
2017-12-07 18:19 ` [PATCH v2 07/17] ansification: remove _PTR Yaakov Selkowitz
2017-12-07 18:19 ` [PATCH v2 03/17] ansification: remove _DOTS Yaakov Selkowitz
2017-12-07 18:20 ` [PATCH v2 01/17] ansification: remove _AND Yaakov Selkowitz
2017-12-07 18:20 ` [PATCH v2 14/17] ansification: remove _EXFUN, _EXFUN_NOTHROW Yaakov Selkowitz
2017-12-07 19:08 ` Craig Howland
2017-12-12 0:08 ` Yaakov Selkowitz
2017-12-07 18:20 ` [PATCH v2 13/17] ansification: remove _EXFNPTR, _EXPARM Yaakov Selkowitz
2017-12-07 18:20 ` [PATCH v2 02/17] ansification: remove _CONST Yaakov Selkowitz
2017-12-07 18:20 ` [PATCH v2 06/17] ansification: remove _VOID_PTR Yaakov Selkowitz
2017-12-07 18:26 ` [PATCH v2 09/17] ansification: remove _DEFUN_VOID Yaakov Selkowitz
2017-12-07 18:26 ` [PATCH v2 12/17] ansification: remove _DEFUN Yaakov Selkowitz
2017-12-07 18:26 ` [PATCH v2 11/17] ansification: remove _VOLATILE, _SIGNED Yaakov Selkowitz
2017-12-07 18:27 ` [PATCH v2 05/17] ansification: remove _PARAMS Yaakov Selkowitz
2017-12-07 18:28 ` [PATCH v2 10/17] ansification: remove _VOID Yaakov Selkowitz
2017-12-07 18:29 ` [PATCH v2 15/17] ansification: remove _HAVE_STDC Yaakov Selkowitz
2017-12-07 18:29 ` [PATCH v2 16/17] ansification: fix makedoc for ANSI C Yaakov Selkowitz
2017-12-07 18:29 ` [PATCH v2 08/17] ansification: remove _CAST_VOID Yaakov Selkowitz
2017-12-07 18:55 ` [PATCH v2 17/17] ansification: remove ansidecl.h from makedoc Yaakov Selkowitz
2017-12-12 12:51 ` [PATCH v2 00/17] Newlib ANSI-fication Corinna Vinschen
2017-12-19 4:50 ` Jeff Johnston
2018-01-09 14:34 ` Sebastian Huber
2018-01-18 12:35 ` Sebastian Huber
2018-01-10 15:58 ` Yaakov Selkowitz
2018-01-17 2:49 ` Yaakov Selkowitz
2018-01-17 4:42 ` [PATCH] Bump release to 3.0.0 for removal of K&R compatibility Yaakov Selkowitz
2018-01-17 15:58 ` [PATCH v2 00/17] Newlib ANSI-fication Jeff Johnston
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).