From 02221eae373c5db93d1c715d836d79c724d361c7 Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Wed, 18 May 2016 15:42:09 +0200 Subject: [PATCH] fix dist compilation failure remove illegal wcwidth.c include and compile wcwidth.c correct #include in wcwidth.c fallout from #480 --- src/core/Makefile.am | 2 ++ src/core/utf8.c | 2 +- src/core/wcwidth.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/core/Makefile.am b/src/core/Makefile.am index cc200034..af323234 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -45,6 +45,7 @@ libcore_a_SOURCES = \ signals.c \ special-vars.c \ utf8.c \ + wcwidth.c \ write-buffer.c structure_headers = \ @@ -94,6 +95,7 @@ pkginc_core_HEADERS = \ settings.h \ signals.h \ special-vars.h \ + utf8.h \ window-item-def.h \ write-buffer.h \ $(structure_headers) diff --git a/src/core/utf8.c b/src/core/utf8.c index 29b277e1..c53d8816 100644 --- a/src/core/utf8.c +++ b/src/core/utf8.c @@ -24,7 +24,7 @@ #include "utf8.h" #include "module.h" -#include "wcwidth.c" + /* Provide is_utf8(): */ #include "recode.h" diff --git a/src/core/wcwidth.c b/src/core/wcwidth.c index 80d20fa1..711c4646 100644 --- a/src/core/wcwidth.c +++ b/src/core/wcwidth.c @@ -59,7 +59,7 @@ * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c */ -#include "module.h" +#include "utf8.h" struct interval { int first;