From bf5b6f368bea7256bd54a46ed631610626d61c5c Mon Sep 17 00:00:00 2001 From: Slava Zanko Date: Mon, 26 Oct 2009 11:01:30 +0200 Subject: [PATCH] Ticket #1627: glib macros fix. This is incomplete copy of same glib-function. For older glib (less than 2.13) functional is enought. For full version of glib welcome to glib update. Signed-off-by: Slava Zanko --- src/glibcompat.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/glibcompat.c b/src/glibcompat.c index 22ff3797c..6bbf7bc91 100644 --- a/src/glibcompat.c +++ b/src/glibcompat.c @@ -39,13 +39,6 @@ /*** file scope macro definitions ****************************************************************/ -#if ! GLIB_CHECK_VERSION (2, 13, 0) -#define ISZEROWIDTHTYPE(Type) IS ((Type), \ - OR (G_UNICODE_NON_SPACING_MARK, \ - OR (G_UNICODE_ENCLOSING_MARK, \ - OR (G_UNICODE_FORMAT, 0)))) -#endif /* ! GLIB_CHECK_VERSION (2, 13, 0) */ - /*** file scope type declarations ****************************************************************/ /*** file scope variables ************************************************************************/ @@ -56,15 +49,17 @@ /* --------------------------------------------------------------------------------------------- */ #if ! GLIB_CHECK_VERSION (2, 13, 0) +/* + This is incomplete copy of same glib-function. + For older glib (less than 2.13) functional is enought. + For full version of glib welcome to glib update. +*/ gboolean g_unichar_iszerowidth (gunichar c) { if (G_UNLIKELY (c == 0x00AD)) return FALSE; - if (G_UNLIKELY (ISZEROWIDTHTYPE (TYPE (c)))) - return TRUE; - if (G_UNLIKELY ((c >= 0x1160 && c < 0x1200) || c == 0x200B)) return TRUE;