Add cast to avoid warning.

diff --git a/iconvdata/ansi_x3.110.c b/iconvdata/ansi_x3.110.c
index ed312a0..e1dd0ed 100644 (file)
--- a/iconvdata/ansi_x3.110.c
+++ b/iconvdata/ansi_x3.110.c
@@ -474,7 +474,7 @@ static const char from_ucs4[][2] =
     uint32_t ch = get32 (inptr);                                             \
     const char *cp;                                                          \
                                                                              \
-    if (__builtin_expect (ch, 0)                                             \
+    if ((size_t) __builtin_expect (ch, 0)                                    \
        >= sizeof (from_ucs4) / sizeof (from_ucs4[0]))                        \
       {                                                                              \
        if (ch == 0x2c7)                                                      \

diff --git a/iconvdata/big5.c b/iconvdata/big5.c
index 442fc8f..e06b446 100644 (file)
--- a/iconvdata/big5.c
+++ b/iconvdata/big5.c
@@ -8484,7 +8484,7 @@ static const char from_ucs4_tab15[][2] =
     uint32_t ch = get32 (inptr);                                             \
     const char *cp;                                                          \
                                                                              \
-    if (__builtin_expect (ch, 0)                                             \
+    if ((size_t) __builtin_expect (ch, 0)                                    \
        >= sizeof (from_ucs4_tab1) / sizeof (from_ucs4_tab1[0]))              \
       switch (ch)                                                            \
        {                                                                     \

diff --git a/iconvdata/big5hkscs.c b/iconvdata/big5hkscs.c
index 3112228..7f4a8c3 100644 (file)
--- a/iconvdata/big5hkscs.c
+++ b/iconvdata/big5hkscs.c
@@ -11756,7 +11756,9 @@ static struct
     const char *cp = "";                                                     \
     int i;                                                                   \
                                                                              \
-    for (i = 0; i < sizeof (from_ucs4_idx) / sizeof (from_ucs4_idx[0]); ++i)  \
+    for (i = 0;                                                                      \
+        i < (int) (sizeof (from_ucs4_idx) / sizeof (from_ucs4_idx[0]));      \
+        ++i)                                                                 \
       {                                                                              \
        if (ch < from_ucs4_idx[i].from)                                       \
          break;                                                              \

diff --git a/iconvdata/iso_6937-2.c b/iconvdata/iso_6937-2.c
index 01c0c58..5f8956e 100644 (file)
--- a/iconvdata/iso_6937-2.c
+++ b/iconvdata/iso_6937-2.c
@@ -490,7 +490,7 @@ static const char from_ucs4[][2] =
     uint32_t ch = get32 (inptr);                                             \
     const char *cp;                                                          \
                                                                              \
-    if (__builtin_expect (ch, 0)                                             \
+    if ((size_t) __builtin_expect (ch, 0)                                    \
        >= sizeof (from_ucs4) / sizeof (from_ucs4[0]))                        \
       {                                                                              \
        switch (ch)                                                           \

diff --git a/iconvdata/iso_6937.c b/iconvdata/iso_6937.c
index ccae483..74b8990 100644 (file)
--- a/iconvdata/iso_6937.c
+++ b/iconvdata/iso_6937.c
@@ -482,7 +482,7 @@ static const char from_ucs4[][2] =
     uint32_t ch = get32 (inptr);                                             \
     const char *cp;                                                          \
                                                                              \
-    if (__builtin_expect (ch, 0)                                             \
+    if ((size_t) __builtin_expect (ch, 0)                                    \
        >= sizeof (from_ucs4) / sizeof (from_ucs4[0]))                        \
       {                                                                              \
        int fail = 0;                                                         \

diff --git a/iconvdata/t.61.c b/iconvdata/t.61.c
index 17a22a3..302226d 100644 (file)
--- a/iconvdata/t.61.c
+++ b/iconvdata/t.61.c
@@ -457,7 +457,7 @@ static const char from_ucs4[][2] =
     uint32_t ch = get32 (inptr);                                             \
     const char *cp;                                                          \
                                                                              \
-    if (__builtin_expect (ch, 0)                                             \
+    if ((size_t) __builtin_expect (ch, 0)                                    \
        >= sizeof (from_ucs4) / sizeof (from_ucs4[0]))                        \
       {                                                                              \
        if (__builtin_expect (ch, 0) == 0x2126)                               \