From 30ed5f53e205e6bfc35126a9d3c62dac8a9c5dad Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@gnome.org>
Date: Thu, 19 Jun 2014 19:29:16 +0200
Subject: [PATCH] unicode: Switch compose_second_single to gunichar

This will be required for the update to unicode 7.0.0.
---
 glib/gen-unicode-tables.pl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/glib/gen-unicode-tables.pl b/glib/gen-unicode-tables.pl
index 46c4b2708..ebcb4a44c 100755
--- a/glib/gen-unicode-tables.pl
+++ b/glib/gen-unicode-tables.pl
@@ -1323,12 +1323,9 @@ sub output_composition_table
 		  
     # Output second singletons
 
-    print OUT "static const guint16 compose_second_single[][2] = {\n";
+    print OUT "static const gunichar compose_second_single[][2] = {\n";
     $i = 0;				     
     for $record (@second_singletons) {
-        if ($record->[1] > 0xFFFF or $record->[2] > 0xFFFF) {
-            die "time to switch compose_second_single to gunichar";
-        }
 	print OUT ",\n" if $i++ > 0;
 	printf OUT " { %#06x, %#06x }", $record->[1], $record->[2];
     }