diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
| commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
| tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /vidix | |
| parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
| parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
| download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz | |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/mga_vid.c | 5 | ||||
| -rw-r--r-- | vidix/sysdep/libdha_os2.c | 4 | ||||
| -rw-r--r-- | vidix/sysdep/libdha_win32.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/vidix/mga_vid.c b/vidix/mga_vid.c index fd414fa3bb..cd0fe28fd4 100644 --- a/vidix/mga_vid.c +++ b/vidix/mga_vid.c @@ -566,7 +566,8 @@ if(!restore){ } #ifdef MGA_ALLOW_IRQ -static void enable_irq(){ +static void enable_irq(void) +{ long int cc; cc = readl(mga_mmio_base + IEN); @@ -582,7 +583,7 @@ static void enable_irq(){ return; } -static void disable_irq() +static void disable_irq(void) { writeb( 0x11, mga_mmio_base + CRTCX); writeb(0x20, mga_mmio_base + CRTCD ); /* clear 0, enable off */ diff --git a/vidix/sysdep/libdha_os2.c b/vidix/sysdep/libdha_os2.c index 041f6be71c..14ba370b42 100644 --- a/vidix/sysdep/libdha_os2.c +++ b/vidix/sysdep/libdha_os2.c @@ -45,7 +45,7 @@ static HFILE mapdev = -1; static ULONG stored_virt_addr; static char* mappath = "\\DEV\\PMAP$"; -static HFILE open_mmap() +static HFILE open_mmap(void) { APIRET rc; ULONG action; @@ -62,7 +62,7 @@ static HFILE open_mmap() return mapdev; } -static void close_mmap() +static void close_mmap(void) { if (mapdev != -1) DosClose(mapdev); diff --git a/vidix/sysdep/libdha_win32.c b/vidix/sysdep/libdha_win32.c index 4f6075194f..50c037aa2b 100644 --- a/vidix/sysdep/libdha_win32.c +++ b/vidix/sysdep/libdha_win32.c @@ -33,7 +33,7 @@ typedef struct MapDevRequest #define METHOD_NEITHER 3 -int IsWinNT(){ +int IsWinNT(void) { OSVERSIONINFO OSVersionInfo; OSVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); GetVersionEx(&OSVersionInfo); |