Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Switch the iconv(3) prototype to the POSIX conformant variation



details:   https://anonhg.NetBSD.org/src/rev/e7acf7335690
branches:  trunk
changeset: 460483:e7acf7335690
user:      kamil <kamil%NetBSD.org@localhost>
date:      Thu Oct 24 18:17:14 2019 +0000

description:
Switch the iconv(3) prototype to the POSIX conformant variation

Remove const from the 2nd argument.

const char ** and char ** are incompatible types and it was a cost to keep
the technically incompatible form for a more purist variation. NetBSD was
almost the last alive OS to still keep the const argument (known leftovers:
Minix and Illumos).

Keep the const form for the internal purposes inside citrus and rump.

Address the build breakage fallout in the same change.

There are no ABI changes.

Change accepted by core@.

diffstat:

 external/bsd/libarchive/include/config_netbsd.h                        |   2 +-
 external/bsd/nvi/dist/common/conv.c                                    |   9 ++---
 external/bsd/smbfs/dist/lib/smb/nls.c                                  |  10 +++---
 external/gpl2/gettext/include/config.h                                 |   3 +-
 external/gpl2/grep/include/config.h                                    |   2 +-
 external/gpl2/texinfo/include/config.h                                 |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/aarch64/config.h        |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/aarch64eb/config.h      |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/alpha/config.h          |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/arm/config.h            |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/armeb/config.h          |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/coldfire/config.h       |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/earm/config.h           |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/earmeb/config.h         |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/earmhf/config.h         |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/earmhfeb/config.h       |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/hppa/config.h           |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/i386/config.h           |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/ia64/config.h           |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/m68000/config.h         |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/m68k/config.h           |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/mips64eb/config.h       |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/mips64el/config.h       |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/mipseb/config.h         |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/mipsel/config.h         |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/or1k/config.h           |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/powerpc/config.h        |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/powerpc64/config.h      |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/riscv32/config.h        |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/riscv64/config.h        |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/sh3eb/config.h          |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/sh3el/config.h          |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/sparc/config.h          |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/sparc64/config.h        |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/vax/config.h            |   2 +-
 external/gpl3/binutils.old/usr.bin/common/arch/x86_64/config.h         |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/aarch64/config.h            |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/aarch64eb/config.h          |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/alpha/config.h              |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/arm/config.h                |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/armeb/config.h              |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/coldfire/config.h           |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/earm/config.h               |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/earmeb/config.h             |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/earmhf/config.h             |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/earmhfeb/config.h           |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/hppa/config.h               |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/i386/config.h               |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/ia64/config.h               |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/m68000/config.h             |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/m68k/config.h               |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/mips64eb/config.h           |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/mips64el/config.h           |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/mipseb/config.h             |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/mipsel/config.h             |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/or1k/config.h               |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/powerpc/config.h            |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/powerpc64/config.h          |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/riscv32/config.h            |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/riscv64/config.h            |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/sh3eb/config.h              |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/sh3el/config.h              |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/sparc/config.h              |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/sparc64/config.h            |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/vax/config.h                |   2 +-
 external/gpl3/binutils/usr.bin/common/arch/x86_64/config.h             |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/aarch64/c++config.h        |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/aarch64/symver-config.h    |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/alpha/c++config.h          |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/alpha/symver-config.h      |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/arm/c++config.h            |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/arm/symver-config.h        |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/armeb/c++config.h          |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/armeb/symver-config.h      |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/coldfire/c++config.h       |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earm/c++config.h           |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earm/symver-config.h       |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmeb/c++config.h         |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmeb/symver-config.h     |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmhf/c++config.h         |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmhf/symver-config.h     |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmhfeb/c++config.h       |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmhfeb/symver-config.h   |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv4/c++config.h         |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv4/symver-config.h     |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv4eb/c++config.h       |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv4eb/symver-config.h   |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6/c++config.h         |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6/symver-config.h     |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6eb/c++config.h       |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6eb/symver-config.h   |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6hf/c++config.h       |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6hf/symver-config.h   |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6hfeb/c++config.h     |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv6hfeb/symver-config.h |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7/c++config.h         |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7/symver-config.h     |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7eb/c++config.h       |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7eb/symver-config.h   |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7hf/c++config.h       |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7hf/symver-config.h   |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7hfeb/c++config.h     |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/earmv7hfeb/symver-config.h |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/hppa/c++config.h           |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/hppa/symver-config.h       |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/i386/c++config.h           |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/i386/symver-config.h       |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/ia64/c++config.h           |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/ia64/symver-config.h       |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/m68000/c++config.h         |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/m68000/symver-config.h     |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/m68k/c++config.h           |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/m68k/symver-config.h       |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/mips64eb/c++config.h       |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/mips64eb/symver-config.h   |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/mips64el/c++config.h       |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/mips64el/symver-config.h   |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/mipseb/c++config.h         |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/mipseb/symver-config.h     |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/mipsel/c++config.h         |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/mipsel/symver-config.h     |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/or1k/c++config.h           |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/powerpc/c++config.h        |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/powerpc/symver-config.h    |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/powerpc64/c++config.h      |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/powerpc64/symver-config.h  |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/riscv32/c++config.h        |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/riscv32/symver-config.h    |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/riscv64/c++config.h        |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/riscv64/symver-config.h    |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/sh3eb/c++config.h          |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/sh3eb/symver-config.h      |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/sh3el/c++config.h          |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/sh3el/symver-config.h      |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/sparc/c++config.h          |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/sparc/symver-config.h      |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/sparc64/c++config.h        |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/sparc64/symver-config.h    |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/vax/c++config.h            |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/vax/symver-config.h        |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/x86_64/c++config.h         |   2 +-
 external/gpl3/gcc.old/lib/libstdc++-v3/arch/x86_64/symver-config.h     |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/aarch64/auto-host.h             |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/alpha/auto-host.h               |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/arm/auto-host.h                 |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/armeb/auto-host.h               |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/coldfire/auto-host.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/earm/auto-host.h                |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/earmeb/auto-host.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/earmhf/auto-host.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/earmhfeb/auto-host.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/earmv4/auto-host.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/earmv4eb/auto-host.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/earmv6/auto-host.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/earmv6eb/auto-host.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/earmv6hf/auto-host.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/earmv6hfeb/auto-host.h          |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/earmv7/auto-host.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/earmv7eb/auto-host.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/earmv7hf/auto-host.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/earmv7hfeb/auto-host.h          |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/hppa/auto-host.h                |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/i386/auto-host.h                |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/ia64/auto-host.h                |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/m68000/auto-host.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/m68k/auto-host.h                |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/mips64eb/auto-host.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/mips64el/auto-host.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/mipseb/auto-host.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/mipsel/auto-host.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/or1k/auto-host.h                |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/powerpc/auto-host.h             |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/powerpc64/auto-host.h           |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/riscv32/auto-host.h             |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/riscv64/auto-host.h             |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/sh3eb/auto-host.h               |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/sh3el/auto-host.h               |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/sparc/auto-host.h               |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/sparc64/auto-host.h             |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/vax/auto-host.h                 |   2 +-
 external/gpl3/gcc.old/usr.bin/gcc/arch/x86_64/auto-host.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/aarch64/config.h             |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/alpha/config.h               |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/arm/config.h                 |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/armeb/config.h               |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/coldfire/config.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/earm/config.h                |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/earmeb/config.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/earmhf/config.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/earmhfeb/config.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/earmv4/config.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/earmv4eb/config.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/earmv6/config.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/earmv6eb/config.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/earmv6hf/config.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/earmv6hfeb/config.h          |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/earmv7/config.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/earmv7eb/config.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/earmv7hf/config.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/earmv7hfeb/config.h          |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/hppa/config.h                |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/i386/config.h                |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/ia64/config.h                |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/m68000/config.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/m68k/config.h                |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/mips64eb/config.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/mips64el/config.h            |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/mipseb/config.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/mipsel/config.h              |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/or1k/config.h                |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/powerpc/config.h             |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/powerpc64/config.h           |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/riscv32/config.h             |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/riscv64/config.h             |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/sh3eb/config.h               |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/sh3el/config.h               |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/sparc/config.h               |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/sparc64/config.h             |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/vax/config.h                 |   2 +-
 external/gpl3/gcc.old/usr.bin/libcpp/arch/x86_64/config.h              |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/c++config.h            |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/symver-config.h        |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/c++config.h              |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/symver-config.h          |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++config.h                |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/arm/symver-config.h            |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/armeb/c++config.h              |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/armeb/symver-config.h          |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire/c++config.h           |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++config.h               |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earm/symver-config.h           |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++config.h             |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/symver-config.h         |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++config.h             |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/symver-config.h         |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++config.h           |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/symver-config.h       |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++config.h             |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/symver-config.h         |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/c++config.h           |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/symver-config.h       |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++config.h             |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/symver-config.h         |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/c++config.h           |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/symver-config.h       |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/c++config.h           |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/symver-config.h       |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/c++config.h         |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/symver-config.h     |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/c++config.h             |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/symver-config.h         |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/c++config.h           |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/symver-config.h       |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/c++config.h           |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/symver-config.h       |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/c++config.h         |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/symver-config.h     |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/c++config.h               |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/symver-config.h           |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h               |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/i386/symver-config.h           |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/c++config.h               |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/symver-config.h           |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/c++config.h             |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/symver-config.h         |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/c++config.h               |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/symver-config.h           |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb/c++config.h           |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb/symver-config.h       |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el/c++config.h           |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el/symver-config.h       |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/c++config.h             |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/symver-config.h         |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/c++config.h             |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/symver-config.h         |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/or1k/c++config.h               |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h            |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/symver-config.h        |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64/c++config.h          |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64/symver-config.h      |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32/c++config.h            |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32/symver-config.h        |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64/c++config.h            |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64/symver-config.h        |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb/c++config.h              |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb/symver-config.h          |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/c++config.h              |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el/symver-config.h          |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/c++config.h              |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/symver-config.h          |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/c++config.h            |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64/symver-config.h        |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/vax/c++config.h                |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/vax/symver-config.h            |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/c++config.h             |   2 +-
 external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/symver-config.h         |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/aarch64/auto-host.h                 |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/alpha/auto-host.h                   |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/arm/auto-host.h                     |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/armeb/auto-host.h                   |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/coldfire/auto-host.h                |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earm/auto-host.h                    |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmeb/auto-host.h                  |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmhf/auto-host.h                  |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/auto-host.h                |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmv4/auto-host.h                  |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb/auto-host.h                |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmv6/auto-host.h                  |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmv6eb/auto-host.h                |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmv6hf/auto-host.h                |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmv6hfeb/auto-host.h              |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmv7/auto-host.h                  |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmv7eb/auto-host.h                |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmv7hf/auto-host.h                |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmv7hfeb/auto-host.h              |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/hppa/auto-host.h                    |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/i386/auto-host.h                    |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/ia64/auto-host.h                    |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/m68000/auto-host.h                  |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/m68k/auto-host.h                    |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/mips64eb/auto-host.h                |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/mips64el/auto-host.h                |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/mipseb/auto-host.h                  |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/mipsel/auto-host.h                  |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/or1k/auto-host.h                    |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/powerpc/auto-host.h                 |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/powerpc64/auto-host.h               |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/riscv32/auto-host.h                 |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/riscv64/auto-host.h                 |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/sh3eb/auto-host.h                   |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/sh3el/auto-host.h                   |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/sparc/auto-host.h                   |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/sparc64/auto-host.h                 |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/vax/auto-host.h                     |   2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/x86_64/auto-host.h                  |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/aarch64/config.h                 |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/alpha/config.h                   |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/arm/config.h                     |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/armeb/config.h                   |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/coldfire/config.h                |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/earm/config.h                    |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/earmeb/config.h                  |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/earmhf/config.h                  |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/earmhfeb/config.h                |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/earmv4/config.h                  |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/earmv4eb/config.h                |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/earmv6/config.h                  |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/earmv6eb/config.h                |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/earmv6hf/config.h                |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/earmv6hfeb/config.h              |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/earmv7/config.h                  |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/earmv7eb/config.h                |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/earmv7hf/config.h                |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/earmv7hfeb/config.h              |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/hppa/config.h                    |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/i386/config.h                    |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/ia64/config.h                    |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/m68000/config.h                  |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/m68k/config.h                    |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/mips64eb/config.h                |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/mips64el/config.h                |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/mipseb/config.h                  |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/mipsel/config.h                  |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/or1k/config.h                    |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/powerpc/config.h                 |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/powerpc64/config.h               |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/riscv32/config.h                 |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/riscv64/config.h                 |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/sh3eb/config.h                   |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/sh3el/config.h                   |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/sparc/config.h                   |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/sparc64/config.h                 |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/vax/config.h                     |   2 +-
 external/gpl3/gcc/usr.bin/libcpp/arch/x86_64/config.h                  |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/aarch64/config.h                 |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/alpha/config.h                   |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/arm/config.h                     |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/armeb/config.h                   |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/coldfire/config.h                |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/hppa/config.h                    |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/i386/config.h                    |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/m68000/config.h                  |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/m68k/config.h                    |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/mips64eb/config.h                |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/mips64el/config.h                |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/mipseb/config.h                  |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/mipsel/config.h                  |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/powerpc/config.h                 |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/powerpc64/config.h               |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/sh3eb/config.h                   |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/sh3el/config.h                   |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/sparc/config.h                   |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/sparc64/config.h                 |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/vax/config.h                     |   2 +-
 external/gpl3/gdb.old/lib/libgdb/arch/x86_64/config.h                  |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/aarch64/config.h                     |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/alpha/config.h                       |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/arm/config.h                         |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/armeb/config.h                       |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/coldfire/config.h                    |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/hppa/config.h                        |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/i386/config.h                        |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/m68000/config.h                      |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/m68k/config.h                        |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/mips64eb/config.h                    |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/mips64el/config.h                    |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/mipseb/config.h                      |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/mipsel/config.h                      |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/powerpc/config.h                     |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/powerpc64/config.h                   |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/sh3eb/config.h                       |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/sh3el/config.h                       |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/sparc/config.h                       |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/sparc64/config.h                     |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/vax/config.h                         |   2 +-
 external/gpl3/gdb/lib/libgdb/arch/x86_64/config.h                      |   2 +-
 external/mit/xorg/bin/xwininfo/Makefile                                |   4 +-
 include/iconv.h                                                        |   6 +-
 lib/libc/iconv/iconv.3                                                 |  14 ++++++--
 lib/libc/iconv/iconv.c                                                 |  16 +++++-----
 lib/libintl/gettext_iconv.c                                            |   4 +-
 lib/libipsec/config.h                                                  |   2 +-
 sys/rump/dev/lib/libnetsmb/netsmb_user.c                               |   7 ++-
 usr.bin/iconv/iconv.c                                                  |   8 ++--
 usr.bin/mail/mime_codecs.c                                             |   7 ++-
 usr.bin/sdpquery/print.c                                               |   6 +-
 usr.sbin/usbdevs/usbdevs.c                                             |   7 ++-
 427 files changed, 468 insertions(+), 461 deletions(-)

