[vlc-commits] vlc_common.h: remove legacy code for Darwin < 10 releases

Felix Paul Kühne git at videolan.org
Thu Nov 5 23:47:08 CET 2015


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Nov  5 23:42:57 2015 +0100| [206a974932403bea3486e21cdc3eadfc5f7e8065] | committer: Felix Paul Kühne

vlc_common.h: remove legacy code for Darwin < 10 releases

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=206a974932403bea3486e21cdc3eadfc5f7e8065
---

 include/vlc_common.h |   20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 786f349..6a6f6c6 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -825,26 +825,6 @@ VLC_API bool vlc_ureduce( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t )
 #elif defined(_MSC_VER)
 # define vlc_memalign(align, size) (_aligned_malloc(size, align))
 # define vlc_free(base)            (_aligned_free(base))
-#elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
-static inline void *vlc_memalign(size_t align, size_t size)
-{
-    long diff;
-    void *ptr;
-
-    ptr = malloc(size+align);
-    if(!ptr)
-        return ptr;
-    diff = ((-(long)ptr - 1)&(align-1)) + 1;
-    ptr  = (char*)ptr + diff;
-    ((char*)ptr)[-1]= diff;
-    return ptr;
-}
-
-static void vlc_free(void *ptr)
-{
-    if (ptr)
-        free((char*)ptr - ((char*)ptr)[-1]);
-}
 #else
 static inline void *vlc_memalign(size_t align, size_t size)
 {



More information about the vlc-commits mailing list