MP4: fix a typo

[vlc] / include / vlc_acl.h

diff --git a/include/vlc_acl.h b/include/vlc_acl.h
index bc131a45a824569751748ddf6e4bfba799a43a68..07b99df8e45b2b82ca7eab9d0fb24d94328600b2 100644 (file)
--- a/include/vlc_acl.h
+++ b/include/vlc_acl.h
@@ -22,23 +22,19 @@
  * 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_ACL_H
-# define __VLC_ACL_H
+#ifndef VLC_ACL_H
+# define VLC_ACL_H
 
-#define ACL_Create(a, b) __ACL_Create(VLC_OBJECT(a), b)
-#define ACL_Duplicate(a,b) __ACL_Duplicate(VLC_OBJECT(a),b)
 
-VLC_EXPORT( int, ACL_Check, ( vlc_acl_t *p_acl, const char *psz_ip ) );
-VLC_EXPORT( vlc_acl_t *, __ACL_Create, ( vlc_object_t *p_this, vlc_bool_t b_allow ) );
-VLC_EXPORT( vlc_acl_t *, __ACL_Duplicate, ( vlc_object_t *p_this, const vlc_acl_t *p_acl ) );
-VLC_EXPORT( void, ACL_Destroy, ( vlc_acl_t *p_acl ) );
+VLC_API int ACL_Check( vlc_acl_t *p_acl, const char *psz_ip );
+VLC_API vlc_acl_t * ACL_Create( vlc_object_t *p_this, bool b_allow ) VLC_USED VLC_MALLOC;
+#define ACL_Create(a, b) ACL_Create(VLC_OBJECT(a), b)
+VLC_API vlc_acl_t * ACL_Duplicate( vlc_object_t *p_this, const vlc_acl_t *p_acl ) VLC_USED VLC_MALLOC;
+#define ACL_Duplicate(a,b) ACL_Duplicate(VLC_OBJECT(a),b)
+VLC_API void ACL_Destroy( vlc_acl_t *p_acl );
 
 #define ACL_AddHost(a,b,c) ACL_AddNet(a,b,-1,c)
-VLC_EXPORT( int, ACL_AddNet, ( vlc_acl_t *p_acl, const char *psz_ip, int i_len, vlc_bool_t b_allow ) );
-VLC_EXPORT( int, ACL_LoadFile, ( vlc_acl_t *p_acl, const char *path ) );
+VLC_API int ACL_AddNet( vlc_acl_t *p_acl, const char *psz_ip, int i_len, bool b_allow );
+VLC_API int ACL_LoadFile( vlc_acl_t *p_acl, const char *path );
 
 #endif