X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/74790953a734d6e745c1e412cb9824743348ec3c..2c72609a1654819cee41fa4c202c15a6577461ee:/putty.h

diff --git a/putty.h b/putty.h
index 43a66e62..09cfa2b0 100644
--- a/putty.h
+++ b/putty.h
@@ -868,10 +868,10 @@ void get_unitab(int codepage, wchar_t * unitab, int ftype);
 /*
  * Exports from wcwidth.c
  */
-int wcwidth(wchar_t ucs);
-int wcswidth(const wchar_t *pwcs, size_t n);
-int wcwidth_cjk(wchar_t ucs);
-int wcswidth_cjk(const wchar_t *pwcs, size_t n);
+int mk_wcwidth(wchar_t ucs);
+int mk_wcswidth(const wchar_t *pwcs, size_t n);
+int mk_wcwidth_cjk(wchar_t ucs);
+int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n);
 
 /*
  * Exports from mscrypto.c
@@ -980,8 +980,8 @@ void cmdline_error(char *, ...);
  * Exports from config.c.
  */
 struct controlbox;
-void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
-		      int midsession, int protocol, int protcfginfo);
+void setup_config_box(struct controlbox *b, int midsession,
+		      int protocol, int protcfginfo);
 
 /*
  * Exports from minibidi.c.