From 4e12c9b39c81d01db65bca176098d09f587221f9 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 8 Mar 2009 17:47:45 +0100 Subject: [PATCH] Fix the warning on SUS-compatible systems (char**) and on NetBSD (const char**) --- include/util.h | 2 +- src/util.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/util.h b/include/util.h index 4d6d2bce..31beeb80 100644 --- a/include/util.h +++ b/include/util.h @@ -34,7 +34,7 @@ void *scalloc(size_t size); char *sstrdup(const char *str); void start_application(const char *command); void check_error(xcb_connection_t *conn, xcb_void_cookie_t cookie, char *err_message); -char *convert_utf8_to_ucs2(const char *input, int *real_strlen); +char *convert_utf8_to_ucs2(char *input, int *real_strlen); void remove_client_from_container(xcb_connection_t *conn, Client *client, Container *container); void set_focus(xcb_connection_t *conn, Client *client); void leave_stack_mode(xcb_connection_t *conn, Container *container); diff --git a/src/util.c b/src/util.c index 8de4d665..c79aa3d1 100644 --- a/src/util.c +++ b/src/util.c @@ -145,7 +145,7 @@ void check_error(xcb_connection_t *conn, xcb_void_cookie_t cookie, char *err_mes * returned. It has to be freed when done. * */ -char *convert_utf8_to_ucs2(const char *input, int *real_strlen) { +char *convert_utf8_to_ucs2(char *input, int *real_strlen) { size_t input_size = strlen(input) + 1; /* UCS-2 consumes exactly two bytes for each glyph */ int buffer_size = input_size * 2; @@ -169,7 +169,7 @@ char *convert_utf8_to_ucs2(const char *input, int *real_strlen) { iconv(conversion_descriptor, NULL, NULL, NULL, NULL); /* Convert our text */ - int rc = iconv(conversion_descriptor, &input, &input_size, &output, &output_size); + int rc = iconv(conversion_descriptor, (void*)&input, &input_size, &output, &output_size); if (rc == (size_t)-1) { fprintf(stderr, "Converting to UCS-2 failed\n"); perror("erron\n");