diff options
| author | fielding <fielding@13f79535-47bb-0310-9956-ffa450edef68> | 2001-01-28 09:50:01 +0000 |
|---|---|---|
| committer | fielding <fielding@13f79535-47bb-0310-9956-ffa450edef68> | 2001-01-28 09:50:01 +0000 |
| commit | 6b918db0160ae85cfaeb84c4f00e7ee875476a8b (patch) | |
| tree | c93c2e1d6602ad22db203bc4810ff333e00eddd6 /i18n | |
| parent | 8badddad74369390468b8062294bd01f0150703d (diff) | |
| download | libapr-6b918db0160ae85cfaeb84c4f00e7ee875476a8b.tar.gz | |
Remove compiler warnings due to lack of string.h and bad const on
the second argument of iconv (the Linux man pages show an incorrect
prototype -- the header files and single Unix spec say that there
is no const).
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61149 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'i18n')
| -rw-r--r-- | i18n/unix/xlate.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/i18n/unix/xlate.c b/i18n/unix/xlate.c index 157f6c6b0..2fa1f9d56 100644 --- a/i18n/unix/xlate.c +++ b/i18n/unix/xlate.c @@ -67,6 +67,9 @@ #ifdef HAVE_STDDEF_H #include <stddef.h> /* for NULL */ #endif +#if APR_HAVE_STRING_H +#include <string.h> +#endif #if APR_HAVE_STRINGS_H #include <strings.h> #endif @@ -180,7 +183,7 @@ static apr_status_t apr_xlate_cleanup(void *convset) static void check_sbcs(apr_xlate_t *convset) { char inbuf[256], outbuf[256]; - const char *inbufptr = inbuf; + char *inbufptr = inbuf; char *outbufptr = outbuf; size_t inbytes_left, outbytes_left; int i; @@ -273,7 +276,7 @@ apr_status_t apr_xlate_get_sb(apr_xlate_t *convset, int *onoff) return APR_SUCCESS; } -apr_status_t apr_xlate_conv_buffer(apr_xlate_t *convset, const char *inbuf, +apr_status_t apr_xlate_conv_buffer(apr_xlate_t *convset, char *inbuf, apr_size_t *inbytes_left, char *outbuf, apr_size_t *outbytes_left) { @@ -282,7 +285,7 @@ apr_status_t apr_xlate_conv_buffer(apr_xlate_t *convset, const char *inbuf, size_t translated; if (convset->ich != (iconv_t)-1) { - const char *inbufptr = inbuf; + char *inbufptr = inbuf; char *outbufptr = outbuf; translated = iconv(convset->ich, &inbufptr, |