Some cleanup of my last dedeprecation changes.

diff --git a/lib/fribidi-deprecated.c b/lib/fribidi-deprecated.c
index bc0b8e2421451b389d8ee42f136ca6f4ea92abc3..7a972927c007bf93cd93d406b2ee89b3c6c68d5b 100644 (file)
--- a/lib/fribidi-deprecated.c
+++ b/lib/fribidi-deprecated.c
@@ -76,19 +76,6 @@ fribidi_reorder_nsm_status (
 
 
 
-FRIBIDI_ENTRY FriBidiLevel
-fribidi_log2vis_get_embedding_levels (
-  const FriBidiCharType *bidi_types,   /* input list of bidi types as returned by
-                                          fribidi_get_bidi_types() */
-  const FriBidiStrIndex len,   /* input string length of the paragraph */
-  FriBidiParType *pbase_dir,   /* requested and resolved paragraph
-                                * base direction */
-  FriBidiLevel *embedding_levels       /* output list of embedding levels */
-)
-{
-  return fribidi_get_par_embedding_levels_ex (bidi_types, NULL, len, pbase_dir, embedding_levels);
-}
-
 FRIBIDI_ENTRY FriBidiCharType
 fribidi_get_type (
   FriBidiChar ch               /* input character */

diff --git a/lib/fribidi-deprecated.h b/lib/fribidi-deprecated.h
index 27f8a5e6e5fb53155fb9a2b27f59b4ffc598d6f4..56b5ea3a2402e7c7d4a112a4261837df3a432c49 100644 (file)
--- a/lib/fribidi-deprecated.h
+++ b/lib/fribidi-deprecated.h
@@ -127,6 +127,22 @@ fribidi_get_type_internal (
   FriBidiChar ch               /* input character */
 ) FRIBIDI_GNUC_DEPRECATED;
 
+/* fribidi_get_par_embedding_levels - get bidi embedding levels of a paragraph
+ *
+ * Deprecated interface to fribidi_get_par_embedding_levels_ex(). Refer to
+ * it for documentation.
+ */
+FRIBIDI_ENTRY FriBidiLevel
+fribidi_get_par_embedding_levels (
+  const FriBidiCharType *bidi_types,   /* input list of bidi types as returned by
+                                          fribidi_get_bidi_types() */
+  const FriBidiStrIndex len,   /* input string length of the paragraph */
+  FriBidiParType *pbase_dir,   /* requested and resolved paragraph
+                                * base direction */
+  FriBidiLevel *embedding_levels       /* output list of embedding levels */
+) 
+     FRIBIDI_GNUC_WARN_UNUSED FRIBIDI_GNUC_DEPRECATED;
+
 #define UNI_MAX_BIDI_LEVEL     FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL
 #define UNI_LRM                        FRIBIDI_CHAR_LRM
 #define UNI_RLM                        FRIBIDI_CHAR_RLM

diff --git a/lib/fribidi.h b/lib/fribidi.h
index ae66096337b9f7d9a86b171637c0621aff7c8b6c..6c434501d8254e646ec861a7dcb391e1ef4f2bc3 100644 (file)
--- a/lib/fribidi.h
+++ b/lib/fribidi.h
@@ -73,8 +73,7 @@ fribidi_remove_bidi_marks (
   FriBidiStrIndex *position_from_this_list,    /* list mapping positions from the
                                                   order used in str */
   FriBidiLevel *embedding_levels       /* list of embedding levels */
-)
-     FRIBIDI_GNUC_WARN_UNUSED FRIBIDI_GNUC_DEPRECATED;
+);
 
 
 /* fribidi_log2vis - get visual string
@@ -105,26 +104,7 @@ fribidi_remove_bidi_marks (
                                         * back to the logical string
                                         * positions */
   FriBidiLevel *embedding_levels       /* output list of embedding levels */
-)
-     FRIBIDI_GNUC_WARN_UNUSED FRIBIDI_GNUC_DEPRECATED;
-
-
-/* fribidi_get_par_embedding_levels - get bidi embedding levels of a paragraph
- *
- * Deprecated interface to fribidi_get_par_embedding_levels_ex(). Refer to
- * it for documentation.
- */
-FRIBIDI_ENTRY FriBidiLevel
-fribidi_get_par_embedding_levels (
-  const FriBidiCharType *bidi_types,   /* input list of bidi types as returned by
-                                          fribidi_get_bidi_types() */
-  const FriBidiStrIndex len,   /* input string length of the paragraph */
-  FriBidiParType *pbase_dir,   /* requested and resolved paragraph
-                                * base direction */
-  FriBidiLevel *embedding_levels       /* output list of embedding levels */
-) 
-     FRIBIDI_GNUC_WARN_UNUSED FRIBIDI_GNUC_DEPRECATED;
-
+);
 
 #ifdef FRIBIDI_NO_DEPRECATED
 #else