blob: 90d221d67d5654c32515eb37f58efacd13581530 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
|
$NetBSD: patch-ad,v 1.3 2007/04/26 01:23:49 dmcmahill Exp $
Avoid conflicting with the wcwidth which exists in libc but
with a different prototype:
utf8.c:66: error: conflicting types for `wcwidth'
/usr/include/wchar.h:146: error: previous declaration of `wcwidth'
--- utf8.c.orig 2007-03-05 02:15:33.000000000 +0000
+++ utf8.c
@@ -62,7 +62,7 @@ static int bisearch(ucs_char_t ucs, cons
* in ISO 10646.
*/
-static int wcwidth(ucs_char_t ch)
+static int git_wcwidth(ucs_char_t ch)
{
/*
* Sorted list of non-overlapping intervals of non-spacing characters,
@@ -207,7 +207,7 @@ invalid:
return 0;
}
- return wcwidth(ch);
+ return git_wcwidth(ch);
}
int is_utf8(const char *text)
|
