New upstream version 1.4.1upstream/1.4.1upstream

1 files changed, 10 insertions, 2 deletions

diff --git a/lib/uninorm/composition-table.h b/lib/uninorm/composition-table.h
index 898647f7..b5893681 100644
--- a/lib/uninorm/composition-table.h
+++ b/lib/uninorm/composition-table.h
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.2 */
+/* ANSI-C code produced by gperf version 3.3 */
 /* Command-line: gperf -m 1 uninorm/composition-table.gperf  */
 /* Computed positions: -k'2-3,6' */
 
@@ -50,6 +50,7 @@ gl_uninorm_compose_hash (register const char *str, register size_t len)
         72,   54,   52, 1463,  821,  848,  181, 1463,    1, 1463,
       1463, 1463,   77,   22,  241, 1463, 1463
     };
+  (void) len;
   return asso_values[(unsigned char)str[5]+1] + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[1]];
 }
 
@@ -164,6 +165,10 @@ gl_uninorm_compose_lookup (register const char *str, register size_t len)
        0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
        0,  0,  0,  0,  0,  0,  6
     };
+#if (defined __GNUC__ && __GNUC__ + (__GNUC_MINOR__ >= 6) > 4) || (defined __clang__ && __clang_major__ >= 3)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
   static const struct composition_rule wordlist[] =
     {
       {""},
@@ -2205,6 +2210,9 @@ gl_uninorm_compose_lookup (register const char *str, register size_t len)
 #line 979 "uninorm/composition-table.gperf"
       {"\001\025\271\001\025\257", 0x115bb}
     };
+#if (defined __GNUC__ && __GNUC__ + (__GNUC_MINOR__ >= 6) > 4) || (defined __clang__ && __clang_major__ >= 3)
+#pragma GCC diagnostic pop
+#endif
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
@@ -2219,5 +2227,5 @@ gl_uninorm_compose_lookup (register const char *str, register size_t len)
               return &wordlist[key];
           }
     }
-  return 0;
+  return (struct composition_rule *) 0;
 }