src/lib/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit bf21d868c539d1664cbdd9d9ac15946637c6e6bd
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Sat Dec 19 19:55:00 2015 +0100
Fix build with recent clang that chokes on "register" keyword
Change-Id: Ifbcdae2035b906c37576ffe6c8bd5ad864bb3fda
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 7585770..75c50a5 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -87,7 +87,8 @@ tokens.h : tokens.gperf
tokenhash.h : tokens.gperf
$(GPERF) --compare-strncmp -C -m 20 tokens.gperf \
- | $(SED) -e 's/(char\*)0/(char\*)0, 0/g' > tokenhash.h
+ | $(SED) -e 's/(char\*)0/(char\*)0, 0/g' \
+ | $(SED) -e 's/register //g' > tokenhash.h
tokens.gperf : $(top_srcdir)/src/lib/tokens.txt
$(top_srcdir)/src/lib/gentoken.pl
$(PERL) $(top_srcdir)/src/lib/gentoken.pl
$(top_srcdir)/src/lib/tokens.txt \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
