Skip to content

V
vlc-2-2
Commit 02f2f5f2 authored by Felix Abecassis's avatar Felix Abecassis Committed by Jean-Baptiste Kempf
Browse files
Options

Add #ifdef clauses around MinGW specific code. 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 12d3f542
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
include/vlc_common.h
View file @ 02f2f5f2
...@@ -803,7 +803,7 @@ VLC_API bool vlc_ureduce( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t ) ...@@ -803,7 +803,7 @@ VLC_API bool vlc_ureduce( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t )
#include <AvailabilityMacros.h> #include <AvailabilityMacros.h>
#endif #endif
#ifdef _WIN32 #ifdef __MINGW32__
# define vlc_memalign(align, size) (__mingw_aligned_malloc(size, align)) # define vlc_memalign(align, size) (__mingw_aligned_malloc(size, align))
# define vlc_free(base) (__mingw_aligned_free(base)) # define vlc_free(base) (__mingw_aligned_free(base))
#elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6) #elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
......
src/win32/dirs.c
View file @ 02f2f5f2
...@@ -30,7 +30,9 @@ ...@@ -30,7 +30,9 @@
#endif #endif
#include <vlc_common.h> #include <vlc_common.h>
#include <w32api.h> #ifdef __MINGW32__
# include <w32api.h>
#endif
#include <direct.h> #include <direct.h>
#include <shlobj.h> #include <shlobj.h>
......
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