This commit was manufactured by cvs2svn to create tag 'newlib-2_1_0'.newlib-2_1_0

Sprout from newlib-2_2_0 2014-12-18 20:30:12 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'newlib-2_2_0'.'
Cherrypick from master 2013-12-23 20:45:10 UTC Jeff Johnston <jjohnstn@redhat.com> '2013-12-23  Jeff Johnston  <jjohnstn@redhat.com>':
    COPYING.NEWLIB
    ChangeLog
    config.guess
    config.sub
    config/ChangeLog
    configure
    configure.ac
    libgloss/ChangeLog
    libgloss/README
    libgloss/aarch64/Makefile.in
    libgloss/aarch64/cpu-init/rdimon-aem-el3.S
    libgloss/arm/Makefile.in
    libgloss/arm/configure
    libgloss/arm/configure.in
    libgloss/arm/elf-aprofile-validation.specs
    libgloss/arm/elf-aprofile-ve.specs
    libgloss/arm/elf-rdimon.specs
    libgloss/arm/syscalls.c
    libgloss/bfin/Makefile.in
    libgloss/configure
    libgloss/configure.in
    libgloss/libnosys/nosys.specs
    libgloss/libnosys/sbrk.c
    libgloss/mips/crt0.S
    libgloss/mips/mti32.ld
    libgloss/mips/mti64.ld
    libgloss/mips/mti64_64.ld
    libgloss/mips/mti64_n32.ld
    libgloss/mips/regs.S
    libgloss/moxie/Makefile.in
    libgloss/moxie/configure
    libgloss/moxie/configure.in
    libgloss/msp430/Makefile.in
    libgloss/msp430/crt0.S
    libgloss/msp430/crtn.S
    libgloss/msp430/msp430-sim.ld
    libgloss/msp430/msp430.ld
    libgloss/msp430/msp430xl-sim.ld
    libgloss/msp430/nosyscalls.S
    libgloss/nds32/Makefile.in
    libgloss/nds32/crt0.S
    libgloss/nds32/crt1.S
    libgloss/nds32/syscall_argv.S
    libgloss/nds32/syscall_argvlen.S
    libgloss/nds32/syscall_chdir.S
    libgloss/nds32/syscall_chmod.S
    libgloss/nds32/syscall_close.S
    libgloss/nds32/syscall_exit.S
    libgloss/nds32/syscall_extra.h
    libgloss/nds32/syscall_fstat.S
    libgloss/nds32/syscall_getpid.S
    libgloss/nds32/syscall_gettimeofday.S
    libgloss/nds32/syscall_isatty.S
    libgloss/nds32/syscall_kill.S
    libgloss/nds32/syscall_link.S
    libgloss/nds32/syscall_lseek.S
    libgloss/nds32/syscall_open.S
    libgloss/nds32/syscall_read.S
    libgloss/nds32/syscall_rename.S
    libgloss/nds32/syscall_sbrk.S
    libgloss/nds32/syscall_stat.S
    libgloss/nds32/syscall_system.S
    libgloss/nds32/syscall_time.S
    libgloss/nds32/syscall_times.S
    libgloss/nds32/syscall_unlink.S
    libgloss/nds32/syscall_utime.S
    libgloss/nds32/syscall_write.S
    ltmain.sh
    newlib/ChangeLog
    newlib/NEWS
    newlib/README
    newlib/acconfig.h
    newlib/acinclude.m4
    newlib/configure
    newlib/configure.host
    newlib/configure.in
    newlib/doc/configure
    newlib/iconvdata/configure
    newlib/libc/argz/envz_merge.c
    newlib/libc/configure
    newlib/libc/configure.in
    newlib/libc/ctype/iswalpha.c
    newlib/libc/ctype/jp2uc.c
    newlib/libc/include/_ansi.h
    newlib/libc/include/grp.h
    newlib/libc/include/inttypes.h
    newlib/libc/include/machine/_default_types.h
    newlib/libc/include/machine/ieeefp.h
    newlib/libc/include/machine/setjmp.h
    newlib/libc/include/math.h
    newlib/libc/include/pwd.h
    newlib/libc/include/setjmp.h
    newlib/libc/include/stdint.h
    newlib/libc/include/stdio.h
    newlib/libc/include/stdio_ext.h
    newlib/libc/include/stdlib.h
    newlib/libc/include/string.h
    newlib/libc/include/sys/_default_fcntl.h
    newlib/libc/include/sys/config.h
    newlib/libc/include/sys/errno.h
    newlib/libc/include/sys/features.h
    newlib/libc/include/sys/resource.h
    newlib/libc/include/sys/signal.h
    newlib/libc/include/sys/stat.h
    newlib/libc/include/sys/time.h
    newlib/libc/include/sys/unistd.h
    newlib/libc/include/time.h
    newlib/libc/include/wchar.h
    newlib/libc/libc.texinfo
    newlib/libc/locale/ldpart.c
    newlib/libc/machine/a29k/configure
    newlib/libc/machine/aarch64/Makefile.am
    newlib/libc/machine/aarch64/Makefile.in
    newlib/libc/machine/aarch64/configure
    newlib/libc/machine/arm/Makefile.am
    newlib/libc/machine/arm/Makefile.in
    newlib/libc/machine/arm/arm_asm.h
    newlib/libc/machine/arm/configure
    newlib/libc/machine/arm/configure.in
    newlib/libc/machine/arm/memchr-stub.c
    newlib/libc/machine/arm/memchr.S
    newlib/libc/machine/arm/memcpy-stub.c
    newlib/libc/machine/arm/memcpy.S
    newlib/libc/machine/arm/strcmp.S
    newlib/libc/machine/arm/strlen.c
    newlib/libc/machine/bfin/configure
    newlib/libc/machine/configure
    newlib/libc/machine/configure.in
    newlib/libc/machine/cr16/configure
    newlib/libc/machine/cris/configure
    newlib/libc/machine/crx/configure
    newlib/libc/machine/d10v/configure
    newlib/libc/machine/d30v/configure
    newlib/libc/machine/epiphany/configure
    newlib/libc/machine/fr30/configure
    newlib/libc/machine/frv/configure
    newlib/libc/machine/h8300/configure
    newlib/libc/machine/h8500/configure
    newlib/libc/machine/hppa/configure
    newlib/libc/machine/i386/configure
    newlib/libc/machine/i960/configure
    newlib/libc/machine/iq2000/configure
    newlib/libc/machine/lm32/configure
    newlib/libc/machine/m32c/configure
    newlib/libc/machine/m32r/configure
    newlib/libc/machine/m68hc11/configure
    newlib/libc/machine/m68k/configure
    newlib/libc/machine/m88k/configure
    newlib/libc/machine/mep/configure
    newlib/libc/machine/microblaze/configure
    newlib/libc/machine/mips/Makefile.am
    newlib/libc/machine/mips/Makefile.in
    newlib/libc/machine/mips/configure
    newlib/libc/machine/mips/setjmp.S
    newlib/libc/machine/mips/strcmp.c
    newlib/libc/machine/mn10200/configure
    newlib/libc/machine/mn10300/configure
    newlib/libc/machine/moxie/configure
    newlib/libc/machine/msp430/configure
    newlib/libc/machine/mt/configure
    newlib/libc/machine/nds32/Makefile.am
    newlib/libc/machine/nds32/Makefile.in
    newlib/libc/machine/nds32/configure
    newlib/libc/machine/nds32/configure.in
    newlib/libc/machine/nds32/setjmp.S
    newlib/libc/machine/necv70/configure
    newlib/libc/machine/nios2/configure
    newlib/libc/machine/powerpc/configure
    newlib/libc/machine/rl78/configure
    newlib/libc/machine/rl78/setjmp.S
    newlib/libc/machine/rx/configure
    newlib/libc/machine/sh/configure
    newlib/libc/machine/sparc/configure
    newlib/libc/machine/sparc/setjmp.S
    newlib/libc/machine/spu/configure
    newlib/libc/machine/spu/spu_timer_internal.h
    newlib/libc/machine/tic4x/configure
    newlib/libc/machine/tic6x/configure
    newlib/libc/machine/tic80/configure
    newlib/libc/machine/v850/configure
    newlib/libc/machine/w65/configure
    newlib/libc/machine/x86_64/configure
    newlib/libc/machine/xc16x/configure
    newlib/libc/machine/xscale/configure
    newlib/libc/machine/xscale/machine/profile.h
    newlib/libc/machine/xstormy16/configure
    newlib/libc/machine/z8k/configure
    newlib/libc/search/Makefile.am
    newlib/libc/search/Makefile.in
    newlib/libc/search/hash.c
    newlib/libc/search/qsort.c
    newlib/libc/stdio/Makefile.am
    newlib/libc/stdio/Makefile.in
    newlib/libc/stdio/asnprintf.c
    newlib/libc/stdio/asprintf.c
    newlib/libc/stdio/clearerr.c
    newlib/libc/stdio/dprintf.c
    newlib/libc/stdio/fclose.c
    newlib/libc/stdio/feof.c
    newlib/libc/stdio/ferror.c
    newlib/libc/stdio/fflush.c
    newlib/libc/stdio/fgetc.c
    newlib/libc/stdio/fgets.c
    newlib/libc/stdio/fgetwc.c
    newlib/libc/stdio/fgetws.c
    newlib/libc/stdio/fileno.c
    newlib/libc/stdio/findfp.c
    newlib/libc/stdio/fprintf.c
    newlib/libc/stdio/fputc.c
    newlib/libc/stdio/fputs.c
    newlib/libc/stdio/fputwc.c
    newlib/libc/stdio/fputws.c
    newlib/libc/stdio/fread.c
    newlib/libc/stdio/fscanf.c
    newlib/libc/stdio/fwalk.c
    newlib/libc/stdio/fwrite.c
    newlib/libc/stdio/getwchar.c
    newlib/libc/stdio/local.h
    newlib/libc/stdio/open_memstream.c
    newlib/libc/stdio/printf.c
    newlib/libc/stdio/putwchar.c
    newlib/libc/stdio/scanf.c
    newlib/libc/stdio/snprintf.c
    newlib/libc/stdio/sprintf.c
    newlib/libc/stdio/sscanf.c
    newlib/libc/stdio/stdio.tex
    newlib/libc/stdio/vasnprintf.c
    newlib/libc/stdio/vasprintf.c
    newlib/libc/stdio/vdprintf.c
    newlib/libc/stdio/vfprintf.c
    newlib/libc/stdio/vprintf.c
    newlib/libc/stdio/vscanf.c
    newlib/libc/stdio/vsnprintf.c
    newlib/libc/stdio/vsprintf.c
    newlib/libc/stdio/vsscanf.c
    newlib/libc/stdlib/Makefile.am
    newlib/libc/stdlib/Makefile.in
    newlib/libc/stdlib/gd_qnan.h
    newlib/libc/stdlib/ldtoa.c
    newlib/libc/stdlib/nano-mallocr.c
    newlib/libc/stdlib/strtod.c
    newlib/libc/stdlib/strtold.c
    newlib/libc/string/local.h
    newlib/libc/string/memccpy.c
    newlib/libc/string/memchr.c
    newlib/libc/string/memrchr.c
    newlib/libc/string/memset.c
    newlib/libc/string/rawmemchr.c
    newlib/libc/string/strcasestr.c
    newlib/libc/string/strerror.c
    newlib/libc/string/u_strerr.c
    newlib/libc/sys/a29khif/configure
    newlib/libc/sys/arc/configure
    newlib/libc/sys/arm/configure
    newlib/libc/sys/arm/syscalls.c
    newlib/libc/sys/configure
    newlib/libc/sys/configure.in
    newlib/libc/sys/d10v/configure
    newlib/libc/sys/decstation/configure
    newlib/libc/sys/epiphany/configure
    newlib/libc/sys/h8300hms/configure
    newlib/libc/sys/h8500hms/configure
    newlib/libc/sys/linux/configure
    newlib/libc/sys/linux/dl/atomicity.h
    newlib/libc/sys/linux/dl/dynamic-link.h
    newlib/libc/sys/linux/dl/ldsodefs.h
    newlib/libc/sys/linux/iconv/gconv_charset.h
    newlib/libc/sys/linux/include/resolv.h
    newlib/libc/sys/linux/libc-symbols.h
    newlib/libc/sys/linux/linuxthreads/configure
    newlib/libc/sys/linux/linuxthreads/internals.h
    newlib/libc/sys/linux/linuxthreads/libc-symbols.h
    newlib/libc/sys/linux/linuxthreads/machine/configure
    newlib/libc/sys/linux/linuxthreads/machine/i386/configure
    newlib/libc/sys/linux/machine/configure
    newlib/libc/sys/linux/machine/i386/configure
    newlib/libc/sys/linux/machine/i386/dl-machine.h
    newlib/libc/sys/linux/machine/i386/dl-procinfo.h
    newlib/libc/sys/linux/machine/i386/weakalias.h
    newlib/libc/sys/linux/shared.ld
    newlib/libc/sys/linux/sys/unistd.h
    newlib/libc/sys/m88kbug/configure
    newlib/libc/sys/mmixware/configure
    newlib/libc/sys/netware/configure
    newlib/libc/sys/rdos/configure
    newlib/libc/sys/rtems/configure
    newlib/libc/sys/rtems/sys/cpuset.h
    newlib/libc/sys/rtems/sys/syslimits.h
    newlib/libc/sys/sh/configure
    newlib/libc/sys/sparc64/configure
    newlib/libc/sys/sun4/configure
    newlib/libc/sys/sysmec/configure
    newlib/libc/sys/sysnec810/configure
    newlib/libc/sys/sysnecv850/configure
    newlib/libc/sys/sysvi386/configure
    newlib/libc/sys/sysvnecv70/configure
    newlib/libc/sys/tic80/configure
    newlib/libc/sys/w65/configure
    newlib/libc/sys/z8ksim/configure
    newlib/libc/time/Makefile.am
    newlib/libc/time/Makefile.in
    newlib/libc/time/clock.c
    newlib/libc/time/gmtime_r.c
    newlib/libc/time/lcltime_r.c
    newlib/libc/time/local.h
    newlib/libc/time/mktm_r.c
    newlib/libc/time/strftime.c
    newlib/libc/time/strptime.c
    newlib/libc/unix/getcwd.c
    newlib/libm/common/Makefile.am
    newlib/libm/common/Makefile.in
    newlib/libm/common/s_nan.c
    newlib/libm/common/sf_nan.c
    newlib/libm/complex/complex.tex
    newlib/libm/configure
    newlib/libm/libm.texinfo
    newlib/libm/machine/aarch64/configure
    newlib/libm/machine/arm/configure
    newlib/libm/machine/configure
    newlib/libm/machine/configure.in
    newlib/libm/machine/i386/configure
    newlib/libm/machine/spu/configure
    newlib/libm/math/math.tex
    newlib/libm/mathfp/sf_numtest.c
    newlib/newlib.hin
