diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-05-08 23:50:26 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-05-08 23:50:26 +0300 |
| commit | 1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07 (patch) | |
| tree | c5e99bfe0e69cd37fb8ac70fadf00ce54a1cbe3c /vidix | |
| parent | f2864e9a072f53c38a04dd7c44392521777dc908 (diff) | |
| parent | 86c9fb2e8930de031807513c9b93d47394d2d2fa (diff) | |
| download | mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.bz2 mpv-1db1773ec27fc4e7c9d44ad02ccfa7eaf364ce07.tar.xz | |
Merge svn changes up to r29277
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/sysdep/AsmMacros_powerpc.h | 2 | ||||
| -rw-r--r-- | vidix/sysdep/AsmMacros_x86.h | 4 | ||||
| -rw-r--r-- | vidix/sysdep/pci_win32.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/vidix/sysdep/AsmMacros_powerpc.h b/vidix/sysdep/AsmMacros_powerpc.h index 0ae2fd57d2..7688c6ad9f 100644 --- a/vidix/sysdep/AsmMacros_powerpc.h +++ b/vidix/sysdep/AsmMacros_powerpc.h @@ -66,7 +66,7 @@ extern unsigned char *ioBase; -static __inline__ volatile void eieio() +static __inline__ volatile void eieio(void) { __asm__ volatile ("eieio"); } diff --git a/vidix/sysdep/AsmMacros_x86.h b/vidix/sysdep/AsmMacros_x86.h index 6bebeaa505..88e71e275d 100644 --- a/vidix/sysdep/AsmMacros_x86.h +++ b/vidix/sysdep/AsmMacros_x86.h @@ -321,7 +321,7 @@ static __inline__ unsigned int inl(short port) return ret; } -static __inline__ void intr_disable() +static __inline__ void intr_disable(void) { #ifdef CONFIG_SVGAHELPER if (svgahelper_initialized == 1) @@ -330,7 +330,7 @@ static __inline__ void intr_disable() __asm__ volatile("cli"); } -static __inline__ void intr_enable() +static __inline__ void intr_enable(void) { #ifdef CONFIG_SVGAHELPER if (svgahelper_initialized == 1) diff --git a/vidix/sysdep/pci_win32.c b/vidix/sysdep/pci_win32.c index d01cdfd30e..bdaf5d53ff 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; -int IsWinNT(); +int IsWinNT(void); |