diffs (truncated from 5380 to 300 lines):

diff -r e970a5b89a1a -r e7acf7335690 external/bsd/libarchive/include/config_netbsd.h
--- a/external/bsd/libarchive/include/config_netbsd.h   Thu Oct 24 18:17:08 2019 +0000
+++ b/external/bsd/libarchive/include/config_netbsd.h   Thu Oct 24 18:17:14 2019 +0000
@@ -1201,7 +1201,7 @@
 /* #undef HAVE__MKGMTIME64 */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Version number of libarchive as a single integer */
 #define LIBARCHIVE_VERSION_NUMBER "3004000"
diff -r e970a5b89a1a -r e7acf7335690 external/bsd/nvi/dist/common/conv.c
--- a/external/bsd/nvi/dist/common/conv.c       Thu Oct 24 18:17:08 2019 +0000
+++ b/external/bsd/nvi/dist/common/conv.c       Thu Oct 24 18:17:14 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conv.c,v 1.10 2017/11/21 02:36:45 rin Exp $ */
+/*     $NetBSD: conv.c,v 1.11 2019/10/24 18:17:14 kamil Exp $ */
 /*-
  * Copyright (c) 1993, 1994
  *     The Regents of the University of California.  All rights reserved.
@@ -16,7 +16,7 @@
 static const char sccsid[] = "Id: conv.c,v 1.27 2001/08/18 21:41:41 skimo Exp  (Berkeley) Date: 2001/08/18 21:41:41 ";
 #endif /* not lint */
 #else
