diff options
author | wm4 <wm4@mplayer2.org> | 2012-03-16 18:57:23 +0100 |
---|---|---|
committer | wm4 <wm4@mplayer2.org> | 2012-03-16 19:14:44 +0100 |
commit | 6de8120822c2dd9c50ef23b4977421651396f1ae (patch) | |
tree | 11a977608cfc9f50cffbce4a879dd8e9b33b029c /libvo/vo_pnm.c | |
parent | 0eb21226cbfdd200f2aea5d3a9db2cdbff4773a5 (diff) | |
parent | a8168102668337f3c11619bea7e744fc245adff1 (diff) | |
download | mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.bz2 mpv-6de8120822c2dd9c50ef23b4977421651396f1ae.tar.xz |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
command.c
mp_core.h
mplayer.c
screenshot.c
Diffstat (limited to 'libvo/vo_pnm.c')
-rw-r--r-- | libvo/vo_pnm.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libvo/vo_pnm.c b/libvo/vo_pnm.c index 9593860412..5345eaa122 100644 --- a/libvo/vo_pnm.c +++ b/libvo/vo_pnm.c @@ -40,6 +40,7 @@ #include "video_out.h" #include "video_out_internal.h" #include "mplayer.h" /* for exit_player_bad() */ +#include "osdep/io.h" /* ------------------------------------------------------------------------- */ @@ -199,16 +200,11 @@ static int preinit(const char *arg) static void pnm_mkdir(char *buf, int verbose) { struct stat stat_p; -/* Silly MING32 bug workaround */ -#ifndef __MINGW32__ if ( mkdir(buf, 0755) < 0 ) { -#else - if ( mkdir(buf) < 0 ) { -#endif switch (errno) { /* use switch in case other errors need to be caught and handled in the future */ case EEXIST: - if ( stat(buf, &stat_p ) < 0 ) { + if ( mp_stat(buf, &stat_p ) < 0 ) { mp_msg(MSGT_VO, MSGL_ERR, "%s: %s: %s\n", info.short_name, _("This error has occurred"), strerror(errno) ); mp_msg(MSGT_VO, MSGL_ERR, "%s: %s %s\n", info.short_name, |