* iconv/Makefile (CFLAGS-charmap.c): Add -DNEED_NULL_POINTER.
	* locale/programs/charmap.c: Define null_pointer if
	NEED_NULL_POINTER is defined.
This commit is contained in:
Ulrich Drepper 2001-04-04 00:19:44 +00:00
parent c891b2df08
commit 194c5f8d0f
3 changed files with 7 additions and 1 deletions

View File

@ -1,5 +1,9 @@
2001-04-03 Ulrich Drepper <drepper@redhat.com>
* iconv/Makefile (CFLAGS-charmap.c): Add -DNEED_NULL_POINTER.
* locale/programs/charmap.c: Define null_pointer if
NEED_NULL_POINTER is defined.
* misc/dirname.c (dirname): Handle multiple slashes correctly.
2001-04-03 Martin Schwidefsky <schwidefsky@de.ibm.com>

View File

@ -43,7 +43,7 @@ CFLAGS-iconv_prog.c = -I../locale/programs
CFLAGS-iconv_charmap.c = -I../locale/programs
CFLAGS-dummy-repertoire.c = -I../locale/programs
CFLAGS-charmap.c = -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
-DDEFAULT_CHARMAP=null_pointer
-DDEFAULT_CHARMAP=null_pointer -DNEED_NULL_POINTER
tests = tst-iconv1 tst-iconv2 tst-iconv3

View File

@ -56,7 +56,9 @@ static void charmap_new_char (struct linereader *lr, struct charmap_t *cm,
const char *to, int decimal_ellipsis, int step);
#ifdef NEED_NULL_POINTER
static const char *null_pointer;
#endif
static struct linereader *
cmlr_open (const char *directory, const char *name, kw_hash_fct_t hf)