ACL: remove leading underscores

diff --git a/include/vlc_acl.h b/include/vlc_acl.h
index 881a008fde2c66c27c4a2d1f6051d53d01c3829e..df50788b14adac9cd14690de38f38c4b87a3cba2 100644 (file)
--- a/include/vlc_acl.h
+++ b/include/vlc_acl.h
@@ -25,12 +25,12 @@
 #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, bool b_allow ) LIBVLC_USED );
-VLC_EXPORT( vlc_acl_t *, __ACL_Duplicate, ( vlc_object_t *p_this, const vlc_acl_t *p_acl ) LIBVLC_USED );
+VLC_EXPORT( vlc_acl_t *, ACL_Create, ( vlc_object_t *p_this, bool b_allow ) LIBVLC_USED );
+#define ACL_Create(a, b) ACL_Create(VLC_OBJECT(a), b)
+VLC_EXPORT( vlc_acl_t *, ACL_Duplicate, ( vlc_object_t *p_this, const vlc_acl_t *p_acl ) LIBVLC_USED );
+#define ACL_Duplicate(a,b) ACL_Duplicate(VLC_OBJECT(a),b)
 VLC_EXPORT( void, ACL_Destroy, ( vlc_acl_t *p_acl ) );
 
 #define ACL_AddHost(a,b,c) ACL_AddNet(a,b,-1,c)

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 67d4afa5d99542ef8363c63caae1c1a7f9588051..33c3cac4d9b1a97bd58d2dff7179926a9787c8a4 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -1,9 +1,9 @@
 access_GetParentInput
 ACL_AddNet
 ACL_Check
-__ACL_Create
+ACL_Create
 ACL_Destroy
-__ACL_Duplicate
+ACL_Duplicate
 ACL_LoadFile
 AddMD5
 aout_BitsPerSample

diff --git a/src/network/acl.c b/src/network/acl.c
index 5c4ffd3058116cff7f98f2d1f228300a60a0aff1..3c39dd7b89da542b2914cd861c3dc125b01d85e0 100644 (file)
--- a/src/network/acl.c
+++ b/src/network/acl.c
@@ -199,7 +199,7 @@ int ACL_AddNet( vlc_acl_t *p_acl, const char *psz_ip, int i_len,
     return 0;
 }
 
-
+#undef ACL_Create
 /**
  * Creates an empty ACL.
  *
@@ -208,7 +208,7 @@ int ACL_AddNet( vlc_acl_t *p_acl, const char *psz_ip, int i_len,
  *
  * @return an ACL object. NULL in case of error.
  */
-vlc_acl_t *__ACL_Create( vlc_object_t *p_this, bool b_allow )
+vlc_acl_t *ACL_Create( vlc_object_t *p_this, bool b_allow )
 {
     vlc_acl_t *p_acl;
 
@@ -225,7 +225,7 @@ vlc_acl_t *__ACL_Create( vlc_object_t *p_this, bool b_allow )
     return p_acl;
 }
 
-
+#undef ACL_Duplicate
 /**
  * Perform a deep copy of an existing ACL.
  *
@@ -234,7 +234,7 @@ vlc_acl_t *__ACL_Create( vlc_object_t *p_this, bool b_allow )
  *
  * @return a new ACL object, or NULL on error.
  */
-vlc_acl_t *__ACL_Duplicate( vlc_object_t *p_this, const vlc_acl_t *p_acl )
+vlc_acl_t *ACL_Duplicate( vlc_object_t *p_this, const vlc_acl_t *p_acl )
 {
     vlc_acl_t *p_dupacl;