diff options
Diffstat (limited to 'iconv')
| -rw-r--r-- | iconv/Makefile | 2 | ||||
| -rw-r--r-- | iconv/gconv_cache.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/iconv/Makefile b/iconv/Makefile index 3b101d27b7..b4e427e21a 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -57,7 +57,7 @@ others = iconv_prog iconvconfig install-others = $(inst_bindir)/iconv install-sbin = iconvconfig -CFLAGS-gconv_cache.c = -DGCONV_DIR='"$(gconvdir)"' +CFLAGS-gconv_cache.c += -DGCONV_DIR='"$(gconvdir)"' CFLAGS-gconv_conf.c = -DGCONV_PATH='"$(gconvdir)"' CFLAGS-iconvconfig.c = -DGCONV_PATH='"$(gconvdir)"' -DGCONV_DIR='"$(gconvdir)"' diff --git a/iconv/gconv_cache.c b/iconv/gconv_cache.c index ffec34d2ec..1009cedc58 100644 --- a/iconv/gconv_cache.c +++ b/iconv/gconv_cache.c @@ -170,6 +170,7 @@ find_module_idx (const char *str, size_t *idxp) } +#ifndef STATIC_GCONV static int internal_function find_module (const char *directory, const char *filename, @@ -199,6 +200,7 @@ find_module (const char *directory, const char *filename, return status; } +#endif int |