summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2019-01-27 12:49:12 +0100
committerBruno Haible <bruno@clisp.org>2019-01-27 12:51:21 +0100
commit188e767b978b22416249b0bf99c1ea2cbf5856d7 (patch)
tree247accb04b02f32e39c0aa329fdf3000017e3376
parent5d6ca1aeeb04b9b0cd760529d548ac26675ef9b9 (diff)
downloadgnulib-188e767b978b22416249b0bf99c1ea2cbf5856d7.tar.gz
unigbrk/uc-grapheme-breaks: Fix build failure.
* lib/unigbrk/uc-grapheme-breaks.c: Don't include unistr.h. * modules/unigbrk/uc-grapheme-breaks (Makefile.am): Fix typo.
-rw-r--r--ChangeLog6
-rw-r--r--lib/unigbrk/uc-grapheme-breaks.c2
-rw-r--r--modules/unigbrk/uc-grapheme-breaks2
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c1cc195d7a..2f23c644cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2019-01-27 Bruno Haible <bruno@clisp.org>
+ unigbrk/uc-grapheme-breaks: Fix build failure.
+ * lib/unigbrk/uc-grapheme-breaks.c: Don't include unistr.h.
+ * modules/unigbrk/uc-grapheme-breaks (Makefile.am): Fix typo.
+
+2019-01-27 Bruno Haible <bruno@clisp.org>
+
mountlist: Merge two .m4 files.
* m4/mountlist.m4 (gl_MOUNTLIST): Inline gl_LIST_MOUNTED_FILE_SYSTEMS.
(AC_FUNC_GETMNTENT): Move to here, from m4/ls-mntd-fs.m4.
diff --git a/lib/unigbrk/uc-grapheme-breaks.c b/lib/unigbrk/uc-grapheme-breaks.c
index db3dca5343..9ffd74ac24 100644
--- a/lib/unigbrk/uc-grapheme-breaks.c
+++ b/lib/unigbrk/uc-grapheme-breaks.c
@@ -22,8 +22,6 @@
#include <string.h>
-#include "unistr.h"
-
/* This is similar to u32_mbtouc_unsafe(), but doesn't check invalid
characters. */
static int
diff --git a/modules/unigbrk/uc-grapheme-breaks b/modules/unigbrk/uc-grapheme-breaks
index 8c3379d227..1e0808820b 100644
--- a/modules/unigbrk/uc-grapheme-breaks
+++ b/modules/unigbrk/uc-grapheme-breaks
@@ -14,7 +14,7 @@ gl_MODULE_INDICATOR([unigbrk/uc-grapheme-breaks])
gl_LIBUNISTRING_MODULE([0.9.8], [unigbrk/uc-grapheme-breaks])
Makefile.am:
-if LIBUNISTRING_COMPILE_UNIGBRK_U32_GRAPHEME_BREAKS
+if LIBUNISTRING_COMPILE_UNIGBRK_UC_GRAPHEME_BREAKS
lib_SOURCES += unigbrk/uc-grapheme-breaks.c
endif