diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-04-04 00:19:44 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-04-04 00:19:44 +0000 |
| commit | 194c5f8d0f6da9d84211b479adb58e118f302ae3 (patch) | |
| tree | dde6de4aa094e01fea84a26bf3c511d12ff2f17a | |
| parent | c891b2df087e0219319785c29d3af6042e4ac94f (diff) | |
| download | glibc-194c5f8d0f6da9d84211b479adb58e118f302ae3.tar.gz glibc-194c5f8d0f6da9d84211b479adb58e118f302ae3.tar.xz glibc-194c5f8d0f6da9d84211b479adb58e118f302ae3.zip | |
Update.
* iconv/Makefile (CFLAGS-charmap.c): Add -DNEED_NULL_POINTER. * locale/programs/charmap.c: Define null_pointer if NEED_NULL_POINTER is defined.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | iconv/Makefile | 2 | ||||
| -rw-r--r-- | locale/programs/charmap.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index ed9cba9b90..2ebbeb7e61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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> diff --git a/iconv/Makefile b/iconv/Makefile index 214941b91e..5a90a77657 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -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 diff --git a/locale/programs/charmap.c b/locale/programs/charmap.c index 14cb4f4089..35a6987fbc 100644 --- a/locale/programs/charmap.c +++ b/locale/programs/charmap.c @@ -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) |