From: Dov Grobgeld <dov.grobgeld@gmail.com>
Date: Sun, 13 Oct 2019 08:26:20 +0000 (+0300)
Subject: Some cleanup of my last dedeprecation changes.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d569512f20a9ad940b81bbac85f055b07729d760;p=fribidi

Some cleanup of my last dedeprecation changes.
---

diff --git a/lib/fribidi-deprecated.c b/lib/fribidi-deprecated.c
index bc0b8e2..7a97292 100644
--- 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 27f8a5e..56b5ea3 100644
--- 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 ae66096..6c43450 100644
--- 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