-__RCSID("$NetBSD: conv.c,v 1.10 2017/11/21 02:36:45 rin Exp $");
+__RCSID("$NetBSD: conv.c,v 1.11 2019/10/24 18:17:14 kamil Exp $");
 #endif
 
 #include <sys/types.h>
@@ -95,7 +95,7 @@
        char *bp = buffer;                                              \
        outleft = CONV_BUFFER_SIZE;                                     \
        errno = 0;                                                      \
-       if (iconv(id, (const char **)&str, &left, &bp, &outleft)        \
+       if (iconv(id, (char **)(void *)&str, &left, &bp, &outleft)      \
            == (size_t)-1 && errno != E2BIG)                            \
                HANDLE_ICONV_ERROR(bp, str, outleft, left);             \
        if ((len = CONV_BUFFER_SIZE - outleft) == 0) {                  \
@@ -283,7 +283,7 @@
                BINC_GOTOC(NULL, cw->bp1, cw->blen1, nlen);             \
            }                                                           \
            errno = 0;                                                  \
-           ret = iconv(id, &bp, lenp, &obp, &outleft);                 \
+           ret = iconv(id, (char **)(void *)&bp, lenp, &obp, &outleft);\
            if (ret == (size_t)-1 && errno != E2BIG)                    \
                    HANDLE_ICONV_ERROR(obp, bp, outleft, len);          \
            offset = cw->blen1 - outleft;                               \
@@ -463,4 +463,3 @@
 #endif
     return 1;
 }
