summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2011-03-20 14:25:40 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2011-03-20 14:25:40 +0000
commitced4b1666765715376058ea16669d18a4f3e68e6 (patch)
treedd8ca75cfc4f841b82f00ea7b24b849ee277577a /lib
parent77aa841ba7f4249dceaea6470cb025f976a6e57a (diff)
parent5f74ef4b65a270a8b985917373bc0e219fa06ecd (diff)
downloadxine-lib-ced4b1666765715376058ea16669d18a4f3e68e6.tar.gz
xine-lib-ced4b1666765715376058ea16669d18a4f3e68e6.tar.bz2
Merge from 1.1.
--HG-- rename : src/libxineadec/gsm610/Makefile.am => contrib/gsm610/Makefile.am rename : src/libxineadec/nosefart/diff_to_nosefart_cvs.patch => contrib/nosefart/diff_to_nosefart_cvs.patch rename : src/libxineadec/nosefart/nes6502.c => contrib/nosefart/nes6502.c rename : src/libxineadec/nosefart/nes6502.h => contrib/nosefart/nes6502.h rename : src/libxineadec/nosefart/nes_apu.c => contrib/nosefart/nes_apu.c rename : src/libxineadec/nosefart/nes_apu.h => contrib/nosefart/nes_apu.h rename : src/libxineadec/nosefart/nsf.c => contrib/nosefart/nsf.c rename : src/libxineadec/nosefart/nsf.h => contrib/nosefart/nsf.h rename : src/libxineadec/nosefart/types.h => contrib/nosefart/types.h rename : src/libxineadec/nosefart/version.h => contrib/nosefart/version.h rename : doc/faq/faq.sgml => doc/faq/faq.docbook rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c rename : src/libxinevdec/image.c => src/video_dec/image.c
Diffstat (limited to 'lib')
-rw-r--r--lib/os_internal.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/os_internal.h b/lib/os_internal.h
index 8136ce76e..b06b51112 100644
--- a/lib/os_internal.h
+++ b/lib/os_internal.h
@@ -257,7 +257,11 @@ int xine_private_pthread_mutex_timedlock(pthread_mutex_t *mutex, const struct ti
# ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
# endif
-# define mkdir(A, B) _mkdir((A))
+# ifdef __MINGW64__
+# define mkdir(A, B) mkdir((A))
+# else
+# define mkdir(A, B) _mkdir((A))
+# endif
# ifndef S_ISDIR
# define S_ISDIR(m) ((m) & _S_IFDIR)