Delete:
    config/mt-nios2-elf
    libgloss/arm/elf-nano.specs
    libgloss/mips/abiflags.S
    libgloss/moxie/moxiebox.ld
    libgloss/msp430/ciosyscalls.S
    libgloss/msp430/unlink.c
    libgloss/nds32/_argv.S
    libgloss/nds32/_argvlen.S
    libgloss/nds32/_chdir.S
    libgloss/nds32/_chmod.S
    libgloss/nds32/_close.S
    libgloss/nds32/_exit.S
    libgloss/nds32/_fstat.S
    libgloss/nds32/_getpid.S
    libgloss/nds32/_gettimeofday.S
    libgloss/nds32/_isatty.S
    libgloss/nds32/_kill.S
    libgloss/nds32/_link.S
    libgloss/nds32/_lseek.S
    libgloss/nds32/_open.S
    libgloss/nds32/_read.S
    libgloss/nds32/_rename.S
    libgloss/nds32/_sbrk.S
    libgloss/nds32/_stat.S
    libgloss/nds32/_system.S
    libgloss/nds32/_time.S
    libgloss/nds32/_times.S
    libgloss/nds32/_unlink.S
    libgloss/nds32/_utime.S
    libgloss/nds32/_write.S
    libgloss/nds32/syscall_error_handler.S
    libgloss/nds32/vh.h
    libgloss/or1k/Makefile.in
    libgloss/or1k/README
    libgloss/or1k/aclocal.m4
    libgloss/or1k/board.h
    libgloss/or1k/boards/README
    libgloss/or1k/boards/atlys.S
    libgloss/or1k/boards/de0_nano.S
    libgloss/or1k/boards/ml501.S
    libgloss/or1k/boards/ml509.S
    libgloss/or1k/boards/optimsoc.S
    libgloss/or1k/boards/or1ksim-uart.S
    libgloss/or1k/boards/or1ksim.S
    libgloss/or1k/boards/ordb1a3pe1500.S
    libgloss/or1k/boards/ordb2a.S
    libgloss/or1k/boards/orpsocrefdesign.S
    libgloss/or1k/boards/tmpl.S
    libgloss/or1k/boards/tmpl.c
    libgloss/or1k/caches-asm.S
    libgloss/or1k/configure
    libgloss/or1k/configure.in
    libgloss/or1k/crt0.S
    libgloss/or1k/exceptions-asm.S
    libgloss/or1k/exceptions.c
    libgloss/or1k/impure.c
    libgloss/or1k/include/or1k-asm.h
    libgloss/or1k/include/or1k-nop.h
    libgloss/or1k/include/or1k-support.h
    libgloss/or1k/interrupts-asm.S
    libgloss/or1k/interrupts.c
    libgloss/or1k/mmu-asm.S
    libgloss/or1k/or1k-internals.h
    libgloss/or1k/or1k_uart.c
    libgloss/or1k/or1k_uart.h
    libgloss/or1k/outbyte.S
    libgloss/or1k/sbrk.c
    libgloss/or1k/sync-asm.S
    libgloss/or1k/syscalls.c
    libgloss/or1k/timer.c
    libgloss/or1k/util.c
    newlib/libc/include/sys/_intsup.h
    newlib/libc/machine/aarch64/memchr-stub.c
    newlib/libc/machine/aarch64/memchr.S
    newlib/libc/machine/aarch64/strchr-stub.c
    newlib/libc/machine/aarch64/strchr.S
    newlib/libc/machine/aarch64/strchrnul-stub.c
    newlib/libc/machine/aarch64/strchrnul.S
    newlib/libc/machine/aarch64/strcpy-stub.c
    newlib/libc/machine/aarch64/strcpy.S
    newlib/libc/machine/aarch64/strrchr-stub.c
    newlib/libc/machine/aarch64/strrchr.S
    newlib/libc/machine/arm/acle-compat.h
    newlib/libc/machine/arm/aeabi_memcpy-armv7a.S
    newlib/libc/machine/arm/aeabi_memcpy.c
    newlib/libc/machine/arm/strcmp-arm-tiny.S
    newlib/libc/machine/arm/strcmp-armv4.S
    newlib/libc/machine/arm/strcmp-armv4t.S
    newlib/libc/machine/arm/strcmp-armv6.S
    newlib/libc/machine/arm/strcmp-armv6m.S
    newlib/libc/machine/arm/strcmp-armv7.S
    newlib/libc/machine/arm/strcmp-armv7m.S
    newlib/libc/machine/mips/strcmp.S
    newlib/libc/machine/or1k/Makefile.am
    newlib/libc/machine/or1k/Makefile.in
    newlib/libc/machine/or1k/aclocal.m4
    newlib/libc/machine/or1k/configure
    newlib/libc/machine/or1k/configure.in
    newlib/libc/machine/or1k/setjmp.S
    newlib/libc/search/bsd_qsort_r.c
    newlib/libc/search/qsort_r.c
    newlib/libc/stdio/clearerr_u.c
    newlib/libc/stdio/feof_u.c
    newlib/libc/stdio/ferror_u.c
    newlib/libc/stdio/fflush_u.c
    newlib/libc/stdio/fgetc_u.c
    newlib/libc/stdio/fgets_u.c
    newlib/libc/stdio/fgetwc_u.c
    newlib/libc/stdio/fgetws_u.c
    newlib/libc/stdio/fileno_u.c
    newlib/libc/stdio/fputc_u.c
    newlib/libc/stdio/fputs_u.c
    newlib/libc/stdio/fputwc_u.c
    newlib/libc/stdio/fputws_u.c
    newlib/libc/stdio/fread_u.c
    newlib/libc/stdio/fsetlocking.c
    newlib/libc/stdio/fwrite_u.c
    newlib/libc/stdio/getwc_u.c
    newlib/libc/stdio/getwchar_u.c
    newlib/libc/stdio/nano-vfprintf.c
    newlib/libc/stdio/nano-vfprintf_float.c
    newlib/libc/stdio/nano-vfprintf_i.c
    newlib/libc/stdio/nano-vfprintf_local.h
    newlib/libc/stdio/nano-vfscanf.c
    newlib/libc/stdio/nano-vfscanf_float.c
    newlib/libc/stdio/nano-vfscanf_i.c
    newlib/libc/stdio/nano-vfscanf_local.h
    newlib/libc/stdio/putwc_u.c
    newlib/libc/stdio/putwchar_u.c
    newlib/libc/stdio/stdio_ext.c
    newlib/libc/stdlib/itoa.c
    newlib/libc/stdlib/utoa.c
    newlib/libc/sys/tirtos/Makefile.am
    newlib/libc/sys/tirtos/Makefile.in
    newlib/libc/sys/tirtos/aclocal.m4
    newlib/libc/sys/tirtos/configure
    newlib/libc/sys/tirtos/configure.in
    newlib/libc/sys/tirtos/include/sys/lock.h
    newlib/libc/sys/tirtos/lock.c
    newlib/libc/time/month_lengths.c
    newlib/libc/time/tzcalc_limits.c
    newlib/libm/common/log2l.c
    newlib/libm/common/logbl.c
    newlib/libm/common/nexttoward.c
    newlib/libm/common/nexttowardf.c
    newlib/libm/common/nexttowardl.c
    newlib/libm/machine/nds32/Makefile.am
    newlib/libm/machine/nds32/Makefile.in
    newlib/libm/machine/nds32/aclocal.m4
    newlib/libm/machine/nds32/configure
    newlib/libm/machine/nds32/configure.in
    newlib/libm/machine/nds32/w_sqrt.S
    newlib/libm/machine/nds32/wf_sqrt.S
    newlib/testsuite/newlib.stdio/nulprintf.c

