diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-02 22:04:35 +0300 |
commit | 6cce822505c0a76ac520909a895021b8f5b7e5ab (patch) | |
tree | f8ba954c698470208a243be3da216f7f54367f46 /loader | |
parent | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff) | |
parent | ded7033671fb7d84fbdb67ace46c1fc8833631bc (diff) | |
download | mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.bz2 mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.xz |
Merge svn changes up to r27399
Conflicts:
libmpcodecs/vd.c
libmpcodecs/ve_raw.c
libvo/video_out.c
libvo/x11_common.c
mplayer.c
Diffstat (limited to 'loader')
-rw-r--r-- | loader/win32.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/loader/win32.c b/loader/win32.c index 9bc7062f68..29e7348616 100644 --- a/loader/win32.c +++ b/loader/win32.c @@ -75,9 +75,7 @@ for DLL to know too much about its environment. #endif #include "osdep/mmap_anon.h" -#if HAVE_VSSCANF -int vsscanf( const char *str, const char *format, va_list ap); -#else +#ifndef HAVE_VSSCANF /* system has no vsscanf. try to provide one */ static int vsscanf( const char *str, const char *format, va_list ap) { |