[FriBidi-commit] fribidi/lib common.h, 1.11, 1.12 debug.h, 1.5,
1.6 fribidi-bidi-type.c, 1.9, 1.10 fribidi-bidi-type.h, 1.4,
1.5 fribidi-bidi-types-list.h, 1.3, 1.4 fribidi-bidi-types.h,
1.5, 1.6 fribidi-bidi.h, 1.6, 1.7 fribidi-common.h, 1.8,
1.9 fribidi-mirroring.c, 1.8, 1.9 fribidi-mirroring.h, 1.6,
1.7 fribidi-types.h, 1.4, 1.5 fribidi.c, 1.7, 1.8 fribidi.def,
1.3, 1.4 fribidi.h, 1.3, 1.4 mem.h, 1.5, 1.6
Behdad Esfahbod
behdad at pdx.freedesktop.org
Wed Jun 9 07:59:24 PDT 2004
- Previous message: [FriBidi-commit] fribidi/charset Headers.mk, 1.2,
1.3 fribidi-char-sets-cap-rtl.h, 1.1.1.1,
1.2 fribidi-char-sets-cp1255.h, 1.1.1.1,
1.2 fribidi-char-sets-cp1256.h, 1.1.1.1,
1.2 fribidi-char-sets-iso8859-6.h, 1.1.1.1,
1.2 fribidi-char-sets-iso8859-8.h, 1.1.1.1,
1.2 fribidi-char-sets-list.h, 1.2,
1.3 fribidi-char-sets-utf8.h, 1.1.1.1, 1.2 fribidi-char-sets.c,
1.4, 1.5 fribidi-char-sets.h, 1.2, 1.3
- Next message: [FriBidi-commit] fribidi configure.ac,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvs/fribidi/fribidi/lib
In directory pdx:/tmp/cvs-serv19464/lib
Modified Files:
common.h debug.h fribidi-bidi-type.c fribidi-bidi-type.h
fribidi-bidi-types-list.h fribidi-bidi-types.h fribidi-bidi.h
fribidi-common.h fribidi-mirroring.c fribidi-mirroring.h
fribidi-types.h fribidi.c fribidi.def fribidi.h mem.h
Log Message:
Redundant and compatibility stuff removed. A few macros added, to compile
AbiWord from CVS. The most important is the FRIBIDI_TYPE_PRIVATE in
fribidi-bidi-types.h
Index: common.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/common.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- a/common.h 31 May 2004 18:39:39 -0000 1.11
+++ b/common.h 9 Jun 2004 14:59:21 -0000 1.12
@@ -54,22 +54,22 @@
# ifndef SIZEOF_VOID_P
# define SIZEOF_VOID_P GLIB_SIZEOF_VOID_P
# endif /* !SIZEOF_VOID_P */
-# ifndef __C2MAN__
+# ifndef __FRIBIDI_DOC
# include <glib/gmem.h>
-# endif /* !__C2MAN__ */
+# endif /* !__FRIBIDI_DOC */
# ifndef fribidi_malloc
-# define fribidi_malloc g_malloc
+# define fribidi_malloc g_try_malloc
# define fribidi_free g_free
# endif /* !fribidi_malloc */
# ifndef fribidi_assert
-# ifndef __C2MAN__
+# ifndef __FRIBIDI_DOC
# include <glib/gmessages.h>
-# endif /* !__C2MAN__ */
+# endif /* !__FRIBIDI_DOC */
# define fribidi_assert g_assert
# endif /* !fribidi_assert */
-# ifndef __C2MAN__
+# ifndef __FRIBIDI_DOC
# include <glib/gmacros.h>
-# endif /* !__C2MAN__ */
+# endif /* !__FRIBIDI_DOC */
# ifndef FRIBIDI_BEGIN_STMT
# define FRIBIDI_BEGIN_STMT G_STMT_START {
# define FRIBIDI_END_STMT } G_STMT_END
@@ -105,9 +105,9 @@
* No need to include any headers. */
#ifndef fribidi_malloc
# if HAVE_STDLIB_H
-# ifndef __C2MAN__
+# ifndef __FRIBIDI_DOC
# include <stdlib.h>
-# endif /* __C2MAN__ */
+# endif /* __FRIBIDI_DOC */
# define fribidi_malloc malloc
# else /* !HAVE_STDLIB_H */
# define fribidi_malloc (void *) malloc
@@ -123,9 +123,9 @@
* allocated for data structure pools. */
#ifndef FRIBIDI_CHUNK_SIZE
# if HAVE_ASM_PAGE_H
-# ifndef __C2MAN__
+# ifndef __FRIBIDI_DOC
# include <asm/page.h>
-# endif /* __C2MAN__ */
+# endif /* __FRIBIDI_DOC */
# define FRIBIDI_CHUNK_SIZE (PAGE_SIZE - 16)
# else /* !HAVE_ASM_PAGE_H */
# define FRIBIDI_CHUNK_SIZE (4096 - 16)
Index: debug.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/debug.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/debug.h 31 May 2004 18:39:39 -0000 1.5
+++ b/debug.h 9 Jun 2004 14:59:21 -0000 1.6
@@ -55,9 +55,9 @@
#endif /* !__FILE__ */
#ifndef FRIBIDI_FPRINTF
-# ifndef __C2MAN__
+# ifndef __FRIBIDI_DOC
# include <stdio.h>
-# endif /* !__C2MAN__ */
+# endif /* !__FRIBIDI_DOC */
# define FRIBIDI_FPRINTF fprintf
# define FRIBIDI_STDERR_ stderr,
#endif /* !FRIBIDI_FPRINTF */
Index: fribidi-bidi-type.c
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-bidi-type.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/fribidi-bidi-type.c 4 Jun 2004 09:41:11 -0000 1.9
+++ b/fribidi-bidi-type.c 9 Jun 2004 14:59:21 -0000 1.10
@@ -55,8 +55,8 @@
# undef _FRIBIDI_ADD_TYPE
};
-static inline FriBidiCharType
-get_bidi_type (
+FRIBIDI_ENTRY FriBidiCharType
+fribidi_get_bidi_type (
/* input */
FriBidiChar uch
)
@@ -67,55 +67,3 @@
return FRIBIDI_TYPE_LTR;
/* Non-Unicode chars */
}
-
-FRIBIDI_ENTRY FriBidiCharType
-fribidi_get_bidi_type (
- /* input */
- FriBidiChar ch
-)
-{
- return get_bidi_type (ch);
-}
-
-/* The following is only defined for binary compatibility */
-FriBidiCharType
-fribidi_get_type (
- FriBidiChar ch
-)
-{
- return fribidi_get_bidi_type (ch);
-}
-
-/* The following is only defined for binary compatibility */
-FriBidiCharType
-fribidi_get_type_internal (
- FriBidiChar ch
-)
-{
- return fribidi_get_bidi_type (ch);
-}
-
-FRIBIDI_ENTRY void
-fribidi_get_bidi_types (
- /* input */
- const FriBidiChar *str,
- FriBidiStrIndex len,
- /* output */
- FriBidiCharType *type
-)
-{
- register FriBidiStrIndex i = len;
- for (; i; i--)
- *type++ = get_bidi_type (*str++);
-}
-
-/* The following is only defined for binary compatibility */
-void
-fribidi_get_types (
- const FriBidiChar *str,
- FriBidiStrIndex len,
- FriBidiCharType *type
-)
-{
- fribidi_get_bidi_types (str, len, type);
-}
Index: fribidi-bidi-type.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-bidi-type.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/fribidi-bidi-type.h 9 Jun 2004 08:56:53 -0000 1.4
+++ b/fribidi-bidi-type.h 9 Jun 2004 14:59:21 -0000 1.5
@@ -51,39 +51,6 @@
FriBidiChar ch /* input character */
) FRIBIDI_GNUC_CONST;
-/* fribidi_get_type is the old name of fribidi_get_bidi_type. deprecated.*/
-#define fribidi_get_type FRIBIDI_NAMESPACE(get_type)
- FRIBIDI_ENTRY FriBidiCharType fribidi_get_type (
- FriBidiChar ch
-)
- FRIBIDI_GNUC_CONST FRIBIDI_GNUC_DEPRECATED;
-
-#define fribidi_get_type_internal FRIBIDI_NAMESPACE(get_type_internal)
- FRIBIDI_ENTRY FriBidiCharType fribidi_get_type_internal (
- FriBidiChar ch
-)
- FRIBIDI_GNUC_CONST FRIBIDI_GNUC_DEPRECATED;
-
-#define fribidi_get_bidi_types FRIBIDI_NAMESPACE(get_bidi_types)
-/* fribidi_get_bidi_types - get bidi types for an string of characters
- *
- * This function finds the bidi types of an string of characters. See
- * fribidi_get_bidi_type for more information.
- */
- FRIBIDI_ENTRY void fribidi_get_bidi_types (
- const FriBidiChar *str, /* input string */
- FriBidiStrIndex len, /* input string length */
- FriBidiCharType *type /* output bidi types */
-);
-
-/* fribidi_get_types is the old name of fribidi_get_bidi_types. deprecated. */
-#define fribidi_get_types FRIBIDI_NAMESPACE(get_types)
- FRIBIDI_ENTRY void fribidi_get_types (
- const FriBidiChar *str,
- FriBidiStrIndex len,
- FriBidiCharType *type
-) FRIBIDI_GNUC_DEPRECATED;
-
#include "fribidi-enddecls.h"
#endif /* !_FRIBIDI_BIDI_TYPE_H */
Index: fribidi-bidi-types-list.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-bidi-types-list.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/fribidi-bidi-types-list.h 7 Jun 2004 20:38:21 -0000 1.3
+++ b/fribidi-bidi-types-list.h 9 Jun 2004 14:59:21 -0000 1.4
@@ -1,4 +1,4 @@
-#ifndef __C2MAN__
+#ifndef __FRIBIDI_DOC
/* FriBidi
* fribidi-bidi-types-list.h - list of bidi types
*
@@ -32,7 +32,7 @@
* For licensing issues, contact <license at farsiweb.info>.
*/
/* *INDENT-OFF* */
-#endif /* !__C2MAN__ */
+#endif /* !__FRIBIDI_DOC */
#ifndef _FRIBIDI_ADD_TYPE
# define _FRIBIDI_ADD_TYPE(x,y)
#endif
@@ -93,6 +93,6 @@
} _FRIBIDI_ENUM_TYPES
#endif /* _FRIBIDI_ENUM_TYPES */
-#ifndef __C2MAN__
+#ifndef __FRIBIDI_DOC
/* *INDENT-ON* */
-#endif /* !__C2MAN__ */
+#endif /* !__FRIBIDI_DOC */
Index: fribidi-bidi-types.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-bidi-types.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/fribidi-bidi-types.h 7 Jun 2004 20:38:21 -0000 1.5
+++ b/fribidi-bidi-types.h 9 Jun 2004 14:59:21 -0000 1.6
@@ -86,8 +86,8 @@
#define FRIBIDI_MASK_SS 0x00400000L
#define FRIBIDI_MASK_WS 0x00800000L
-/* We reserve the sign bit for user's private use: we will never use it,
- then negative character types will be never assigned. */
+/* We reserve a single bit for user's private use: we will never use it. */
+#define FRIBIDI_MASK_PRIVATE 0x01000000L
/*
@@ -156,14 +156,19 @@
/* Weak right to left */
#define FRIBIDI_TYPE_WRTL_VAL ( FRIBIDI_MASK_WEAK + FRIBIDI_MASK_RTL )
-/* The following is only used internally */
-
-/* Start or end of text (run list) */
+/* Start or end of text (run list). Only used internally */
#define FRIBIDI_TYPE_SENTINEL ( FRIBIDI_MASK_SENTINEL )
+/* Private types for applications. More private types can be obtained by
+ * summing up from this one. */
+#define FRIBIDI_TYPE_PRIVATE ( FRIBIDI_MASK_PRIVATE )
+
/* Define values for FriBidiCharType. */
-#if defined(__C2MAN__) || (defined(FRIBIDI_SIZEOF_INT) && ((FRIBIDI_SIZEOF_INT <= 4) && (FRIBIDI_SIZEOF_INT >= 4)))
+/* Define Enums only if sizeof(int) == 4 (UTF-32), and not compiling C++.
+ * The problem with C++ is that then casts between int32 and enum will fail!
+ */
+#if defined(__FRIBIDI_DOC) || (FRIBIDI_SIZEOF_INT+0 == 4 && !defined(__cplusplus))
typedef enum
{
@@ -171,7 +176,7 @@
FRIBIDI_TYPE_##TYPE = FRIBIDI_TYPE_##TYPE##_VAL,
# include "fribidi-bidi-types-list.h"
# undef _FRIBIDI_ADD_TYPE
- _FRIBIDI_TYPE_JUNK
+ _FRIBIDI_TYPE_SENTINEL = FRIBIDI_TYPE_SENTINEL /* Don't use this */
} FriBidiCharType;
typedef enum
@@ -182,7 +187,7 @@
# include "fribidi-bidi-types-list.h"
# undef _FRIBIDI_ADD_TYPE
# undef _FRIBIDI_PAR_TYPES
- _FRIBIDI_TYPE_JUNK
+ _FRIBIDI_PAR_SENTINEL = FRIBIDI_TYPE_SENTINEL /* Don't use this */
} FriBidiParType;
#else
@@ -217,7 +222,7 @@
#endif
-/* Just for compatibility */
+/* For lazy people... */
#define FRIBIDI_TYPE_WLTR FRIBIDI_PAR_WLTR
#define FRIBIDI_TYPE_WL FRIBIDI_PAR_WLTR
#define FRIBIDI_TYPE_WRTL FRIBIDI_PAR_WRTL
@@ -235,9 +240,6 @@
*/
-/* Is private-use value? */
-#define FRIBIDI_TYPE_PRIVATE(p) ((p) < 0)
-
/* Is right-to-left level? */
#define FRIBIDI_LEVEL_IS_RTL(lev) ((lev) & 1)
@@ -310,6 +312,9 @@
((p) & (FRIBIDI_MASK_EXPLICIT | FRIBIDI_MASK_SEPARATOR \
| FRIBIDI_MASK_BN | FRIBIDI_MASK_WS))
+/* Is private-use type for application? */
+#define FRIBIDI_IS_PRIVATE(p) ((p) & FRIBIDI_MASK_PRIVATE)
+
/* Define some conversions. */
/* Change numbers: EN, AN to RTL. */
Index: fribidi-bidi.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-bidi.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/fribidi-bidi.h 7 Jun 2004 20:38:21 -0000 1.6
+++ b/fribidi-bidi.h 9 Jun 2004 14:59:21 -0000 1.7
@@ -100,7 +100,6 @@
back to logical string positions */
) FRIBIDI_GNUC_WARN_UNUSED;
-
#include "fribidi-enddecls.h"
#endif /* !_FRIBIDI_BIDI_H */
Index: fribidi-common.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-common.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/fribidi-common.h 4 Jun 2004 09:41:11 -0000 1.8
+++ b/fribidi-common.h 9 Jun 2004 14:59:21 -0000 1.9
@@ -60,9 +60,9 @@
#endif /* !FRIBIDI_ENTRY */
#if FRIBIDI_USE_GLIB
-# ifndef __C2MAN__
+# ifndef __FRIBIDI_DOC
# include <glib/gmacros.h>
-# endif /* !__C2MAN__ */
+# endif /* !__FRIBIDI_DOC */
# define FRIBIDI_BEGIN_DECLS G_BEGIN_DECLS
# define FRIBIDI_END_DECLS G_END_DECLS
# define FRIBIDI_GNUC_CONST G_GNUC_CONST
@@ -100,10 +100,6 @@
# endif /* !__cplusplus */
#endif /* !FRIBIDI_BEGIN_DECLS */
-#define fribidi_version_info FRIBIDI_NAMESPACE(version_info)
-/* An string containing the version information of the library. */
-extern const char *fribidi_version_info;
-
#endif /* !_FRIBIDI_COMMON_H */
/* Editor directions:
* vim:textwidth=78:tabstop=8:shiftwidth=2:autoindent:cindent
Index: fribidi-mirroring.c
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-mirroring.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/fribidi-mirroring.c 7 Jun 2004 20:38:21 -0000 1.8
+++ b/fribidi-mirroring.c 9 Jun 2004 14:59:21 -0000 1.9
@@ -91,10 +91,10 @@
/* Editor directions:
* Local Variables:
- * mode:c
+ * mode: c
* c-basic-offset: 2
- * indent-tabs-mode:t
+ * indent-tabs-mode: t
* tab-width: 8
* End:
- * vim: textwidth=78: autoindent: cindent: shiftwidth=2: tabstop=8
+ * vim: textwidth=78: autoindent: cindent: shiftwidth=2: tabstop=8:
*/
Index: fribidi-mirroring.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-mirroring.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/fribidi-mirroring.h 7 Jun 2004 20:38:21 -0000 1.6
+++ b/fribidi-mirroring.h 9 Jun 2004 14:59:21 -0000 1.7
@@ -62,10 +62,10 @@
#endif /* !_FRIBIDI_MIRRORING_H */
/* Editor directions:
* Local Variables:
- * mode:c
+ * mode: c
* c-basic-offset: 2
- * indent-tabs-mode:t
+ * indent-tabs-mode: t
* tab-width: 8
* End:
- * vim: textwidth=78: autoindent: cindent: shiftwidth=2: tabstop=8
+ * vim: textwidth=78: autoindent: cindent: shiftwidth=2: tabstop=8:
*/
Index: fribidi-types.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-types.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/fribidi-types.h 7 May 2004 06:30:38 -0000 1.4
+++ b/fribidi-types.h 9 Jun 2004 14:59:21 -0000 1.5
@@ -40,17 +40,17 @@
#if !FRIBIDI_USE_GLIB
# if HAVE_INTTYPES_H
-# ifndef __C2MAN__
+# ifndef __FRIBIDI_DOC
# include <inttypes.h>
-# endif /* !__C2MAN__ */
+# endif /* !__FRIBIDI_DOC */
# define FRIBIDI_UINT8_LOCAL uint8_t
# define FRIBIDI_UINT16_LOCAL uint16_t
# define FRIBIDI_UINT32_LOCAL uint32_t
# else /* !HAVE_INTTYPES_H */
# if HAVE_STDINT_H
-# ifndef __C2MAN__
+# ifndef __FRIBIDI_DOC
# include <stdint.h>
-# endif /* !__C2MAN__ */
+# endif /* !__FRIBIDI_DOC */
# define FRIBIDI_UINT8_LOCAL uint8_t
# define FRIBIDI_UINT16_LOCAL uint16_t
# define FRIBIDI_UINT32_LOCAL uint32_t
@@ -69,15 +69,15 @@
# endif /* !HAVE_STDINT_H */
# endif /* !HAVE_INTTYPES_H */
# if HAVE_STDBOOL_H
-# ifndef __C2MAN__
+# ifndef __FRIBIDI_DOC
# include <stdbool.h>
-# endif /* !__C2MAN__ */
+# endif /* !__FRIBIDI_DOC */
# define FRIBIDI_BOOLEAN_LOCAL bool
# else /* !HAVE_STDBOOL_H */
# define FRIBIDI_BOOLEAN_LOCAL int
# endif /* !HAVE_STDBOOL_H */
# if SIZEOF_WCHAR_T >= 4
-# ifndef __C2MAN__
+# ifndef __FRIBIDI_DOC
# if STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
@@ -86,16 +86,16 @@
# include <stdlib.h>
# endif /* !HAVE_STDLIB_H */
# endif /* !STDC_HEADERS */
-# endif /* !__C2MAN__ */
+# endif /* !__FRIBIDI_DOC */
# define FRIBIDI_UNICHAR_LOCAL wchar_t
# else /* SIZEOF_WCHAR_T < 4 */
# define FRIBIDI_UNICHAR_LOCAL fribidi_uint32
# endif /* SIZEOF_WCHAR_T < 4 */
#else /* FRIBIDI_USE_GLIB */
-# ifndef __C2MAN__
+# ifndef __FRIBIDI_DOC
# include <glib/gtypes.h>
# include <glib/gunicode.h>
-# endif /* !__C2MAN__ */
+# endif /* !__FRIBIDI_DOC */
# define FRIBIDI_UINT8_LOCAL guint8
# define FRIBIDI_UINT16_LOCAL guint16
# define FRIBIDI_UINT32_LOCAL guint32
Index: fribidi.c
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/fribidi.c 7 Jun 2004 20:38:21 -0000 1.7
+++ b/fribidi.c 9 Jun 2004 14:59:21 -0000 1.8
@@ -1,5 +1,5 @@
/* FriBidi
- * fribidi.c - Unicode bidirectional and Arabic joining algorithms
+ * fribidi.c - Unicode bidirectional and Arabic joining/shaping algorithms
*
* $Id$
* $Author$
Index: fribidi.def
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi.def,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/fribidi.def 7 Jun 2004 20:38:21 -0000 1.3
+++ b/fribidi.def 9 Jun 2004 14:59:21 -0000 1.4
@@ -1,8 +1,5 @@
fribidi_bidi_type_name
fribidi_get_bidi_type
-fribidi_get_bidi_types
-fribidi_get_type
-fribidi_get_types
fribidi_log2vis
fribidi_get_par_embedding_levels
fribidi_remove_bidi_marks
Index: fribidi.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/fribidi.h 9 Jun 2004 08:56:53 -0000 1.3
+++ b/fribidi.h 9 Jun 2004 14:59:21 -0000 1.4
@@ -1,5 +1,5 @@
/* FriBidi
- * fribidi.h - Unicode bidirectional and Arabic joining algorithms
+ * fribidi.h - Unicode bidirectional and Arabic joining/shaping algorithms
*
* $Id$
* $Author$
@@ -42,6 +42,7 @@
# include "fribidi-char-sets.h"
#endif /* FRIBIDI_CHARSETS */
+#include "fribidi-begindecls.h"
/* See fribidi-bidi.h for the core functions fribidi_get_par_embedding_levels
* and fribidi_reorder_line which are probably the main calls you need. See
@@ -127,10 +128,17 @@
)
FRIBIDI_GNUC_WARN_UNUSED FRIBIDI_GNUC_DEPRECATED;
-
#define fribidi_log2vis_get_embedding_levels fribidi_get_par_embedding_levels
+#define fribidi_get_type fribidi_get_bidi_type
+
+#define fribidi_version_info FRIBIDI_NAMESPACE(version_info)
+/* An string containing the version information of the library. */
+extern const char *fribidi_version_info;
+
+#include "fribidi-enddecls.h"
+
#endif /* !_FRIBIDI_H */
/* Editor directions:
* vim:textwidth=78:tabstop=8:shiftwidth=2:autoindent:cindent
Index: mem.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/mem.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/mem.h 7 May 2004 06:30:38 -0000 1.5
+++ b/mem.h 9 Jun 2004 14:59:21 -0000 1.6
@@ -68,9 +68,9 @@
#else /* FRIBIDI_USE_GLIB */
-#ifndef __C2MAN__
+#ifndef __FRIBIDI_DOC
# include <glib/gmem.h>
-#endif /* !__C2MAN__ */
+#endif /* !__FRIBIDI_DOC */
#define FriBidiMemChunk GMemChunk
#define FRIBIDI_ALLOC_ONLY G_ALLOC_ONLY
- Previous message: [FriBidi-commit] fribidi/charset Headers.mk, 1.2,
1.3 fribidi-char-sets-cap-rtl.h, 1.1.1.1,
1.2 fribidi-char-sets-cp1255.h, 1.1.1.1,
1.2 fribidi-char-sets-cp1256.h, 1.1.1.1,
1.2 fribidi-char-sets-iso8859-6.h, 1.1.1.1,
1.2 fribidi-char-sets-iso8859-8.h, 1.1.1.1,
1.2 fribidi-char-sets-list.h, 1.2,
1.3 fribidi-char-sets-utf8.h, 1.1.1.1, 1.2 fribidi-char-sets.c,
1.4, 1.5 fribidi-char-sets.h, 1.2, 1.3
- Next message: [FriBidi-commit] fribidi configure.ac,1.13,1.14
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the FriBidi-Commit
mailing list