1 files changed, 34 insertions, 57 deletions

diff --git a/newlib/libc/include/string.h b/newlib/libc/include/string.h
index af5c9da4d..6325b46bf 100644
--- a/newlib/libc/include/string.h
+++ b/newlib/libc/include/string.h
@@ -38,114 +38,75 @@ 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 *));
+
 #ifndef _REENT_ONLY
 char 	*_EXFUN(strtok,(char *__restrict, const char *__restrict));
 #endif
+
 size_t	 _EXFUN(strxfrm,(char *__restrict, const char *__restrict, size_t));
 
-#if __POSIX_VISIBLE
+#ifndef __STRICT_ANSI__
 char 	*_EXFUN(strtok_r,(char *__restrict, const char *__restrict, char **__restrict));
-#endif
-#if __BSD_VISIBLE
+
 int	 _EXFUN(bcmp,(const void *, const void *, size_t));
 void	 _EXFUN(bcopy,(const void *, void *, size_t));
 void	 _EXFUN(bzero,(void *, size_t));
 int	 _EXFUN(ffs,(int));
 char 	*_EXFUN(index,(const char *, int));
-#endif
-#if __BSD_VISIBLE || __XSI_VISIBLE
 _PTR	 _EXFUN(memccpy,(_PTR __restrict, const _PTR __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));
