Fix compilation errors on AIX 3.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 735f12a7ffe3302168a1970155dca1487161ed34..bcfa0cd47c31e9c97420ec0b386c1ca2ec6ea986 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-19  Bruno Haible  <bruno@clisp.org>
+
+       * x-perl.c (enum string_type_ty): Remove trailing comma.
+       (interpolate_keywords::enum parser_state): Likewise.
+       (extract_quotelike_pass3): Cast first argument of u8_uctomb().
+
 2003-06-15  Bruno Haible  <bruno@clisp.org>
 
        * x-awk.c: Reorder definitions.

diff --git a/gettext-tools/src/x-perl.c b/gettext-tools/src/x-perl.c
index c402a0941a74d0a685e6ac8892b92aa78b6f06d6..6152ad05294e82782129c6002bb77351ce148a4d 100644 (file)
--- a/gettext-tools/src/x-perl.c
+++ b/gettext-tools/src/x-perl.c
@@ -445,7 +445,7 @@ enum string_type_ty
   string_type_q,            /* "'..'", "q/.../".  */
   string_type_qq,           /* '"..."', "`...`", "qq/.../", "qx/.../",
                               "<file*glob>".  */
-  string_type_qr,           /* Not supported.  */
+  string_type_qr            /* Not supported.  */
 };
 typedef enum string_type_ty string_type_ty;
 
@@ -880,7 +880,8 @@ extract_quotelike_pass3 (token_ty *tp, int error_level)
                crs = extract_oct (crs + 1, 3, &oct_number);
                /* Yes, octal escape sequences in the range 0x100..0x1ff are
                   valid.  */
-               length = u8_uctomb (buffer + bufpos, oct_number, 2);
+               length = u8_uctomb ((unsigned char *) (buffer + bufpos),
+                                   oct_number, 2);
                if (length > 0)
                  bufpos += length;
              }
@@ -915,7 +916,8 @@ extract_quotelike_pass3 (token_ty *tp, int error_level)
                    crs = extract_hex (crs, 2, &hex_number);
                  }
 
-               length = u8_uctomb (buffer + bufpos, hex_number, 6);
+               length = u8_uctomb ((unsigned char *) (buffer + bufpos),
+                                   hex_number, 6);
                if (length > 0)
                  bufpos += length;
              }
@@ -948,7 +950,9 @@ extract_quotelike_pass3 (token_ty *tp, int error_level)
                      unicode = unicode_name_character (name);
                      if (unicode != UNINAME_INVALID)
                        {
-                         int length = u8_uctomb (buffer + bufpos, unicode, 6);
+                         int length =
+                           u8_uctomb ((unsigned char *) (buffer + bufpos),
+                                      unicode, 6);
                          if (length > 0)
                            bufpos += length;
                        }
@@ -1454,7 +1458,7 @@ interpolate_keywords (message_list_ty *mlp, const char *string, int lineno)
       dquote,
       squote,
       barekey,
-      wait_rbrace,
+      wait_rbrace
     } state;
   token_ty token;