Digest => DigestMD5

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

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
  *****************************************************************************

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;