-#endif
 _PTR 	 _EXFUN(memrchr,(const _PTR, int, size_t));
-#if __GNU_VISIBLE
 _PTR 	 _EXFUN(rawmemchr,(const _PTR, int));
-#endif
-#if __BSD_VISIBLE
 char 	*_EXFUN(rindex,(const char *, int));
-#endif
 char 	*_EXFUN(stpcpy,(char *__restrict, const char *__restrict));
 char 	*_EXFUN(stpncpy,(char *__restrict, const char *__restrict, size_t));
-#if __BSD_VISIBLE || __POSIX_VISIBLE
 int	 _EXFUN(strcasecmp,(const char *, const char *));
-#endif
-#if __GNU_VISIBLE
 char	*_EXFUN(strcasestr,(const char *, const char *));
 char 	*_EXFUN(strchrnul,(const char *, int));
 #endif
-#if __XSI_VISIBLE >= 500
+#if !defined(__STRICT_ANSI__) || (_XOPEN_SOURCE - 0) >= 500
 char 	*_EXFUN(strdup,(const char *));
 #endif
 #ifndef __STRICT_ANSI__
 char 	*_EXFUN(_strdup_r,(struct _reent *, const char *));
 #endif
-#if __XSI_VISIBLE >= 700
+#if !defined(__STRICT_ANSI__) || (_XOPEN_SOURCE - 0) >= 700
 char 	*_EXFUN(strndup,(const char *, size_t));
 #endif
