* iconv/Makefile (CFLAGS-charmap.c): Add -DNEED_NULL_POINTER. * locale/programs/charmap.c: Define null_pointer if NEED_NULL_POINTER is defined.