X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_access.h;h=26a867c5737bd6a2820e8c5bd879de03f2051a78;hb=5d313c65e44d8963262fdbc5d5d52f5169f3f787;hp=2dae17824a374cfec5f229c126155e36ee06e896;hpb=449fd28aaf007c6411251dae9d0dbfdc65b135d1;p=vlc

diff --git a/include/vlc_access.h b/include/vlc_access.h
index 2dae17824a..26a867c573 100644
--- a/include/vlc_access.h
+++ b/include/vlc_access.h
@@ -21,10 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
 #ifndef _VLC_ACCESS_H
 #define _VLC_ACCESS_H 1
 
@@ -117,20 +113,19 @@ struct access_t
     access_sys_t *p_sys;
 };
 
-static inline int access2_vaControl( access_t *p_access, int i_query, va_list args )
+static inline int access_vaControl( access_t *p_access, int i_query, va_list args )
 {
     if( !p_access ) return VLC_EGENERIC;
-    assert( p_access->pf_control );
     return p_access->pf_control( p_access, i_query, args );
 }
 
-static inline int access2_Control( access_t *p_access, int i_query, ... )
+static inline int access_Control( access_t *p_access, int i_query, ... )
 {
     va_list args;
     int     i_result;
 
     va_start( args, i_query );
-    i_result = access2_vaControl( p_access, i_query, args );
+    i_result = access_vaControl( p_access, i_query, args );
     va_end( args );
     return i_result;
 }
@@ -138,7 +133,7 @@ static inline int access2_Control( access_t *p_access, int i_query, ... )
 static inline char *access_GetContentType( access_t *p_access )
 {
     char *res;
-    if( access2_Control( p_access, ACCESS_GET_CONTENT_TYPE, &res ) )
+    if( access_Control( p_access, ACCESS_GET_CONTENT_TYPE, &res ) )
         return NULL;
     return res;
 }