rtsp-session: Only remove deprecated API if requested to do so, not just when disabling

gst_rtsp_session_is_expired() and gst_rtsp_session_next_timeout() were
affected.

diff --git a/gst/rtsp-server/rtsp-session.c b/gst/rtsp-server/rtsp-session.c
index 8c664e2..e4ef122 100644 (file)
--- a/gst/rtsp-server/rtsp-session.c
+++ b/gst/rtsp-server/rtsp-session.c
@@ -672,7 +672,10 @@ gst_rtsp_session_next_timeout_usec (GstRTSPSession * session, gint64 now)
  * Deprecated: Use gst_rtsp_session_next_timeout_usec() instead.
  */
 #ifndef GST_REMOVE_DEPRECATED
-#ifndef GST_DISABLE_DEPRECATED
+#ifdef GST_DISABLE_DEPRECATED
+gint gst_rtsp_session_next_timeout (GstRTSPSession * session, GTimeVal * now);
+#endif
+
 gint
 gst_rtsp_session_next_timeout (GstRTSPSession * session, GTimeVal * now)
 {
@@ -709,7 +712,6 @@ gst_rtsp_session_next_timeout (GstRTSPSession * session, GTimeVal * now)
   return res;
 }
 #endif
-#endif
 
 /**
  * gst_rtsp_session_is_expired_usec:
@@ -745,7 +747,9 @@ gst_rtsp_session_is_expired_usec (GstRTSPSession * session, gint64 now)
  * Deprecated: Use gst_rtsp_session_is_expired_usec() instead.
  */
 #ifndef GST_REMOVE_DEPRECATED
-#ifndef GST_DISABLE_DEPRECATED
+#ifdef GST_DISABLE_DEPRECATED
+gboolean gst_rtsp_session_is_expired (GstRTSPSession * session, GTimeVal * now);
+#endif
 gboolean
 gst_rtsp_session_is_expired (GstRTSPSession * session, GTimeVal * now)
 {
@@ -756,4 +760,3 @@ gst_rtsp_session_is_expired (GstRTSPSession * session, GTimeVal * now)
   return res;
 }
 #endif
-#endif