Commit 5bf7136d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove work-around for antique versions of MSVC

parent cbcf6bbd
...@@ -40,16 +40,11 @@ static inline void *realloc_down( void *ptr, size_t size ) ...@@ -40,16 +40,11 @@ static inline void *realloc_down( void *ptr, size_t size )
/** /**
* Simple dynamic array handling. Array is realloced at each insert/removal * Simple dynamic array handling. Array is realloced at each insert/removal
*/ */
#if defined( _MSC_VER ) && _MSC_VER < 1300
# define VLCCVP (void**) /* Work-around for broken compiler */
#else
# define VLCCVP
#endif
#define INSERT_ELEM( p_ar, i_oldsize, i_pos, elem ) \ #define INSERT_ELEM( p_ar, i_oldsize, i_pos, elem ) \
do \ do \
{ \ { \
if( !(i_oldsize) ) (p_ar) = NULL; \ if( !(i_oldsize) ) (p_ar) = NULL; \
(p_ar) = VLCCVP realloc( p_ar, ((i_oldsize) + 1) * sizeof(*(p_ar)) ); \ (p_ar) = realloc( p_ar, ((i_oldsize) + 1) * sizeof(*(p_ar)) ); \
if( !(p_ar) ) abort(); \ if( !(p_ar) ) abort(); \
if( (i_oldsize) - (i_pos) ) \ if( (i_oldsize) - (i_pos) ) \
{ \ { \
...@@ -193,7 +188,7 @@ static inline void *realloc_down( void *ptr, size_t size ) ...@@ -193,7 +188,7 @@ static inline void *realloc_down( void *ptr, size_t size )
/* Internal functions */ /* Internal functions */
#define _ARRAY_ALLOC(array, newsize) { \ #define _ARRAY_ALLOC(array, newsize) { \
(array).i_alloc = newsize; \ (array).i_alloc = newsize; \
(array).p_elems = VLCCVP realloc( (array).p_elems, (array).i_alloc * \ (array).p_elems = realloc( (array).p_elems, (array).i_alloc * \
sizeof(*(array).p_elems) ); \ sizeof(*(array).p_elems) ); \
if( !(array).p_elems ) abort(); \ if( !(array).p_elems ) abort(); \
} }
......
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