tizen 2.4 release

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

diff --git a/iconvdata/gbk.c b/iconvdata/gbk.c
index c90ad77..f838dc1 100644 (file)
--- a/iconvdata/gbk.c
+++ b/iconvdata/gbk.c
@@ -1,5 +1,5 @@
 /* Mapping tables for GBK handling.
-   Copyright (C) 1999, 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 1999-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Sean Chen <sean.chen@turbolinux.com>, 1999.
 
@@ -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 <gconv.h>
@@ -13131,6 +13130,7 @@ static const char __gbk_from_ucs4_tab12[][2] =
 #define MIN_NEEDED_FROM                1
 #define MAX_NEEDED_FROM                2
 #define MIN_NEEDED_TO          4
+#define ONE_DIRECTION          0
 
 
 /* First define the conversion function from GBK to UCS4.  */
@@ -13158,7 +13158,7 @@ static const char __gbk_from_ucs4_tab12[][2] =
          uint32_t ch2;                                                       \
          int idx;                                                            \
                                                                              \
-         if (__builtin_expect (inptr + 1 >= inend, 0))                       \
+         if (__glibc_unlikely (inptr + 1 >= inend))                          \
            {                                                                 \
              /* The second character is not available.  Store                \
                 the intermediate result.  */                                 \