File fribidi-0.19.2-glib_h_includes.patch of Package mingw64-fribidi

Overview Repositories Revisions Requests Users Attributes Meta

File fribidi-0.19.2-glib_h_includes.patch of Package mingw64-fribidi (Revision c662ecc2090cc8df03109cc4c0b69e8f)

Currently displaying revision c662ecc2090cc8df03109cc4c0b69e8f , Show latest

--- fribidi-0.19.2/charset/fribidi-char-sets.c	2006-01-31 04:23:12.000000000 +0100
+++ fribidi-0.19.2/charset/fribidi-char-sets.c	2012-04-05 09:44:37.135369443 +0200
@@ -114,7 +114,7 @@
 };
 
 #if FRIBIDI_USE_GLIB+0
-# include <glib/gstrfuncs.h>
+# include <glib.h>
 # define fribidi_strcasecmp g_ascii_strcasecmp
 #else /* !FRIBIDI_USE_GLIB */
 static char
--- fribidi-0.19.2/lib/common.h	2008-04-08 23:38:23.000000000 +0200
+++ fribidi-0.19.2/lib/common.h	2012-04-05 09:40:30.123508165 +0200
@@ -50,28 +50,20 @@
 #endif /* WIN32 */
 
 #if FRIBIDI_USE_GLIB+0
+# include <glib.h>
 # ifndef SIZEOF_LONG
 #  define SIZEOF_LONG GLIB_SIZEOF_LONG
 # endif	/* !SIZEOF_LONG */
 # ifndef SIZEOF_VOID_P
 #  define SIZEOF_VOID_P GLIB_SIZEOF_VOID_P
 # endif	/* !SIZEOF_VOID_P */
-# ifndef __FRIBIDI_DOC
-#  include <glib/gmem.h>
-# endif	/* !__FRIBIDI_DOC */
 # ifndef fribidi_malloc
 #  define fribidi_malloc g_try_malloc
 #  define fribidi_free g_free
 # endif	/* !fribidi_malloc */
 # ifndef fribidi_assert
-#  ifndef __FRIBIDI_DOC
-#   include <glib/gmessages.h>
-#  endif /* !__FRIBIDI_DOC */
 #  define fribidi_assert g_assert
 # endif	/* !fribidi_assert */
-# ifndef __FRIBIDI_DOC
-#  include <glib/gmacros.h>
-# endif	/* !__FRIBIDI_DOC */
 # ifndef FRIBIDI_BEGIN_STMT
 #  define FRIBIDI_BEGIN_STMT G_STMT_START {
 #  define FRIBIDI_END_STMT } G_STMT_END
--- fribidi-0.19.2/lib/fribidi-common.h	2007-04-05 18:13:24.000000000 +0200
+++ fribidi-0.19.2/lib/fribidi-common.h	2012-04-05 09:42:30.108512839 +0200
@@ -61,9 +61,7 @@
 #endif /* !FRIBIDI_ENTRY */
 
 #if FRIBIDI_USE_GLIB+0
-# ifndef __FRIBIDI_DOC
-#  include <glib/gmacros.h>
-# endif	/* !__FRIBIDI_DOC */
+# include <glib.h>
 # define FRIBIDI_BEGIN_DECLS		G_BEGIN_DECLS
 # define FRIBIDI_END_DECLS		G_END_DECLS
 # define FRIBIDI_GNUC_CONST		G_GNUC_CONST
--- fribidi-0.19.2/lib/fribidi-types.h	2006-01-31 04:23:13.000000000 +0100
+++ fribidi-0.19.2/lib/fribidi-types.h	2012-04-05 09:43:26.112128018 +0200
@@ -39,10 +39,7 @@
 
 
 #if FRIBIDI_USE_GLIB+0
-# ifndef __FRIBIDI_DOC
-#  include <glib/gtypes.h>
-#  include <glib/gunicode.h>
-# endif	/* !__FRIBIDI_DOC */
+# include <glib.h>
 # define FRIBIDI_INT8_LOCAL		gint8
 # define FRIBIDI_INT16_LOCAL		gint16
 # define FRIBIDI_INT32_LOCAL		gint32
--- fribidi-0.19.2/lib/mem.h	2006-01-31 04:23:13.000000000 +0100
+++ fribidi-0.19.2/lib/mem.h	2012-04-05 09:45:47.685620746 +0200
@@ -40,10 +40,7 @@
 #include <fribidi-begindecls.h>
 
 #if FRIBIDI_USE_GLIB+0
-
-#ifndef __FRIBIDI_DOC
-# include <glib/gmem.h>
-#endif /* !__FRIBIDI_DOC */
+#include <glib.h>
 
 #define FriBidiMemChunk GMemChunk
 #define FRIBIDI_ALLOC_ONLY G_ALLOC_ONLY

Places

File fribidi-0.19.2-glib_h_includes.patch of Package mingw64-fribidi (Revision c662ecc2090cc8df03109cc4c0b69e8f)

Places