2003-03-a30 Matthias Clasen <maclas@gmx.de>

	* glib/gutf8.c (UNICODE_VALID): Update to Unicode 3.1 and optimize
	a bit.  (#107427, Noah Lewitt)

diff --git a/ChangeLog b/ChangeLog
index fc2293d..93e1397 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-03-30  Matthias Clasen  <maclas@gmx.de>
 
+       * glib/gutf8.c (UNICODE_VALID): Update to Unicode 3.1 and optimize
+       a bit.  (#107427, Noah Lewitt)
+
        * glib/libcharset/config.charset: Add cp1251 support for Solaris.
        (#104738, Hidetoshi Tajima)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fc2293d..93e1397 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2003-03-30  Matthias Clasen  <maclas@gmx.de>
 
+       * glib/gutf8.c (UNICODE_VALID): Update to Unicode 3.1 and optimize
+       a bit.  (#107427, Noah Lewitt)
+
        * glib/libcharset/config.charset: Add cp1251 support for Solaris.
        (#104738, Hidetoshi Tajima)
 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index fc2293d..93e1397 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,8 @@
 2003-03-30  Matthias Clasen  <maclas@gmx.de>
 
+       * glib/gutf8.c (UNICODE_VALID): Update to Unicode 3.1 and optimize
+       a bit.  (#107427, Noah Lewitt)
+
        * glib/libcharset/config.charset: Add cp1251 support for Solaris.
        (#104738, Hidetoshi Tajima)
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fc2293d..93e1397 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,8 @@
 2003-03-30  Matthias Clasen  <maclas@gmx.de>
 
+       * glib/gutf8.c (UNICODE_VALID): Update to Unicode 3.1 and optimize
+       a bit.  (#107427, Noah Lewitt)
+
        * glib/libcharset/config.charset: Add cp1251 support for Solaris.
        (#104738, Hidetoshi Tajima)
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fc2293d..93e1397 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2003-03-30  Matthias Clasen  <maclas@gmx.de>
 
+       * glib/gutf8.c (UNICODE_VALID): Update to Unicode 3.1 and optimize
+       a bit.  (#107427, Noah Lewitt)
+
        * glib/libcharset/config.charset: Add cp1251 support for Solaris.
        (#104738, Hidetoshi Tajima)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fc2293d..93e1397 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2003-03-30  Matthias Clasen  <maclas@gmx.de>
 
+       * glib/gutf8.c (UNICODE_VALID): Update to Unicode 3.1 and optimize
+       a bit.  (#107427, Noah Lewitt)
+
        * glib/libcharset/config.charset: Add cp1251 support for Solaris.
        (#104738, Hidetoshi Tajima)
 

diff --git a/glib/gutf8.c b/glib/gutf8.c
index 6b01a09..9371bf1 100644 (file)
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -97,8 +97,9 @@
 
 #define UNICODE_VALID(Char)                   \
     ((Char) < 0x110000 &&                     \
-     ((Char) < 0xD800 || (Char) >= 0xE000) && \
-     (Char) != 0xFFFE && (Char) != 0xFFFF)
+     (((Char) & 0xFFFFF800) != 0xD800) &&     \
+     ((Char) < 0xFDD0 || (Char) > 0xFDEF) &&  \
+     ((Char) & 0xFFFF) != 0xFFFF)
    
      
 static const gchar utf8_skip_data[256] = {