diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:03:14 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:03:14 +0200 |
commit | 36e7a20e695b376287310d602b44d6719f82a021 (patch) | |
tree | 75070d702043e875c947fccaa2de7a419331de22 /loader/wine/vfw.h | |
parent | 70fb003a9f2d9dc764e320f3ca64b0af1c68fdfb (diff) | |
parent | 93abb4f09229730c30e5bbdd6c54d4b981995eee (diff) | |
download | mpv-36e7a20e695b376287310d602b44d6719f82a021.tar.bz2 mpv-36e7a20e695b376287310d602b44d6719f82a021.tar.xz |
Merge svn changes up to r30550
Diffstat (limited to 'loader/wine/vfw.h')
-rw-r--r-- | loader/wine/vfw.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/loader/wine/vfw.h b/loader/wine/vfw.h index 1cf94b5ac7..7bf72be42d 100644 --- a/loader/wine/vfw.h +++ b/loader/wine/vfw.h @@ -6,10 +6,6 @@ #ifndef MPLAYER_VFW_H #define MPLAYER_VFW_H //#include "pshpack1.h" -#ifdef __cplusplus -extern "C" { -#endif - #include "windef.h" typedef struct __attribute__((__packed__)) @@ -667,7 +663,4 @@ typedef struct { #define AVIERR_USERABORT MAKE_AVIERR(198) #define AVIERR_ERROR MAKE_AVIERR(199) -#ifdef __cplusplus -} -#endif #endif /* MPLAYER_VFW_H */ |