Digest => DigestMD5

diff --git a/include/vlc_md5.h b/include/vlc_md5.h
index c4a79ca6ddb3827982039e7a5095d414de660bf9..0ad71a8e571b42b5ce79c2ba397b29c816a44ec3 100644 (file)
--- a/include/vlc_md5.h
+++ b/include/vlc_md5.h
@@ -41,6 +41,6 @@ struct md5_s
 VLC_EXPORT(void, InitMD5, ( struct md5_s * ) );
 VLC_EXPORT(void, AddMD5, ( struct md5_s *, const uint8_t *, uint32_t ) );
 VLC_EXPORT(void, EndMD5, ( struct md5_s * ) );
-VLC_EXPORT(void, Digest, ( struct md5_s *, uint32_t * ) );
+VLC_EXPORT(void, DigestMD5, ( struct md5_s *, uint32_t * ) );
 
 #endif

diff --git a/modules/demux/mp4/drms.c b/modules/demux/mp4/drms.c
index 00274c7283e369544af161d88ee91ee6564f4de7..711eb3d33739c69b5b7dbf3094d9dd33aa2f503b 100644 (file)
--- a/modules/demux/mp4/drms.c
+++ b/modules/demux/mp4/drms.c
@@ -89,7 +89,9 @@ struct aes_s
     uint32_t pp_dec_keys[ AES_KEY_COUNT + 1 ][ 4 ];
 };
 
-#ifndef __VLC__
+#ifdef __VLC__
+# define Digest DigestMD5
+#else
 /*****************************************************************************
  * md5_s: MD5 message structure
  *****************************************************************************

diff --git a/src/misc/md5.c b/src/misc/md5.c
index 4672deae85063288f1e083c1992eff7ca5a80c59..2963c9aa962e7f0def357b40834436d1b669cd9a 100644 (file)
--- a/src/misc/md5.c
+++ b/src/misc/md5.c
@@ -53,9 +53,9 @@ static inline void Reverse( uint32_t *p_buffer, int n )
     ( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
 
 /*****************************************************************************
- * Digest: update the MD5 digest with 64 bytes of data
+ * DigestMD5: update the MD5 digest with 64 bytes of data
  *****************************************************************************/
-void Digest( struct md5_s *p_md5, uint32_t *p_input )
+void DigestMD5( struct md5_s *p_md5, uint32_t *p_input )
 {
     uint32_t a, b, c, d;