[vlc-commits] Add #ifdef clauses around MinGW specific code.

Felix Abecassis git at videolan.org
Sat Nov 30 21:31:18 CET 2013


vlc | branch: master | Felix Abecassis <felix.abecassis at gmail.com> | Fri Nov 29 17:41:28 2013 +0100| [02f2f5f25b55d8b56991457746085fbd20f8336d] | committer: Jean-Baptiste Kempf

Add #ifdef clauses around MinGW specific code.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 include/vlc_common.h |    2 +-
 src/win32/dirs.c     |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 6116f8e..f0df305 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -803,7 +803,7 @@ VLC_API bool vlc_ureduce( unsigned *, unsigned *, uint64_t, uint64_t, uint64_t )
 #include <AvailabilityMacros.h>
 #endif
 
-#ifdef _WIN32
+#ifdef __MINGW32__
 # define vlc_memalign(align, size) (__mingw_aligned_malloc(size, align))
 # define vlc_free(base)            (__mingw_aligned_free(base))
 #elif defined(__APPLE__) && !defined(MAC_OS_X_VERSION_10_6)
diff --git a/src/win32/dirs.c b/src/win32/dirs.c
index 3d54e9e..0ec1087 100644
--- a/src/win32/dirs.c
+++ b/src/win32/dirs.c
@@ -30,7 +30,9 @@
 #endif
 #include <vlc_common.h>
 
-#include <w32api.h>
+#ifdef __MINGW32__
+# include <w32api.h>
+#endif
 #include <direct.h>
 #include <shlobj.h>
 



More information about the vlc-commits mailing list