diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
| commit | 8c144171bb80dd3d1f7161b97675e78cad00bc65 (patch) | |
| tree | 7ad930ebc554ab68af1911f4dfd217cc18b86cce /loader/ext.h | |
| parent | 52ee93c1c64dfaa0afc881c38154b04c100cb617 (diff) | |
| parent | 8c5889004f7ba9f6fcbca20a05a9301771348408 (diff) | |
| download | mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.bz2 mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.xz | |
Merge svn changes up to r28087
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
Diffstat (limited to 'loader/ext.h')
| -rw-r--r-- | loader/ext.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/loader/ext.h b/loader/ext.h index 17cbf64f57..dbe54ee1c1 100644 --- a/loader/ext.h +++ b/loader/ext.h @@ -8,12 +8,12 @@ #include "wine/windef.h" -extern LPVOID FILE_dommap( int unix_handle, LPVOID start, - DWORD size_high, DWORD size_low, - DWORD offset_high, DWORD offset_low, - int prot, int flags ); -extern int FILE_munmap( LPVOID start, DWORD size_high, DWORD size_low ); -extern int wcsnicmp(const unsigned short* s1, const unsigned short* s2, int n); -extern int __vprintf( const char *format, ... ); +LPVOID FILE_dommap( int unix_handle, LPVOID start, + DWORD size_high, DWORD size_low, + DWORD offset_high, DWORD offset_low, + int prot, int flags ); +int FILE_munmap( LPVOID start, DWORD size_high, DWORD size_low ); +int wcsnicmp( const unsigned short* s1, const unsigned short* s2, int n ); +int __vprintf( const char *format, ... ); #endif /* MPLAYER_EXT_H */ |