Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
5bf7136d
Commit
5bf7136d
authored
Sep 03, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove work-around for antique versions of MSVC
parent
cbcf6bbd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
8 deletions
+3
-8
include/vlc_arrays.h
include/vlc_arrays.h
+3
-8
No files found.
include/vlc_arrays.h
View file @
5bf7136d
...
@@ -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,8 +188,8 @@ static inline void *realloc_down( void *ptr, size_t size )
...
@@ -193,8 +188,8 @@ 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(); \
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment