diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-04 08:10:48 +0300 |
| commit | d5c868325cefcd5fad53361d1dfdc9757674eb70 (patch) | |
| tree | a838e509fdc2468220466e6337097b3ef590b00c /vidix/sysdep/pci_linux.c | |
| parent | 0cb5123c8f65b3d7715deb22ce8430eccc21996e (diff) | |
| parent | 5b3834c5d1033f05d798278c33782c5563247062 (diff) | |
| download | mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.bz2 mpv-d5c868325cefcd5fad53361d1dfdc9757674eb70.tar.xz | |
Merge svn changes up to r26979
Most of the conflicts are trivial.
Conflicts:
Makefile
cfg-mplayer.h
input/input.c
libmenu/vf_menu.c
libmpcodecs/dec_video.c
libmpcodecs/vf_expand.c
libmpcodecs/vf_vo.c
libmpdemux/demux_mkv.c
libmpdemux/demuxer.c
libmpdemux/demuxer.h
libvo/vo_directfb2.c
libvo/vo_gl.c
libvo/vo_winvidix.c
libvo/vo_xv.c
libvo/vo_xvidix.c
libvo/vo_xvmc.c
libvo/x11_common.c
mplayer.c
osdep/timer-linux.c
stream/cache2.c
Diffstat (limited to 'vidix/sysdep/pci_linux.c')
| -rw-r--r-- | vidix/sysdep/pci_linux.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vidix/sysdep/pci_linux.c b/vidix/sysdep/pci_linux.c index 5e46f89fe9..07d9566563 100644 --- a/vidix/sysdep/pci_linux.c +++ b/vidix/sysdep/pci_linux.c @@ -96,7 +96,7 @@ static __inline__ int enable_os_io(void) if (svgahelper_fd > 0) { svgahelper_initialized = 1; - return(0); + return 0; } svgahelper_initialized = -1; #endif @@ -106,7 +106,7 @@ static __inline__ int enable_os_io(void) if (dhahelper_fd > 0) { dhahelper_initialized = 1; - return(0); + return 0; } dhahelper_initialized = -1; #endif @@ -115,9 +115,9 @@ static __inline__ int enable_os_io(void) /* should be fixed? */ #else if (iopl(3) != 0) - return(errno); + return errno; #endif - return(0); + return 0; } static __inline__ int disable_os_io(void) @@ -136,9 +136,9 @@ static __inline__ int disable_os_io(void) /* should be fixed? */ #else if (iopl(0) != 0) - return(errno); + return errno; #endif - return(0); + return 0; } #if (defined(__powerpc__) || defined(__sparc__) || defined(__sparc64__) \ |