Fix small breakages as a result of yesterday's upheavals. Oops.

[originally from svn r2610]

diff --git a/unicode.c b/unicode.c
index 24dfd448b18a12a56497d27a5a7793910be8b74b..d1428bb62b7994843e82c3025b9783e39d5eeae6 100644 (file)
--- a/unicode.c
+++ b/unicode.c
@@ -971,9 +971,9 @@ int check_compose_internal(int first, int second, int recurse)
     if (recurse == 0) {
        nc = check_compose_internal(second, first, 1);
        if (nc == -1)
-           nc = check_compose(toupper(first), toupper(second), 1);
+           nc = check_compose_internal(toupper(first), toupper(second), 1);
        if (nc == -1)
-           nc = check_compose(toupper(second), toupper(first), 1);
+           nc = check_compose_internal(toupper(second), toupper(first), 1);
     }
     return nc;
 }

diff --git a/winstuff.h b/winstuff.h
index ed12ba56bc5f7c20df348e409405140c5d29e59e..1aa68bb7665afcb39120bc2a7d32ae750be2572c 100644 (file)
--- a/winstuff.h
+++ b/winstuff.h
@@ -201,6 +201,7 @@ void EnableSizeTip(int bEnable);
 /*
  * Exports from unicode.c.
  */
+struct unicode_data;
 void init_ucs(Config *, struct unicode_data *);
 
 #endif