]> git.sesse.net Git - vlc/commitdiff
Add #ifdef clauses around MinGW specific code.
authorFelix Abecassis <felix.abecassis@gmail.com>
Fri, 29 Nov 2013 16:41:28 +0000 (17:41 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Sat, 30 Nov 2013 20:16:46 +0000 (21:16 +0100)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
include/vlc_common.h
src/win32/dirs.c

index 6116f8e53d3d43202a1f722622264c5974d84485..f0df3058c855bb87d1b058f43c3a028fdedb7f68 100644 (file)
@@ -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)
index 3d54e9e65371c7c72f50880e57e9bc57d7fbb332..0ec1087340f747e7e51cb019d679b83fa1b5f4ee 100644 (file)
@@ -30,7 +30,9 @@
 #endif
 #include <vlc_common.h>
 
-#include <w32api.h>
+#ifdef __MINGW32__
+# include <w32api.h>
+#endif
 #include <direct.h>
 #include <shlobj.h>