Put prototypes for the functions exported by wcwidth.c in putty.h, and remove

[u/mdw/putty] / wcwidth.c

diff --git a/wcwidth.c b/wcwidth.c
index 9f23111..ed7529b 100644 (file)
--- a/wcwidth.c
+++ b/wcwidth.c
@@ -6,7 +6,9 @@
  * Markus Kuhn -- 2001-01-12 -- public domain
  */
 
-#include <wchar.h>
+#include <stddef.h>
+
+#include "putty.h"
 
 struct interval {
   unsigned short first;
@@ -144,7 +146,7 @@ int wcswidth(const wchar_t *pwcs, size_t n)
   return width;
 }
 
-
+#if 0 /* RDB: we don't need the cjk version */
 /*
  * The following function is the same as wcwidth(), except that
  * spacing characters in the East Asian Ambiguous (A) category as
@@ -231,3 +233,4 @@ int wcswidth_cjk(const wchar_t *pwcs, size_t n)
 
   return width;
 }
+#endif