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/msacm.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/msacm.h')
-rw-r--r-- | loader/wine/msacm.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/loader/wine/msacm.h b/loader/wine/msacm.h index 6a0be7c068..b8b24383c6 100644 --- a/loader/wine/msacm.h +++ b/loader/wine/msacm.h @@ -9,10 +9,6 @@ #include "driver.h" #include "mmreg.h" -#ifdef __cplusplus -extern "C" { -#endif /* defined(__cplusplus) */ - //typedef WORD VERSION; /* major (high byte), minor (low byte) */ typedef UINT16 MMVERSION16; @@ -934,8 +930,4 @@ MMRESULT WINAPI acmStreamUnprepareHeader( HACMSTREAM has, PACMSTREAMHEADER pash, DWORD fdwUnprepare ); -#ifdef __cplusplus -} /* extern "C" */ -#endif /* defined(__cplusplus) */ - #endif /* MPLAYER_MSACM_H */ |