Make use of gperf-3.0.

Author: bhaible

ChangeLog

@@ -1,3 +1,9 @@
+2003-05-16  Bruno Haible  <bruno@clisp.org>
+
+	* lib/genaliases.c (main): Emit declarations for gperf-3.0.
+	* Makefile.devel (lib/aliases.h): Remove gperf command line options;
+	add new option "-m 10" for gperf-3.0.
+
 2003-05-12  Bruno Haible  <bruno@clisp.org>
 
 	* m4/error.m4: Update from gettext.

Makefile.devel

@@ -169,10 +169,8 @@ include/iconv.h.msvc-shared : include/iconv.h.in windows/dllexport.h
 	sed -e 's/@ICONV_CONST@/const/g' -e 's/extern \([^"]\)/extern LIBICONV_DLL_EXPORTED \1/' -e '/_LIBICONV_VERSION/r windows/dllexport.h' < $< > $@
 
 
-# We use "-7" to make a smaller table, but use "unsigned char" array indices
-# to avoid gcc warning.
 lib/aliases.h : lib/aliases.gperf
-	$(GPERF) -t -L ANSI-C -H aliases_hash -N aliases_lookup -G -W aliases -7 -C -k '1,3-11,$$' -i 1 lib/aliases.gperf | sed -e 's/\[str/\[(unsigned char) str/' > tmp.h
+	$(GPERF) -m 10 lib/aliases.gperf > tmp.h
 	$(CP) tmp.h lib/aliases.h
 	$(RM) tmp.h
 

lib/genaliases.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2001 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2001, 2003 Free Software Foundation, Inc.
    This file is part of the GNU LIBICONV Library.
 
    The GNU LIBICONV Library is free software; you can redistribute it
@@ -41,6 +41,15 @@ static void emit_encoding (const char* const* names, size_t n, const char* c_nam
 int main ()
 {
   printf("struct alias { const char* name; unsigned int encoding_index; };\n");
+  printf("%%struct-type\n");
+  printf("%%language=ANSI-C\n");
+  printf("%%define hash-function-name aliases_hash\n");
+  printf("%%define lookup-function-name aliases_lookup\n");
+  printf("%%7bit\n");
+  printf("%%readonly-tables\n");
+  printf("%%global-table\n");
+  printf("%%define word-array-name aliases\n");
+  printf("%%null-strings\n");
   printf("%%%%\n");
 
 #define DEFENCODING(xxx_names,xxx,xxx_ifuncs1,xxx_ifuncs2,xxx_ofuncs1,xxx_ofuncs2) \