support gperf 3.1

* tool/gperf.sed: extracted sed commands to a script.  ANSI-C code
  produced by gperf 3.1 declares length arguments as `size_t`.  it
  causes conflict with existing declarations, and needs casts for
  a local variable and return statements.
  [Feature #13883]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 184 insertions, 191 deletions

diff --git a/ext/date/zonetab.h b/ext/date/zonetab.h
index fa86e7991a..2dfa9b988a 100644
--- a/ext/date/zonetab.h
+++ b/ext/date/zonetab.h
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 3.0.4 */
+/* ANSI-C code produced by gperf version 3.1 */
 /* Command-line: gperf -E -C -c -P -p -j1 -i 1 -g -o -t -N zonetab zonetab.list  */
 /* Computed positions: -k'1-4,$' */
 
@@ -26,9 +26,10 @@
       && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
       && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
 /* The character set is not based on ISO-646.  */
-error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gperf@gnu.org>."
 #endif
 
+#define gperf_offsetof(s, n) (short)offsetof(struct s##_t, s##_str##n)
 #line 1 "zonetab.list"
 
 struct zone {
@@ -40,15 +41,15 @@ static const struct zone *zonetab();
 struct zone;
 /* maximum key range = 434, duplicates = 0 */
 
-#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
-inline
-#elif defined(__GNUC__)
+#ifdef __GNUC__
 __inline
+#else
+#ifdef __cplusplus
+inline
+#endif
 #endif
 static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
+hash (register const char *str, register size_t len)
 {
   static const unsigned short asso_values[] =
     {
@@ -79,7 +80,7 @@ hash (str, len)
       439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
       439, 439, 439, 439, 439, 439, 439
     };
-  register int hval = len;
+  register unsigned int hval = (unsigned int)len;
 
   switch (hval)
     {
@@ -96,7 +97,7 @@ hash (str, len)
         hval += asso_values[(unsigned char)str[0]+1];
         break;
     }
-  return hval + asso_values[(unsigned char)str[len - 1]];
+  return (unsigned int)hval + asso_values[(unsigned char)str[len - 1]];
 }
 
 struct stringpool_t
@@ -446,16 +447,8 @@ static const struct stringpool_t stringpool_contents =
     "fiji"
   };
 #define stringpool ((const char *) &stringpool_contents)
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
 const struct zone *
-zonetab (str, len)
-     register const char *str;
-     register unsigned int len;
+zonetab (register const char *str, register size_t len)
 {
   enum
     {
@@ -470,398 +463,398 @@ zonetab (str, len)
     {
       {-1}, {-1}, {-1}, {-1}, {-1},
 #line 37 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str5),   -5*3600},
+      {gperf_offsetof(stringpool, 5),   -5*3600},
 #line 38 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str6),   -6*3600},
+      {gperf_offsetof(stringpool, 6),   -6*3600},
 #line 24 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str7),    4*3600},
+      {gperf_offsetof(stringpool, 7),    4*3600},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #line 15 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str14), -6*3600},
+      {gperf_offsetof(stringpool, 14), -6*3600},
 #line 16 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str15), -5*3600},
+      {gperf_offsetof(stringpool, 15), -5*3600},
 #line 85 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str16),  2*3600},
+      {gperf_offsetof(stringpool, 16),  2*3600},
 #line 71 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str17),  1*3600},
+      {gperf_offsetof(stringpool, 17),  1*3600},
 #line 90 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str18),  4*3600},
+      {gperf_offsetof(stringpool, 18),  4*3600},
 #line 79 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str19), 2*3600},
+      {gperf_offsetof(stringpool, 19), 2*3600},
 #line 65 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str20),-10*3600},
+      {gperf_offsetof(stringpool, 20),-10*3600},
       {-1},
 #line 17 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str22), -7*3600},
+      {gperf_offsetof(stringpool, 22), -7*3600},
 #line 18 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str23), -6*3600},
+      {gperf_offsetof(stringpool, 23), -6*3600},
 #line 84 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str24), 2*3600},
+      {gperf_offsetof(stringpool, 24), 2*3600},
 #line 73 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str25),  1*3600},
+      {gperf_offsetof(stringpool, 25),  1*3600},
       {-1},
 #line 82 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str27), 2*3600},
+      {gperf_offsetof(stringpool, 27), 2*3600},
       {-1}, {-1},
 #line 47 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str30),  0*3600},
+      {gperf_offsetof(stringpool, 30),  0*3600},
 #line 128 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str31),               -43200},
+      {gperf_offsetof(stringpool, 31),               -43200},
 #line 78 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str32), 1*3600},
+      {gperf_offsetof(stringpool, 32), 1*3600},
 #line 77 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str33),  1*3600},
+      {gperf_offsetof(stringpool, 33),  1*3600},
       {-1},
 #line 95 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str35), 7*3600},
+      {gperf_offsetof(stringpool, 35), 7*3600},
 #line 98 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str36), 8*3600},
+      {gperf_offsetof(stringpool, 36), 8*3600},
 #line 25 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str37),    5*3600},
+      {gperf_offsetof(stringpool, 37),    5*3600},
 #line 123 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str38),           3600},
+      {gperf_offsetof(stringpool, 38),           3600},
 #line 122 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str39),            21600},
+      {gperf_offsetof(stringpool, 39),            21600},
 #line 178 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str40),               18000},
+      {gperf_offsetof(stringpool, 40),               18000},
 #line 120 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str41),          34200},
+      {gperf_offsetof(stringpool, 41),          34200},
 #line 121 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str42),        -21600},
+      {gperf_offsetof(stringpool, 42),        -21600},
       {-1},
 #line 13 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str44), -5*3600},
+      {gperf_offsetof(stringpool, 44), -5*3600},
 #line 14 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str45), -4*3600},
+      {gperf_offsetof(stringpool, 45), -4*3600},
 #line 124 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str46),         3600},
+      {gperf_offsetof(stringpool, 46),         3600},
 #line 80 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str47),  2*3600},
+      {gperf_offsetof(stringpool, 47),  2*3600},
 #line 164 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str48),                 25200},
+      {gperf_offsetof(stringpool, 48),                 25200},
 #line 88 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str49), 3*3600},
+      {gperf_offsetof(stringpool, 49), 3*3600},
 #line 87 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str50),  3*3600},
+      {gperf_offsetof(stringpool, 50),  3*3600},
 #line 45 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str51),    0*3600},
+      {gperf_offsetof(stringpool, 51),    0*3600},
 #line 101 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str52),10*3600},
+      {gperf_offsetof(stringpool, 52),10*3600},
 #line 103 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str53),11*3600},
+      {gperf_offsetof(stringpool, 53),11*3600},
 #line 160 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str54),             -10800},
+      {gperf_offsetof(stringpool, 54),             -10800},
 #line 177 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str55),                3600},
+      {gperf_offsetof(stringpool, 55),                3600},
 #line 23 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str56),    3*3600},
+      {gperf_offsetof(stringpool, 56),    3*3600},
 #line 63 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str57), -9*3600},
+      {gperf_offsetof(stringpool, 57), -9*3600},
 #line 59 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str58), -8*3600},
+      {gperf_offsetof(stringpool, 58), -8*3600},
 #line 100 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str59),  9*3600},
+      {gperf_offsetof(stringpool, 59),  9*3600},
 #line 57 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str60), -4*3600},
+      {gperf_offsetof(stringpool, 60), -4*3600},
 #line 133 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str61),                -18000},
+      {gperf_offsetof(stringpool, 61),                -18000},
 #line 54 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str62),-3*3600},
+      {gperf_offsetof(stringpool, 62),-3*3600},
 #line 86 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str63),   3*3600},
+      {gperf_offsetof(stringpool, 63),   3*3600},
 #line 175 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str64),            28800},
+      {gperf_offsetof(stringpool, 64),            28800},
 #line 70 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str65),  1*3600},
+      {gperf_offsetof(stringpool, 65),  1*3600},
 #line 96 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str66),  8*3600},
+      {gperf_offsetof(stringpool, 66),  8*3600},
 #line 53 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str67), -3*3600},
+      {gperf_offsetof(stringpool, 67), -3*3600},
       {-1},
 #line 49 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str69),-2*3600},
+      {gperf_offsetof(stringpool, 69),-2*3600},
       {-1},
 #line 21 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str71),    1*3600},
+      {gperf_offsetof(stringpool, 71),    1*3600},
 #line 131 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str72),                7200},
+      {gperf_offsetof(stringpool, 72),                7200},
 #line 48 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str73),  -2*3600},
+      {gperf_offsetof(stringpool, 73),  -2*3600},
 #line 126 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str74),                -21600},
+      {gperf_offsetof(stringpool, 74),                -21600},
 #line 56 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str75), -4*3600},
+      {gperf_offsetof(stringpool, 75), -4*3600},
 #line 52 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str76), -3*3600},
+      {gperf_offsetof(stringpool, 76), -3*3600},
 #line 51 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str77), -3*3600},
+      {gperf_offsetof(stringpool, 77), -3*3600},
 #line 129 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str78),               10800},
+      {gperf_offsetof(stringpool, 78),               10800},
 #line 132 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str79),       -10800},
+      {gperf_offsetof(stringpool, 79),       -10800},
 #line 99 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str80),  9*3600},
+      {gperf_offsetof(stringpool, 80),  9*3600},
 #line 130 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str81),            36000},
+      {gperf_offsetof(stringpool, 81),            36000},
 #line 39 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str82),   -7*3600},
+      {gperf_offsetof(stringpool, 82),   -7*3600},
 #line 68 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str83),  -11*3600},
+      {gperf_offsetof(stringpool, 83),  -11*3600},
 #line 33 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str84),   -1*3600},
+      {gperf_offsetof(stringpool, 84),   -1*3600},
 #line 55 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str85), -(3*3600+1800)},
+      {gperf_offsetof(stringpool, 85), -(3*3600+1800)},
 #line 50 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str86), -(2*3600+1800)},
+      {gperf_offsetof(stringpool, 86), -(2*3600+1800)},
 #line 117 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str87),         -21600},
+      {gperf_offsetof(stringpool, 87),         -21600},
 #line 125 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str88),         39600},
+      {gperf_offsetof(stringpool, 88),         39600},
 #line 179 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str89),            36000},
+      {gperf_offsetof(stringpool, 89),            36000},
 #line 67 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str90),-10*3600},
+      {gperf_offsetof(stringpool, 90),-10*3600},
 #line 62 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str91), -9*3600},
+      {gperf_offsetof(stringpool, 91), -9*3600},
       {-1},
 #line 165 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str93),         28800},
+      {gperf_offsetof(stringpool, 93),         28800},
       {-1},
 #line 94 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str95),  6*3600},
+      {gperf_offsetof(stringpool, 95),  6*3600},
       {-1},
 #line 159 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str97),                 10800},
+      {gperf_offsetof(stringpool, 97),                 10800},
 #line 66 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str98),-10*3600},
+      {gperf_offsetof(stringpool, 98),-10*3600},
 #line 61 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str99),-9*3600},
+      {gperf_offsetof(stringpool, 99),-9*3600},
 #line 102 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str100), 10*3600},
+      {gperf_offsetof(stringpool, 100), 10*3600},
 #line 92 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str101),  5*3600},
+      {gperf_offsetof(stringpool, 101),  5*3600},
 #line 93 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str102),  (5*3600+1800)},
+      {gperf_offsetof(stringpool, 102),  (5*3600+1800)},
 #line 76 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str103),  1*3600},
+      {gperf_offsetof(stringpool, 103),  1*3600},
 #line 42 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str104),  -10*3600},
+      {gperf_offsetof(stringpool, 104),  -10*3600},
 #line 91 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str105),  4*3600},
+      {gperf_offsetof(stringpool, 105),  4*3600},
       {-1},
 #line 75 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str107),  1*3600},
+      {gperf_offsetof(stringpool, 107),  1*3600},
 #line 118 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str108),              -3600},
+      {gperf_offsetof(stringpool, 108),              -3600},
 #line 83 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str109), 2*3600},
+      {gperf_offsetof(stringpool, 109), 2*3600},
 #line 138 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str110),              -10800},
+      {gperf_offsetof(stringpool, 110),              -10800},
       {-1},
 #line 43 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str112),  -11*3600},
+      {gperf_offsetof(stringpool, 112),  -11*3600},
       {-1},
 #line 74 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str114), 1*3600},
+      {gperf_offsetof(stringpool, 114), 1*3600},
 #line 176 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str115),        3600},
+      {gperf_offsetof(stringpool, 115),        3600},
 #line 30 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str116),   10*3600},
+      {gperf_offsetof(stringpool, 116),   10*3600},
 #line 22 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str117),    2*3600},
+      {gperf_offsetof(stringpool, 117),    2*3600},
       {-1},
 #line 32 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str119),   12*3600},
+      {gperf_offsetof(stringpool, 119),   12*3600},
 #line 167 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str120),               21600},
+      {gperf_offsetof(stringpool, 120),               21600},
       {-1},
 #line 81 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str122),  2*3600},
+      {gperf_offsetof(stringpool, 122),  2*3600},
       {-1},
 #line 143 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str124),                    12600},
+      {gperf_offsetof(stringpool, 124),                    12600},
 #line 97 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str125),  8*3600},
+      {gperf_offsetof(stringpool, 125),  8*3600},
 #line 11 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str126),   0*3600},
+      {gperf_offsetof(stringpool, 126),   0*3600},
       {-1},
 #line 36 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str128),   -4*3600},
+      {gperf_offsetof(stringpool, 128),   -4*3600},
 #line 106 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str129), 12*3600},
+      {gperf_offsetof(stringpool, 129), 12*3600},
       {-1},
 #line 105 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str131),12*3600},
+      {gperf_offsetof(stringpool, 131),12*3600},
 #line 107 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str132),13*3600},
+      {gperf_offsetof(stringpool, 132),13*3600},
 #line 149 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str133),                 23400},
+      {gperf_offsetof(stringpool, 133),                 23400},
       {-1},
 #line 109 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str135),                -32400},
+      {gperf_offsetof(stringpool, 135),                -32400},
 #line 19 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str136), -8*3600},
+      {gperf_offsetof(stringpool, 136), -8*3600},
 #line 20 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str137), -7*3600},
+      {gperf_offsetof(stringpool, 137), -7*3600},
 #line 162 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str138),             -14400},
+      {gperf_offsetof(stringpool, 138),             -14400},
 #line 145 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str139),                   32400},
+      {gperf_offsetof(stringpool, 139),                   32400},
       {-1}, {-1},
 #line 44 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str142),  -12*3600},
+      {gperf_offsetof(stringpool, 142),  -12*3600},
 #line 26 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str143),    6*3600},
+      {gperf_offsetof(stringpool, 143),    6*3600},
 #line 60 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str144),-9*3600},
+      {gperf_offsetof(stringpool, 144),-9*3600},
 #line 58 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str145),-8*3600},
+      {gperf_offsetof(stringpool, 145),-8*3600},
       {-1}, {-1},
 #line 119 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str148),                14400},
+      {gperf_offsetof(stringpool, 148),                14400},
       {-1},
 #line 89 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str150),  3*3600},
+      {gperf_offsetof(stringpool, 150),  3*3600},
 #line 104 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str151),12*3600},
+      {gperf_offsetof(stringpool, 151),12*3600},
       {-1},
 #line 111 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str153),                 14400},
+      {gperf_offsetof(stringpool, 153),                 14400},
       {-1},
 #line 34 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str155),   -2*3600},
+      {gperf_offsetof(stringpool, 155),   -2*3600},
 #line 31 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str156),   11*3600},
+      {gperf_offsetof(stringpool, 156),   11*3600},
 #line 147 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str157),            -7200},
+      {gperf_offsetof(stringpool, 157),            -7200},
       {-1}, {-1},
 #line 172 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str160),             -18000},
+      {gperf_offsetof(stringpool, 160),             -18000},
       {-1}, {-1}, {-1},
 #line 64 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str164),-10*3600},
+      {gperf_offsetof(stringpool, 164),-10*3600},
       {-1}, {-1},
 #line 28 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str167),    8*3600},
+      {gperf_offsetof(stringpool, 167),    8*3600},
 #line 137 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str168),                      7200},
+      {gperf_offsetof(stringpool, 168),                      7200},
 #line 29 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str169),    9*3600},
+      {gperf_offsetof(stringpool, 169),    9*3600},
 #line 155 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str170),              25200},
+      {gperf_offsetof(stringpool, 170),              25200},
 #line 150 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str171),         21600},
+      {gperf_offsetof(stringpool, 171),         21600},
 #line 154 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str172),         28800},
+      {gperf_offsetof(stringpool, 172),         28800},
       {-1},
 #line 161 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str174),             -18000},
+      {gperf_offsetof(stringpool, 174),             -18000},
       {-1}, {-1},
 #line 166 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str177),             7200},
+      {gperf_offsetof(stringpool, 177),             7200},
       {-1}, {-1}, {-1},
 #line 115 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str181),             36000},
+      {gperf_offsetof(stringpool, 181),             36000},
 #line 113 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str182),               -14400},
+      {gperf_offsetof(stringpool, 182),               -14400},
       {-1}, {-1}, {-1},
 #line 146 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str186),                 -21600},
+      {gperf_offsetof(stringpool, 186),                 -21600},
       {-1},
 #line 148 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str188),               -25200},
+      {gperf_offsetof(stringpool, 188),               -25200},
       {-1},
 #line 127 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str190),                   28800},
+      {gperf_offsetof(stringpool, 190),                   28800},
 #line 116 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str191),                  -3600},
+      {gperf_offsetof(stringpool, 191),                  -3600},
 #line 142 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str192),                   19800},
+      {gperf_offsetof(stringpool, 192),                   19800},
       {-1},
 #line 40 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str194),   -8*3600},
+      {gperf_offsetof(stringpool, 194),   -8*3600},
 #line 112 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str195),                  10800},
+      {gperf_offsetof(stringpool, 195),                  10800},
 #line 139 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str196),                   0},
+      {gperf_offsetof(stringpool, 196),                   0},
 #line 152 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str197),             43200},
+      {gperf_offsetof(stringpool, 197),             43200},
 #line 141 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str198),               -36000},
+      {gperf_offsetof(stringpool, 198),               -36000},
 #line 27 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str199),    7*3600},
+      {gperf_offsetof(stringpool, 199),    7*3600},
 #line 158 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str200),                  3600},
+      {gperf_offsetof(stringpool, 200),                  3600},
       {-1}, {-1},
 #line 110 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str203),                    10800},
+      {gperf_offsetof(stringpool, 203),                    10800},
 #line 163 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str204),                  -39600},
+      {gperf_offsetof(stringpool, 204),                  -39600},
 #line 41 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str205),   -9*3600},
+      {gperf_offsetof(stringpool, 205),   -9*3600},
 #line 35 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str206),   -3*3600},
+      {gperf_offsetof(stringpool, 206),   -3*3600},
 #line 12 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str207),  0*3600},
+      {gperf_offsetof(stringpool, 207),  0*3600},
 #line 169 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str208),                36000},
+      {gperf_offsetof(stringpool, 208),                36000},
 #line 72 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str209),  1*3600},
+      {gperf_offsetof(stringpool, 209),  1*3600},
       {-1},
 #line 153 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str211),           -12600},
+      {gperf_offsetof(stringpool, 211),           -12600},
       {-1}, {-1}, {-1}, {-1}, {-1},
 #line 151 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str217),                   20700},
+      {gperf_offsetof(stringpool, 217),                   20700},
 #line 114 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str218),             34200},
+      {gperf_offsetof(stringpool, 218),             34200},
       {-1}, {-1},
 #line 140 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str221),                      7200},
+      {gperf_offsetof(stringpool, 221),                      7200},
       {-1},
 #line 174 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str223),             36000},
+      {gperf_offsetof(stringpool, 223),             36000},
       {-1}, {-1}, {-1}, {-1}, {-1},
 #line 46 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str229),  0*3600},
+      {gperf_offsetof(stringpool, 229),  0*3600},
       {-1}, {-1}, {-1},
 #line 135 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str233),            18000},
+      {gperf_offsetof(stringpool, 233),            18000},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
 #line 173 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str265),            -25200},
+      {gperf_offsetof(stringpool, 265),            -25200},
       {-1}, {-1}, {-1},
 #line 144 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str269),                7200},
+      {gperf_offsetof(stringpool, 269),                7200},
       {-1}, {-1},
 #line 180 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str272),                 32400},
+      {gperf_offsetof(stringpool, 272),                 32400},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #line 156 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str279),             -14400},
+      {gperf_offsetof(stringpool, 279),             -14400},
       {-1}, {-1},
 #line 171 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str282),                   46800},
+      {gperf_offsetof(stringpool, 282),                   46800},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1},
 #line 108 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str314),             16200},
+      {gperf_offsetof(stringpool, 314),             16200},
       {-1}, {-1}, {-1}, {-1},
 #line 69 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str319),-12*3600},
+      {gperf_offsetof(stringpool, 319),-12*3600},
       {-1}, {-1},
 #line 157 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str322),                -28800},
+      {gperf_offsetof(stringpool, 322),                -28800},
       {-1}, {-1}, {-1}, {-1},
 #line 168 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str327),                  28800},
+      {gperf_offsetof(stringpool, 327),                  28800},
 #line 134 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str328),                    7200},
+      {gperf_offsetof(stringpool, 328),                    7200},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
@@ -870,21 +863,21 @@ zonetab (str, len)
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #line 170 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str392),                   32400},
+      {gperf_offsetof(stringpool, 392),                   32400},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
       {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
 #line 136 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str438),                    43200}
+      {gperf_offsetof(stringpool, 438),                    43200}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register int key = hash (str, len);
+      register unsigned int key = hash (str, len);
 
-      if (key <= MAX_HASH_VALUE && key >= 0)
+      if (key <= MAX_HASH_VALUE)
         {
           register int o = wordlist[key].name;
           if (o >= 0)