[vlc-commits] Sanitize LIBVLC_DEPRECATED

[Rémi Denis-Courmont]

vlc/vlc-1.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan 14 09:42:30 2012 +0200| [47ea5741d9ff0f81458bf1691fa3138f91f0d821] | committer: Rémi Denis-Courmont

Sanitize LIBVLC_DEPRECATED

Pointed-Out-By: Olivier Aubert <olivier.aubert at liris.cnrs.fr>
(cherry picked from commit 05a4a2710c09ac5f3a81324cf15d69f89d2083a6)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=47ea5741d9ff0f81458bf1691fa3138f91f0d821
---

 include/vlc/deprecated.h          |    6 +++---
 include/vlc/libvlc.h              |    8 ++++----
 include/vlc/libvlc_media_player.h |    7 ++++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h
index dc2142b..7f55090 100644
--- a/include/vlc/deprecated.h
+++ b/include/vlc/deprecated.h
@@ -56,9 +56,9 @@ extern "C" {
  * \param i_options the number of options to add to the item
  * \param ppsz_options the options to add to the item
  */
-LIBVLC_DEPRECATED void libvlc_playlist_play( libvlc_instance_t *p_instance,
-                                              int i_id, int i_options,
-                                              char **ppsz_options );
+LIBVLC_DEPRECATED LIBVLC_API
+void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
+                           int i_options, char **ppsz_options );
 
 /** @}*/
 
diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 1571452..f7f4530 100644
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -47,13 +47,13 @@
 #endif
 
 #ifdef __LIBVLC__
-/* Avoid unuseful warnings from libvlc with our deprecated APIs */
-#   define LIBVLC_DEPRECATED LIBVLC_API
+/* Avoid unhelpful warnings from libvlc with our deprecated APIs */
+#   define LIBVLC_DEPRECATED
 #elif defined(__GNUC__) && \
       (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
-# define LIBVLC_DEPRECATED LIBVLC_API __attribute__((deprecated))
+# define LIBVLC_DEPRECATED __attribute__((deprecated))
 #else
-# define LIBVLC_DEPRECATED LIBVLC_API
+# define LIBVLC_DEPRECATED
 #endif
 
 # ifdef __cplusplus
diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h
index 152a95d..6e69886 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -821,7 +821,8 @@ LIBVLC_API void libvlc_track_description_list_release( libvlc_track_description_
 /**
  * \deprecated Use libvlc_track_description_list_release instead
  */
-LIBVLC_DEPRECATED void libvlc_track_description_release( libvlc_track_description_t *p_track_description );
+LIBVLC_DEPRECATED
+LIBVLC_API void libvlc_track_description_release( libvlc_track_description_t *p_track_description );
 
 /** \defgroup libvlc_video LibVLC video controls
  * @{
@@ -915,7 +916,7 @@ int libvlc_video_get_size( libvlc_media_player_t *p_mi, unsigned num,
  * \param p_mi the media player
  * \return the video pixel height or 0 if not applicable
  */
-LIBVLC_DEPRECATED
+LIBVLC_DEPRECATED LIBVLC_API
 int libvlc_video_get_height( libvlc_media_player_t *p_mi );
 
 /**
@@ -925,7 +926,7 @@ int libvlc_video_get_height( libvlc_media_player_t *p_mi );
  * \param p_mi the media player
  * \return the video pixel width or 0 if not applicable
  */
-LIBVLC_DEPRECATED
+LIBVLC_DEPRECATED LIBVLC_API
 int libvlc_video_get_width( libvlc_media_player_t *p_mi );
 
 /**