editors/mp/files/patch-mpdm_mpdm__s.c


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

Fix build with aarch64, armv6, and armv7

#--- mpdm_s.o ---
mpdm_s.c:1070:5: error: conflicting types for '__wcwidth'
int wcwidth(wchar_t);
    ^
/usr/include/wchar.h:211:21: note: expanded from macro 'wcwidth'
#define wcwidth(_c)     __wcwidth(_c)
                        ^
/usr/include/_ctype.h:159:1: note: previous definition is here
__wcwidth(__ct_rune_t _c)
^
1 error generated.
*** [mpdm_s.o] Error code 1

--- mpdm/mpdm_s.c.orig	2018-03-04 00:49:18 UTC
+++ mpdm/mpdm_s.c
@@ -1067,8 +1067,6 @@ int mpdm_gettext_domain(const mpdm_t dom, const mpdm_t
 
 #ifdef CONFOPT_WCWIDTH
 
-int wcwidth(wchar_t);
-
 int mpdm_wcwidth(wchar_t c)
 {
     return wcwidth(c);