-
 #ifndef __STRICT_ANSI__
 char 	*_EXFUN(_strndup_r,(struct _reent *, const char *, size_t));
-#endif
-
-#if __GNU_VISIBLE
-int	 _EXFUN(ffsl,(long));
-int	 _EXFUN(ffsll, (long long));
-#endif
-
 /* 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));
+#ifdef _GNU_SOURCE
+char    *_EXFUN(strerror_r,(int, char *, size_t));
 #else
 # ifdef __GNUC__
-int	_EXFUN(strerror_r,(int, char *, size_t))
-             __asm__ (__ASMNAME ("__xpg_strerror_r"));
+int      _EXFUN(strerror_r,(int, char *, size_t)) __asm__ (__ASMNAME ("__xpg_strerror_r"));
 # else
-int	_EXFUN(__xpg_strerror_r,(int, char *, size_t));
+int      _EXFUN(__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 *));
-
-#if __BSD_VISIBLE
-size_t	_EXFUN(strlcat,(char *, const char *, size_t));
-size_t	_EXFUN(strlcpy,(char *, const char *, size_t));
-#endif
-#if __BSD_VISIBLE || __POSIX_VISIBLE
-int	_EXFUN(strncasecmp,(const char *, const char *, size_t));
-#endif
-#if !defined(__STRICT_ANSI__) || __POSIX_VISIBLE >= 200809 || \
-    __XSI_VISIBLE >= 700
+size_t	 _EXFUN(strlcat,(char *, const char *, size_t));
+size_t	 _EXFUN(strlcpy,(char *, const char *, size_t));
+int	 _EXFUN(strncasecmp,(const char *, const char *, size_t));
 size_t	 _EXFUN(strnlen,(const char *, size_t));
-#endif
-#if __BSD_VISIBLE
 char 	*_EXFUN(strsep,(char **, const char *));
-#endif
-
-/*
- * The origin of these is unknown to me so I am conditionalizing them
- * on __STRICT_ANSI__. Finetuning this is definitely needed. --joel
- */
-#if !defined(__STRICT_ANSI__)
 char	*_EXFUN(strlwr,(char *));
 char	*_EXFUN(strupr,(char *));
