Merge branch 'feature/upstream' into develop

1 files changed, 8 insertions, 23 deletions

diff --git a/lib/unigbrk/u8-grapheme-breaks.c b/lib/unigbrk/u8-grapheme-breaks.c
index 1c798450..95e32440 100644
--- a/lib/unigbrk/u8-grapheme-breaks.c
+++ b/lib/unigbrk/u8-grapheme-breaks.c
@@ -1,5 +1,5 @@
 /* Grapheme cluster breaks function.
-   Copyright (C) 2001-2003, 2006-2016 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2017 Free Software Foundation, Inc.
    Written by Ben Pfaff <blp@cs.stanford.edu>, 2010,
    based on code written by Bruno Haible <bruno@clisp.org>, 2009.
 
@@ -23,33 +23,18 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
 /* Specification.  */
 #include "unigbrk.h"
 
-#include "unistr.h"
-
-void
-u8_grapheme_breaks (const uint8_t *s, size_t n, char *p)
-{
-  ucs4_t prev;
-  int mblen;
-
-  prev = 0;
-  for (; n > 0; s += mblen, p += mblen, n -= mblen)
-    {
-      ucs4_t next;
-      int i;
+#include <string.h>
 
-      mblen = u8_mbtouc (&next, s, n);
-
-      p[0] = uc_is_grapheme_break (prev, next);
-      for (i = 1; i < mblen; i++)
-        p[i] = 0;
+#include "unistr.h"
 
-      prev = next;
-    }
-}
+#define FUNC u8_grapheme_breaks
+#define UNIT uint8_t
+#define U_MBTOUC u8_mbtouc
+#include "u-grapheme-breaks.h"