summaryrefslogtreecommitdiff
path: root/lib/iconv_open-zos.h
diff options
context:
space:
mode:
Diffstat (limited to 'lib/iconv_open-zos.h')
-rw-r--r--lib/iconv_open-zos.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/iconv_open-zos.h b/lib/iconv_open-zos.h
index 7bfa9ecc..1b76dc35 100644
--- a/lib/iconv_open-zos.h
+++ b/lib/iconv_open-zos.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 10 iconv_open-zos.gperf */
/* Computed positions: -k'4,$' */
@@ -85,9 +85,9 @@ mapping_hash (register const char *str, register size_t len)
{
default:
hval += asso_values[(unsigned char)str[3]+6];
-#if defined __cplusplus && (__cplusplus >= 201703L || (__cplusplus >= 201103L && defined __clang_major__ && defined __clang_minor__ && __clang_major__ + (__clang_minor__ >= 9) > 3))
+#if (defined __cplusplus && (__cplusplus >= 201703L || (__cplusplus >= 201103L && defined __clang__ && __clang_major__ + (__clang_minor__ >= 9) > 3))) || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 202000L && ((defined __GNUC__ && __GNUC__ >= 10) || (defined __clang__ && __clang_major__ >= 9)))
[[fallthrough]];
-#elif defined __GNUC__ && __GNUC__ >= 7
+#elif (defined __GNUC__ && __GNUC__ >= 7) || (defined __clang__ && __clang_major__ >= 10)
__attribute__ ((__fallthrough__));
#endif
/*FALLTHROUGH*/
@@ -203,6 +203,10 @@ static const struct stringpool_t stringpool_contents =
};
#define stringpool ((const char *) &stringpool_contents)
+#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 mapping mappings[] =
{
{-1}, {-1}, {-1},
@@ -310,6 +314,9 @@ static const struct mapping mappings[] =
#line 60 "iconv_open-zos.gperf"
{(int)(size_t)&((struct stringpool_t *)0)->stringpool_str64, "IBM-1046"}
};
+#if (defined __GNUC__ && __GNUC__ + (__GNUC_MINOR__ >= 6) > 4) || (defined __clang__ && __clang_major__ >= 3)
+#pragma GCC diagnostic pop
+#endif
const struct mapping *
mapping_lookup (register const char *str, register size_t len)
@@ -330,5 +337,5 @@ mapping_lookup (register const char *str, register size_t len)
}
}
}
- return 0;
+ return (struct mapping *) 0;
}