-
diff -r e970a5b89a1a -r e7acf7335690 external/bsd/smbfs/dist/lib/smb/nls.c
--- a/external/bsd/smbfs/dist/lib/smb/nls.c     Thu Oct 24 18:17:08 2019 +0000
+++ b/external/bsd/smbfs/dist/lib/smb/nls.c     Thu Oct 24 18:17:14 2019 +0000
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: nls.c,v 1.2 2013/12/25 22:03:15 christos Exp $");
+__RCSID("$NetBSD: nls.c,v 1.3 2019/10/24 18:17:14 kamil Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -110,7 +110,7 @@
                return strcpy(dst, src);
        inlen = outlen = strlen(src);
        iconv(nls_toloc, NULL, NULL, &p, &outlen);
-       while (iconv(nls_toloc, &src, &inlen, &p, &outlen) == -1) {
+       while (iconv(nls_toloc, __UNCONST(&src), &inlen, &p, &outlen) == -1) {
                *p++ = *src++;
                inlen--;
                outlen--;
@@ -129,7 +129,7 @@
                return strcpy(dst, src);
        inlen = outlen = strlen(src);
        iconv(nls_toext, NULL, NULL, &p, &outlen);
-       while (iconv(nls_toext, &src, &inlen, &p, &outlen) == -1) {
+       while (iconv(nls_toext, __UNCONST(&src), &inlen, &p, &outlen) == -1) {
                *p++ = *src++;
                inlen--;
                outlen--;
@@ -152,7 +152,7 @@
                return memcpy(dst, src, size);
        inlen = outlen = size;
        iconv(nls_toloc, NULL, NULL, &p, &outlen);
-       while (iconv(nls_toloc, &s, &inlen, &p, &outlen) == -1) {
+       while (iconv(nls_toloc, __UNCONST(&s), &inlen, &p, &outlen) == -1) {
                *p++ = *s++;
                inlen--;
                outlen--;
@@ -175,7 +175,7 @@
 
        inlen = outlen = size;
        iconv(nls_toext, NULL, NULL, &p, &outlen);
-       while (iconv(nls_toext, &s, &inlen, &p, &outlen) == -1) {
+       while (iconv(nls_toext, __UNCONST(&s), &inlen, &p, &outlen) == -1) {
                *p++ = *s++;
                inlen--;
                outlen--;
diff -r e970a5b89a1a -r e7acf7335690 external/gpl2/gettext/include/config.h
--- a/external/gpl2/gettext/include/config.h    Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl2/gettext/include/config.h    Thu Oct 24 18:17:14 2019 +0000
@@ -617,7 +617,7 @@
 /* #undef HAVE___SECURE_GETENV */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the value of ${prefix}, as a string. */
 #define INSTALLPREFIX "/usr/local"
@@ -906,4 +906,3 @@
 #ifdef __EMX__
 # include "intl/os2compat.h"
 #endif
-
diff -r e970a5b89a1a -r e7acf7335690 external/gpl2/grep/include/config.h
--- a/external/gpl2/grep/include/config.h       Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl2/grep/include/config.h       Thu Oct 24 18:17:14 2019 +0000
@@ -259,7 +259,7 @@
 /* #undef HAVE___ARGZ_STRINGIFY */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Name of package */
 #define PACKAGE "grep"
diff -r e970a5b89a1a -r e7acf7335690 external/gpl2/texinfo/include/config.h
--- a/external/gpl2/texinfo/include/config.h    Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl2/texinfo/include/config.h    Thu Oct 24 18:17:14 2019 +0000
@@ -330,7 +330,7 @@
 /* #undef HAVE___SECURE_GETENV */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define if integer division by zero raises signal SIGFPE. */
 #define INTDIV0_RAISES_SIGFPE 1
diff -r e970a5b89a1a -r e7acf7335690 external/gpl3/binutils.old/usr.bin/common/arch/aarch64/config.h
--- a/external/gpl3/binutils.old/usr.bin/common/arch/aarch64/config.h   Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl3/binutils.old/usr.bin/common/arch/aarch64/config.h   Thu Oct 24 18:17:14 2019 +0000
@@ -186,7 +186,7 @@
 /* #undef HAVE_WINDOWS_H */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff -r e970a5b89a1a -r e7acf7335690 external/gpl3/binutils.old/usr.bin/common/arch/aarch64eb/config.h
--- a/external/gpl3/binutils.old/usr.bin/common/arch/aarch64eb/config.h Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl3/binutils.old/usr.bin/common/arch/aarch64eb/config.h Thu Oct 24 18:17:14 2019 +0000
@@ -186,7 +186,7 @@
 /* #undef HAVE_WINDOWS_H */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff -r e970a5b89a1a -r e7acf7335690 external/gpl3/binutils.old/usr.bin/common/arch/alpha/config.h
--- a/external/gpl3/binutils.old/usr.bin/common/arch/alpha/config.h     Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl3/binutils.old/usr.bin/common/arch/alpha/config.h     Thu Oct 24 18:17:14 2019 +0000
@@ -186,7 +186,7 @@
 /* #undef HAVE_WINDOWS_H */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff -r e970a5b89a1a -r e7acf7335690 external/gpl3/binutils.old/usr.bin/common/arch/arm/config.h
--- a/external/gpl3/binutils.old/usr.bin/common/arch/arm/config.h       Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl3/binutils.old/usr.bin/common/arch/arm/config.h       Thu Oct 24 18:17:14 2019 +0000
@@ -186,7 +186,7 @@
 /* #undef HAVE_WINDOWS_H */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff -r e970a5b89a1a -r e7acf7335690 external/gpl3/binutils.old/usr.bin/common/arch/armeb/config.h
--- a/external/gpl3/binutils.old/usr.bin/common/arch/armeb/config.h     Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl3/binutils.old/usr.bin/common/arch/armeb/config.h     Thu Oct 24 18:17:14 2019 +0000
@@ -186,7 +186,7 @@
 /* #undef HAVE_WINDOWS_H */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff -r e970a5b89a1a -r e7acf7335690 external/gpl3/binutils.old/usr.bin/common/arch/coldfire/config.h
--- a/external/gpl3/binutils.old/usr.bin/common/arch/coldfire/config.h  Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl3/binutils.old/usr.bin/common/arch/coldfire/config.h  Thu Oct 24 18:17:14 2019 +0000
@@ -186,7 +186,7 @@
 /* #undef HAVE_WINDOWS_H */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff -r e970a5b89a1a -r e7acf7335690 external/gpl3/binutils.old/usr.bin/common/arch/earm/config.h
--- a/external/gpl3/binutils.old/usr.bin/common/arch/earm/config.h      Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl3/binutils.old/usr.bin/common/arch/earm/config.h      Thu Oct 24 18:17:14 2019 +0000
@@ -186,7 +186,7 @@
 /* #undef HAVE_WINDOWS_H */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff -r e970a5b89a1a -r e7acf7335690 external/gpl3/binutils.old/usr.bin/common/arch/earmeb/config.h
--- a/external/gpl3/binutils.old/usr.bin/common/arch/earmeb/config.h    Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl3/binutils.old/usr.bin/common/arch/earmeb/config.h    Thu Oct 24 18:17:14 2019 +0000
@@ -186,7 +186,7 @@
 /* #undef HAVE_WINDOWS_H */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff -r e970a5b89a1a -r e7acf7335690 external/gpl3/binutils.old/usr.bin/common/arch/earmhf/config.h
--- a/external/gpl3/binutils.old/usr.bin/common/arch/earmhf/config.h    Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl3/binutils.old/usr.bin/common/arch/earmhf/config.h    Thu Oct 24 18:17:14 2019 +0000
@@ -186,7 +186,7 @@
 /* #undef HAVE_WINDOWS_H */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff -r e970a5b89a1a -r e7acf7335690 external/gpl3/binutils.old/usr.bin/common/arch/earmhfeb/config.h
--- a/external/gpl3/binutils.old/usr.bin/common/arch/earmhfeb/config.h  Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl3/binutils.old/usr.bin/common/arch/earmhfeb/config.h  Thu Oct 24 18:17:14 2019 +0000
@@ -186,7 +186,7 @@
 /* #undef HAVE_WINDOWS_H */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff -r e970a5b89a1a -r e7acf7335690 external/gpl3/binutils.old/usr.bin/common/arch/hppa/config.h
--- a/external/gpl3/binutils.old/usr.bin/common/arch/hppa/config.h      Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl3/binutils.old/usr.bin/common/arch/hppa/config.h      Thu Oct 24 18:17:14 2019 +0000
@@ -186,7 +186,7 @@
 /* #undef HAVE_WINDOWS_H */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff -r e970a5b89a1a -r e7acf7335690 external/gpl3/binutils.old/usr.bin/common/arch/i386/config.h
--- a/external/gpl3/binutils.old/usr.bin/common/arch/i386/config.h      Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl3/binutils.old/usr.bin/common/arch/i386/config.h      Thu Oct 24 18:17:14 2019 +0000
@@ -186,7 +186,7 @@
 /* #undef HAVE_WINDOWS_H */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff -r e970a5b89a1a -r e7acf7335690 external/gpl3/binutils.old/usr.bin/common/arch/ia64/config.h
--- a/external/gpl3/binutils.old/usr.bin/common/arch/ia64/config.h      Thu Oct 24 18:17:08 2019 +0000
+++ b/external/gpl3/binutils.old/usr.bin/common/arch/ia64/config.h      Thu Oct 24 18:17:14 2019 +0000
@@ -186,7 +186,7 @@
 /* #undef HAVE_WINDOWS_H */
 
 /* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST const
+#define ICONV_CONST
 
 /* Define to the sub-directory in which libtool stores uninstalled libraries.
    */
diff -r e970a5b89a1a -r e7acf7335690 external/gpl3/binutils.old/usr.bin/common/arch/m68000/config.h
--- a/external/gpl3/binutils.old/usr.bin/common/arch/m68000/config.h    Thu Oct 24 18:17:08 2019 +0000




Home | Main Index | Thread Index | Old Index