Use the new registration mechanism for memcpy/memset

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 707e9329a80224ad3e5be56baf07ed37b4ef5f30..c10df6628b7f644c0cf5702ed8b55bfd43894133 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -883,15 +883,13 @@ VLC_EXPORT( int, __vlc_execve, ( vlc_object_t *p_object, int i_argc, char *const
 #define CPU_CAPABILITY_ALTIVEC (1<<16)
 #define CPU_CAPABILITY_FPU     (1<<31)
 VLC_EXPORT( unsigned, vlc_CPU, ( void ) );
-VLC_EXPORT( void *, vlc_memcpy, ( void *, const void *, size_t ) );
-VLC_EXPORT( void *, vlc_memset, ( void *, int, size_t ) );
 
 typedef void *(*vlc_memcpy_t) (void *tgt, const void *src, size_t n);
 typedef void *(*vlc_memset_t) (void *tgt, int c, size_t n);
 
 VLC_EXPORT( void, vlc_fastmem_register, (vlc_memcpy_t cpy, vlc_memset_t set) );
-VLC_EXPORT( void *, vlc_memcpy, ( vlc_object_t *, void *, const void *, size_t ) );
-VLC_EXPORT( void *, vlc_memset, ( vlc_object_t *, void *, int, size_t ) );
+VLC_EXPORT( void *, vlc_memcpy, ( void *, const void *, size_t ) );
+VLC_EXPORT( void *, vlc_memset, ( void *, int, size_t ) );
 
 /*****************************************************************************
  * I18n stuff

diff --git a/modules/misc/memcpy/memcpy.c b/modules/misc/memcpy/memcpy.c
index 829073a62e9399c6977c1116a6b7ad031597c267..15d64ce1938fdd6b228bb20a5636c7329371d32a 100644 (file)
--- a/modules/misc/memcpy/memcpy.c
+++ b/modules/misc/memcpy/memcpy.c
@@ -64,12 +64,8 @@
  *****************************************************************************/
 static int Activate ( vlc_object_t *p_this )
 {
-#ifdef MODULE_NAME_IS_memcpy
-    p_this->p_libvlc->pf_memcpy = memcpy;
-    p_this->p_libvlc->pf_memset = memset;
-#else
-    p_this->p_libvlc->pf_memcpy = fast_memcpy;
-    p_this->p_libvlc->pf_memset = NULL;
+#ifndef MODULE_NAME_IS_memcpy
+    vlc_fastmem_register( fast_memcpy, NULL );
 #endif
 
     return VLC_SUCCESS;

diff --git a/modules/misc/memcpy/memcpyaltivec.c b/modules/misc/memcpy/memcpyaltivec.c
index 85cdcd501e4e81bb1e044bb81f6b0bddd0128ca0..aead1f701b83dfcb0f442a47b9ab31fef0c103ce 100644 (file)
--- a/modules/misc/memcpy/memcpyaltivec.c
+++ b/modules/misc/memcpy/memcpyaltivec.c
@@ -47,7 +47,7 @@ static void * fast_memcpy ( void * to, const void * from, size_t len );
  *****************************************************************************/
 static int Activate ( vlc_object_t *p_this )
 {
-    p_this->p_libvlc->pf_memcpy = fast_memcpy;
+    vlc_fastmem_register( fast_memcpy, NULL );
     return VLC_SUCCESS;
 }