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 /vidix/sysdep | |
| 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 'vidix/sysdep')
| -rw-r--r-- | vidix/sysdep/AsmMacros_alpha.h | 12 | ||||
| -rw-r--r-- | vidix/sysdep/pci_win32.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vidix/sysdep/AsmMacros_alpha.h b/vidix/sysdep/AsmMacros_alpha.h index 2cc8d01544..5ae5e07a82 100644 --- a/vidix/sysdep/AsmMacros_alpha.h +++ b/vidix/sysdep/AsmMacros_alpha.h @@ -66,12 +66,12 @@ #include <sys/io.h> #elif defined (__FreeBSD__) #include <sys/types.h> -extern void outb(u_int32_t port, u_int8_t val); -extern void outw(u_int32_t port, u_int16_t val); -extern void outl(u_int32_t port, u_int32_t val); -extern u_int8_t inb(u_int32_t port); -extern u_int16_t inw(u_int32_t port); -extern u_int32_t inl(u_int32_t port); +void outb(u_int32_t port, u_int8_t val); +void outw(u_int32_t port, u_int16_t val); +void outl(u_int32_t port, u_int32_t val); +u_int8_t inb(u_int32_t port); +u_int16_t inw(u_int32_t port); +u_int32_t inl(u_int32_t port); #else #error This stuff is not ported on your system #endif diff --git a/vidix/sysdep/pci_win32.c b/vidix/sysdep/pci_win32.c index ffa4d2238f..d01cdfd30e 100644 --- a/vidix/sysdep/pci_win32.c +++ b/vidix/sysdep/pci_win32.c @@ -31,7 +31,7 @@ #include "vidix/dhahelperwin/dhahelper.h" static HANDLE hDriver; -extern int IsWinNT(); +int IsWinNT(); |