Merge branch 'stable'

[gnulib.git] / lib / uniwidth / width.c

diff --git a/lib/uniwidth/width.c b/lib/uniwidth/width.c
index f882257..3ed398e 100644 (file)
--- a/lib/uniwidth/width.c
+++ b/lib/uniwidth/width.c
@@ -1,5 +1,5 @@
 /* Determine display width of Unicode character.
-   Copyright (C) 2001-2002, 2006-2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2014 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -22,14 +22,6 @@
 
 #include "cjk.h"
 
-/* The attribute __pure__ was added in gcc 2.96.  */
-#undef _GL_ATTRIBUTE_PURE
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
-
 /*
  * Non-spacing attribute table.
  * Consists of:
@@ -319,7 +311,7 @@ static const signed char nonspacing_table_ind[240] = {
 };
 
 /* Determine number of column positions required for UC.  */
-int _GL_ATTRIBUTE_PURE
+int
 uc_width (ucs4_t uc, const char *encoding)
 {
   /* Test for non-spacing or control character.  */