Compile fix for GTK 3.18: avoid gtk_adjustment_changed().

[PuTTY.git] / unix / uxucs.c

diff --git a/unix/uxucs.c b/unix/uxucs.c
index 8cd300d328aaad55f6ad4b789e119063a54d49c3..86cc33d4f5883573e671ccba74d21706230eab5c 100644 (file)
--- a/unix/uxucs.c
+++ b/unix/uxucs.c
@@ -57,7 +57,7 @@ int mb_to_wc(int codepage, int flags, const char *mbstr, int mblen,
 }
 
 int wc_to_mb(int codepage, int flags, const wchar_t *wcstr, int wclen,
-            char *mbstr, int mblen, char *defchr, int *defused,
+            char *mbstr, int mblen, const char *defchr, int *defused,
             struct unicode_data *ucsdata)
 {
     /* FIXME: we should remove the defused param completely... */
@@ -265,7 +265,7 @@ const char *cp_enumerate(int index)
 
 int decode_codepage(char *cp_name)
 {
-    if (!*cp_name)
+    if (!cp_name || !*cp_name)
        return CS_UTF8;
     return charset_from_localenc(cp_name);
 }