Merges from Irssi CVS.

[runtime.git] / apps / irssi / src / core / special-vars.c

diff --git a/apps/irssi/src/core/special-vars.c b/apps/irssi/src/core/special-vars.c
index 2556cd63ca0775c097ae337c37e30c818323f30f..7291f469a7e94f2f87302e600104d82c5ac29141 100644 (file)
--- a/apps/irssi/src/core/special-vars.c
+++ b/apps/irssi/src/core/special-vars.c
@@ -106,7 +106,7 @@ static char *get_long_variable_value(const char *key, SERVER_REC *server,
                                     void *item, int *free_ret)
 {
        EXPANDO_FUNC func;
-       char *ret;
+       const char *ret;
        int type;
 
        *free_ret = FALSE;
@@ -124,7 +124,7 @@ static char *get_long_variable_value(const char *key, SERVER_REC *server,
        /* environment variable? */
        ret = g_getenv(key);
        if (ret != NULL)
-               return ret;
+               return (char *) ret;
 
        return NULL;
 }