Skip to content

V
vlc-1.1
Commit 62d636ba authored by Jon Lech Johansen's avatar Jon Lech Johansen
Browse files
Options

* Fixed my fix for the fix for vlc_memalign. Sorry O:-)

parent 7ae0024e
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/common.h
View file @ 62d636ba
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* Collection of useful common types and macros definitions * Collection of useful common types and macros definitions
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: common.h,v 1.100 2002/04/26 17:07:14 jlj Exp $ * $Id: common.h,v 1.101 2002/04/26 18:12:28 jlj Exp $
* *
* Authors: Samuel Hocevar <sam@via.ecp.fr> * Authors: Samuel Hocevar <sam@via.ecp.fr>
* Vincent Seguin <seguin@via.ecp.fr> * Vincent Seguin <seguin@via.ecp.fr>
...@@ -385,7 +385,7 @@ struct intf_subscription_s; ...@@ -385,7 +385,7 @@ struct intf_subscription_s;
# define vlc_memalign(pp_orig,align,size) \ # define vlc_memalign(pp_orig,align,size) \
(( *(pp_orig) = malloc( size + align - 1 )) \ (( *(pp_orig) = malloc( size + align - 1 )) \
? (void *)( (((unsigned long)*(pp_orig)) + (unsigned long)(align-1) ) \ ? (void *)( (((unsigned long)*(pp_orig)) + (unsigned long)(align-1) ) \
& (~(unsigned long)align) ) \ & (~(unsigned long)(align-1)) ) \
: NULL ) : NULL )
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment