[Libreoffice-commits] .: vcl/unx

[Caolán McNamara]

 vcl/unx/source/fontmanager/afm_keyword_list |    6 +++++-
 vcl/unx/source/fontmanager/makefile.mk      |    4 +---
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 7758d868da6c4d6f489300bfb517ab3bb7a6dce9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 14 09:13:48 2010 +0000

    get this to build without errors

diff --git a/vcl/unx/source/fontmanager/afm_keyword_list b/vcl/unx/source/fontmanager/afm_keyword_list
index 263d76b..c9bb134 100755
--- a/vcl/unx/source/fontmanager/afm_keyword_list
+++ b/vcl/unx/source/fontmanager/afm_keyword_list
@@ -1,4 +1,8 @@
-struct hash_entry { char* name; enum parseKey eKey; };
+%language=C++
+%global-table
+%null-strings
+%struct-type
+struct hash_entry { const char* name; enum parseKey eKey; };
 %%
 Ascender,ASCENDER
 Ascent,ASCENT
diff --git a/vcl/unx/source/fontmanager/makefile.mk b/vcl/unx/source/fontmanager/makefile.mk
index 9cefb8c..ff3a8dc 100644
--- a/vcl/unx/source/fontmanager/makefile.mk
+++ b/vcl/unx/source/fontmanager/makefile.mk
@@ -75,6 +75,4 @@ NOOPTFILES=$(SLO)$/fontmanager.obj
 $(SLO)$/parseAFM.obj: $(SOLARVER)$/$(INPATH)$/inc$/afm_hash.cpp
 
 $(SOLARVER)$/$(INPATH)$/inc$/afm_hash.cpp: afm_keyword_list
-    $(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' afm_keyword_list > $@
-
-
+    $(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' afm_keyword_list | $(SED) -e "s/(char\*)0/(char\*)0, NOPE/g" | $(GREP) -v "^#line" > $@