tizen 2.4 release

[framework/base/tizen-locale.git] / iconvdata / euc-jp.c

diff --git a/iconvdata/euc-jp.c b/iconvdata/euc-jp.c
index 9cb6a47..0945554 100644 (file)
--- a/iconvdata/euc-jp.c
+++ b/iconvdata/euc-jp.c
@@ -1,5 +1,5 @@
 /* Mapping tables for EUC-JP handling.
-   Copyright (C) 1998, 1999, 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 1998-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -14,9 +14,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
 #include <dlfcn.h>
 #include <stdint.h>
@@ -34,6 +33,7 @@
 #define MIN_NEEDED_FROM                1
 #define MAX_NEEDED_FROM                3
 #define MIN_NEEDED_TO          4
+#define ONE_DIRECTION          0
 
 
 /* First define the conversion function from EUC-JP to UCS4.  */
@@ -58,7 +58,7 @@
           byte is also available.  */                                        \
        int ch2;                                                              \
                                                                              \
-       if (__builtin_expect (inptr + 1 >= inend, 0))                         \
+       if (__glibc_unlikely (inptr + 1 >= inend))                            \
          {                                                                   \
            /* The second byte is not available.  Store the                   \
               intermediate result.  */                                       \
@@ -69,7 +69,7 @@
        ch2 = inptr[1];                                                       \
                                                                              \
        /* All second bytes of a multibyte character must be >= 0xa1. */      \
-       if (__builtin_expect (ch2 < 0xa1, 0))                                 \
+       if (__glibc_unlikely (ch2 < 0xa1))                                    \
          STANDARD_FROM_LOOP_ERR_HANDLER (1);                                 \
                                                                              \
        if (ch == 0x8e)                                                       \
@@ -106,7 +106,7 @@
                result = __GCONV_INCOMPLETE_INPUT;                            \
                break;                                                        \
              }                                                               \
-           if (__builtin_expect (ch == __UNKNOWN_10646_CHAR, 0))             \
+           if (__glibc_unlikely (ch == __UNKNOWN_10646_CHAR))                \
              /* Illegal character.  */                                       \
              STANDARD_FROM_LOOP_ERR_HANDLER (1);                             \
                                                                              \
@@ -152,7 +152,7 @@
        size_t found;                                                         \
                                                                              \
        /* See whether we have room for at least two characters.  */          \
-       if (__builtin_expect (outptr + 1 >= outend, 0))                       \
+       if (__glibc_unlikely (outptr + 1 >= outend))                          \
          {                                                                   \
            result = __GCONV_FULL_OUTPUT;                                     \
            break;                                                            \