-#endif
-
 #ifndef DEFS_H	/* Kludge to work around problem compiling in gdb */
-char	*_EXFUN(strsignal, (int __signo));
+char  *_EXFUN(strsignal, (int __signo));
 #endif
-
 #ifdef __CYGWIN__
-int	_EXFUN(strtosigno, (const char *__name));
+int     _EXFUN(strtosigno, (const char *__name));
 #endif
 
+/* Recursive version of strerror.  */
+char *	_EXFUN(_strerror_r, (struct _reent *, int, int, int *));
+
 #if defined _GNU_SOURCE && defined __GNUC__
 #define strdupa(__s) \
 	(__extension__ ({const char *__in = (__s); \
@@ -160,6 +121,22 @@ int	_EXFUN(strtosigno, (const char *__name));
 			 (char *) memcpy (__out, __in, __len-1);}))
 #endif /* _GNU_SOURCE && __GNUC__ */
 
+/* These function names are used on Windows and perhaps other systems.  */
+#ifndef strcmpi
+#define strcmpi strcasecmp
+#endif
+#ifndef stricmp
+#define stricmp strcasecmp
+#endif
+#ifndef strncmpi
+#define strncmpi strncasecmp
+#endif
+#ifndef strnicmp
+#define strnicmp strncasecmp
+#endif
+
+#endif /* ! __STRICT_ANSI__ */
+
 #include <sys/string.h>
 
 _END_STD_C