[MPlayer-cvslog] r34741 - in trunk: drivers/radeon_vid.c libmpdemux/demux_avs.c vidix/mach64_vid.c vidix/pci.c vidix/radeon_vid.c vidix/sysdep/AsmMacros_arm32.h vidix/sysdep/AsmMacros_powerpc.h vidix/sysdep/AsmMacr...
diego
subversion at mplayerhq.hu
Sun Feb 19 16:21:28 CET 2012
Author: diego
Date: Sun Feb 19 16:21:28 2012
New Revision: 34741
Log:
Make inline keyword handling consistent.
Replace __inline__ and __inline by inline and move it after the static keyword.
Modified:
trunk/drivers/radeon_vid.c
trunk/libmpdemux/demux_avs.c
trunk/vidix/mach64_vid.c
trunk/vidix/pci.c
trunk/vidix/radeon_vid.c
trunk/vidix/sysdep/AsmMacros_arm32.h
trunk/vidix/sysdep/AsmMacros_powerpc.h
trunk/vidix/sysdep/AsmMacros_sparc.h
trunk/vidix/sysdep/AsmMacros_x86.h
trunk/vidix/sysdep/pci_386bsd.c
trunk/vidix/sysdep/pci_bsdi.c
trunk/vidix/sysdep/pci_freebsd.c
trunk/vidix/sysdep/pci_isc.c
trunk/vidix/sysdep/pci_linux.c
trunk/vidix/sysdep/pci_lynx.c
trunk/vidix/sysdep/pci_mach386.c
trunk/vidix/sysdep/pci_netbsd.c
trunk/vidix/sysdep/pci_openbsd.c
trunk/vidix/sysdep/pci_os2.c
trunk/vidix/sysdep/pci_sco.c
trunk/vidix/sysdep/pci_svr4.c
trunk/vidix/sysdep/pci_win32.c
Modified: trunk/drivers/radeon_vid.c
==============================================================================
--- trunk/drivers/radeon_vid.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/drivers/radeon_vid.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -421,7 +421,7 @@ static int radeon_is_interlace( void )
return (INREG(CRTC_GEN_CNTL))&CRTC_INTERLACE_EN;
}
-static __inline__ void radeon_engine_flush ( void )
+static inline void radeon_engine_flush(void)
{
int i;
@@ -436,7 +436,7 @@ static __inline__ void radeon_engine_flu
}
-static __inline__ void radeon_fifo_wait (int entries)
+static inline void radeon_fifo_wait(int entries)
{
int i;
@@ -446,7 +446,7 @@ static __inline__ void radeon_fifo_wait
}
-static __inline__ void radeon_engine_idle ( void )
+static inline void radeon_engine_idle(void)
{
int i;
Modified: trunk/libmpdemux/demux_avs.c
==============================================================================
--- trunk/libmpdemux/demux_avs.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/libmpdemux/demux_avs.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -146,7 +146,7 @@ avs_err:
/* Implement RGB MODES ?? */
#if 0
-static __inline int get_mmioFOURCC(const AVS_VideoInfo *v)
+static inline int get_mmioFOURCC(const AVS_VideoInfo *v)
{
if (avs_is_rgb(v)) return mmioFOURCC(8, 'R', 'G', 'B');
if (avs_is_rgb24(v)) return mmioFOURCC(24, 'R', 'G', 'B');
Modified: trunk/vidix/mach64_vid.c
==============================================================================
--- trunk/vidix/mach64_vid.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/mach64_vid.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -160,13 +160,13 @@ static inline uint32_t INREG (uint32_t a
OUTREG(addr, _tmp); \
} while (0)
-static __inline__ int ATIGetMach64LCDReg(int _Index)
+static inline int ATIGetMach64LCDReg(int _Index)
{
OUTREG8(LCD_INDEX, _Index);
return INREG(LCD_DATA);
}
-static __inline__ uint32_t INPLL(uint32_t addr)
+static inline uint32_t INPLL(uint32_t addr)
{
uint32_t res;
uint32_t in;
@@ -180,7 +180,7 @@ static __inline__ uint32_t INPLL(uint32_
return res;
}
-static __inline__ void OUTPLL(uint32_t addr,uint32_t val)
+static inline void OUTPLL(uint32_t addr, uint32_t val)
{
//FIXME buggy but its not used
/* write addr byte */
Modified: trunk/vidix/pci.c
==============================================================================
--- trunk/vidix/pci.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/pci.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -104,7 +104,7 @@
static unsigned char *pciConfBase;
-static __inline__ unsigned long
+static inline unsigned long
static swapl(unsigned long val)
{
unsigned char *p = (unsigned char *)&val;
Modified: trunk/vidix/radeon_vid.c
==============================================================================
--- trunk/vidix/radeon_vid.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/radeon_vid.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -547,7 +547,7 @@ static inline uint32_t INREG (uint32_t a
OUTREG(addr, _tmp); \
} while (0)
-static __inline__ uint32_t INPLL(uint32_t addr)
+static inline uint32_t INPLL(uint32_t addr)
{
OUTREG8(CLOCK_CNTL_INDEX, addr & 0x0000001f);
return INREG(CLOCK_CNTL_DATA);
@@ -712,7 +712,7 @@ static void _radeon_fifo_wait(unsigned);
#define radeon_engine_idle() _radeon_engine_idle()
#define radeon_fifo_wait(entries) _radeon_fifo_wait(entries)
/* Flush all dirty data in the Pixel Cache to memory. */
-static __inline__ void radeon_engine_flush ( void )
+static inline void radeon_engine_flush(void)
{
unsigned i;
@@ -750,7 +750,7 @@ static void radeon_engine_reset( void )
}
#else
-static __inline__ void radeon_engine_flush ( void )
+static inline void radeon_engine_flush(void)
{
int i;
@@ -1434,7 +1434,7 @@ static const fourcc_desc_t supported_fou
{ IMGFMT_BGR32, 775 }
};
-__inline__ static int is_supported_fourcc(uint32_t fourcc)
+static inline int is_supported_fourcc(uint32_t fourcc)
{
unsigned i;
for(i=0;i<sizeof(supported_fourcc)/sizeof(fourcc_desc_t);i++)
Modified: trunk/vidix/sysdep/AsmMacros_arm32.h
==============================================================================
--- trunk/vidix/sysdep/AsmMacros_arm32.h Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/AsmMacros_arm32.h Sun Feb 19 16:21:28 2012 (r34741)
@@ -64,37 +64,37 @@
unsigned int IOPortBase; /* Memory mapped I/O port area */
-static __inline__ void outb(short port,char val)
+static inline void outb(short port, char val)
{
if ((unsigned short)port >= 0x400) return;
*(volatile unsigned char*)(((unsigned short)(port))+IOPortBase) = val;
}
-static __inline__ void outw(short port,short val)
+static inline void outw(short port, short val)
{
if ((unsigned short)port >= 0x400) return;
*(volatile unsigned short*)(((unsigned short)(port))+IOPortBase) = val;
}
-static __inline__ void outl(short port,int val)
+static inline void outl(short port, int val)
{
if ((unsigned short)port >= 0x400) return;
*(volatile unsigned long*)(((unsigned short)(port))+IOPortBase) = val;
}
-static __inline__ unsigned int inb(short port)
+static inline unsigned int inb(short port)
{
if ((unsigned short)port >= 0x400) return (unsigned int)-1;
return *(volatile unsigned char*)(((unsigned short)(port))+IOPortBase);
}
-static __inline__ unsigned int inw(short port)
+static inline unsigned int inw(short port)
{
if ((unsigned short)port >= 0x400) return (unsigned int)-1;
return *(volatile unsigned short*)(((unsigned short)(port))+IOPortBase);
}
-static __inline__ unsigned int inl(short port)
+static inline unsigned int inl(short port)
{
if ((unsigned short)port >= 0x400) return (unsigned int)-1;
return *(volatile unsigned long*)(((unsigned short)(port))+IOPortBase);
Modified: trunk/vidix/sysdep/AsmMacros_powerpc.h
==============================================================================
--- trunk/vidix/sysdep/AsmMacros_powerpc.h Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/AsmMacros_powerpc.h Sun Feb 19 16:21:28 2012 (r34741)
@@ -66,41 +66,41 @@
extern unsigned char *ioBase;
-static __inline__ volatile void eieio(void)
+static inline volatile void eieio(void)
{
__asm__ volatile ("eieio");
}
-static __inline__ void outb(short port, unsigned char value)
+static inline void outb(short port, unsigned char value)
{
*(unsigned char *)(ioBase + port) = value; eieio();
}
-static __inline__ void outw(short port, unsigned short value)
+static inline void outw(short port, unsigned short value)
{
*(unsigned short *)(ioBase + port) = value; eieio();
}
-static __inline__ void outl(short port, unsigned short value)
+static inline void outl(short port, unsigned short value)
{
*(unsigned long *)(ioBase + port) = value; eieio();
}
-static __inline__ unsigned char inb(short port)
+static inline unsigned char inb(short port)
{
unsigned char val;
val = *((unsigned char *)(ioBase + port)); eieio();
return val;
}
-static __inline__ unsigned short inw(short port)
+static inline unsigned short inw(short port)
{
unsigned short val;
val = *((unsigned short *)(ioBase + port)); eieio();
return val;
}
-static __inline__ unsigned long inl(short port)
+static inline unsigned long inl(short port)
{
unsigned long val;
val = *((unsigned long *)(ioBase + port)); eieio();
Modified: trunk/vidix/sysdep/AsmMacros_sparc.h
==============================================================================
--- trunk/vidix/sysdep/AsmMacros_sparc.h Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/AsmMacros_sparc.h Sun Feb 19 16:21:28 2012 (r34741)
@@ -66,36 +66,36 @@
#define ASI_PL 0x88
#endif
-static __inline__ void outb(unsigned long port, char val)
+static inline void outb(unsigned long port, char val)
{
__asm__ volatile("stba %0, [%1] %2" : : "r" (val), "r" (port), "i" (ASI_PL));
}
-static __inline__ void outw(unsigned long port, char val)
+static inline void outw(unsigned long port, char val)
{
__asm__ volatile("stha %0, [%1] %2" : : "r" (val), "r" (port), "i" (ASI_PL));
}
-static __inline__ void outl(unsigned long port, char val)
+static inline void outl(unsigned long port, char val)
{
__asm__ volatile("sta %0, [%1] %2" : : "r" (val), "r" (port), "i" (ASI_PL));
}
-static __inline__ unsigned int inb(unsigned long port)
+static inline unsigned int inb(unsigned long port)
{
unsigned char ret;
__asm__ volatile("lduba [%1] %2, %0" : "=r" (ret) : "r" (port), "i" (ASI_PL));
return ret;
}
-static __inline__ unsigned int inw(unsigned long port)
+static inline unsigned int inw(unsigned long port)
{
unsigned char ret;
__asm__ volatile("lduha [%1] %2, %0" : "=r" (ret) : "r" (port), "i" (ASI_PL));
return ret;
}
-static __inline__ unsigned int inl(unsigned long port)
+static inline unsigned int inl(unsigned long port)
{
unsigned char ret;
__asm__ volatile("lda [%1] %2, %0" : "=r" (ret) : "r" (port), "i" (ASI_PL));
Modified: trunk/vidix/sysdep/AsmMacros_x86.h
==============================================================================
--- trunk/vidix/sysdep/AsmMacros_x86.h Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/AsmMacros_x86.h Sun Feb 19 16:21:28 2012 (r34741)
@@ -89,7 +89,7 @@ extern int dhahelper_initialized;
extern int svgahelper_fd;
extern int svgahelper_initialized;
-static __inline__ void svga_outb(short port, char value)
+static inline void svga_outb(short port, char value)
{
io_t iov;
@@ -98,7 +98,7 @@ static __inline__ void svga_outb(short p
ioctl(svgahelper_fd, SVGALIB_HELPER_IOCSOUTB, &iov);
}
-static __inline__ void svga_outw(short port, char value)
+static inline void svga_outw(short port, char value)
{
io_t iov;
@@ -107,7 +107,7 @@ static __inline__ void svga_outw(short p
ioctl(svgahelper_fd, SVGALIB_HELPER_IOCSOUTW, &iov);
}
-static __inline__ void svga_outl(short port, unsigned int value)
+static inline void svga_outl(short port, unsigned int value)
{
io_t iov;
@@ -116,7 +116,7 @@ static __inline__ void svga_outl(short p
ioctl(svgahelper_fd, SVGALIB_HELPER_IOCSOUTL, &iov);
}
-static __inline__ unsigned int svga_inb(short port)
+static inline unsigned int svga_inb(short port)
{
io_t iov;
@@ -126,7 +126,7 @@ static __inline__ unsigned int svga_inb(
return iov.val;
}
-static __inline__ unsigned int svga_inw(short port)
+static inline unsigned int svga_inw(short port)
{
io_t iov;
@@ -136,7 +136,7 @@ static __inline__ unsigned int svga_inw(
return iov.val;
}
-static __inline__ unsigned int svga_inl(short port)
+static inline unsigned int svga_inl(short port)
{
io_t iov;
@@ -147,7 +147,7 @@ static __inline__ unsigned int svga_inl(
}
#endif /* CONIFG_SVGAHELPER */
-static __inline__ void outb(short port,char val)
+static inline void outb(short port, char val)
{
#ifdef CONFIG_SVGAHELPER
if (svgahelper_initialized == 1)
@@ -175,7 +175,7 @@ static __inline__ void outb(short port,c
return;
}
-static __inline__ void outw(short port,short val)
+static inline void outw(short port, short val)
{
#ifdef CONFIG_SVGAHELPER
if (svgahelper_initialized == 1)
@@ -203,7 +203,7 @@ static __inline__ void outw(short port,s
return;
}
-static __inline__ void outl(short port,unsigned int val)
+static inline void outl(short port, unsigned int val)
{
#ifdef CONFIG_SVGAHELPER
if (svgahelper_initialized == 1)
@@ -231,7 +231,7 @@ static __inline__ void outl(short port,u
return;
}
-static __inline__ unsigned int inb(short port)
+static inline unsigned int inb(short port)
{
unsigned char ret = 0;
@@ -261,7 +261,7 @@ static __inline__ unsigned int inb(short
return ret;
}
-static __inline__ unsigned int inw(short port)
+static inline unsigned int inw(short port)
{
unsigned short ret = 0;
@@ -291,7 +291,7 @@ static __inline__ unsigned int inw(short
return ret;
}
-static __inline__ unsigned int inl(short port)
+static inline unsigned int inl(short port)
{
unsigned int ret = 0;
@@ -321,7 +321,7 @@ static __inline__ unsigned int inl(short
return ret;
}
-static __inline__ void intr_disable(void)
+static inline void intr_disable(void)
{
#ifdef CONFIG_SVGAHELPER
if (svgahelper_initialized == 1)
@@ -330,7 +330,7 @@ static __inline__ void intr_disable(void
__asm__ volatile("cli");
}
-static __inline__ void intr_enable(void)
+static inline void intr_enable(void)
{
#ifdef CONFIG_SVGAHELPER
if (svgahelper_initialized == 1)
Modified: trunk/vidix/sysdep/pci_386bsd.c
==============================================================================
--- trunk/vidix/sysdep/pci_386bsd.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/pci_386bsd.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -35,7 +35,7 @@
static int io_fd;
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
{
io_fd = -1 ;
if ((io_fd = open("/dev/console", O_RDWR, 0)) < 0) {
@@ -49,7 +49,7 @@ static __inline__ int enable_os_io(void)
return 0;
}
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
{
if (ioctl(io_fd, KDDISABIO, 0) < 0) {
perror("ioctl(KDDISABIO)");
Modified: trunk/vidix/sysdep/pci_bsdi.c
==============================================================================
--- trunk/vidix/sysdep/pci_bsdi.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/pci_bsdi.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -13,7 +13,7 @@
static int io_fd;
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
{
io_fd = -1 ;
if ((io_fd = open("/dev/console", O_RDWR, 0)) < 0) {
@@ -27,7 +27,7 @@ static __inline__ int enable_os_io(void)
return 0;
}
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
{
if (ioctl(io_fd, PCCONDISABIOPL, 0) < 0) {
perror("ioctl(PCCONDISABIOPL)");
Modified: trunk/vidix/sysdep/pci_freebsd.c
==============================================================================
--- trunk/vidix/sysdep/pci_freebsd.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/pci_freebsd.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -35,7 +35,7 @@
static int io_fd;
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
{
io_fd = -1 ;
if ((io_fd = open("/dev/console", O_RDWR, 0)) < 0) {
@@ -49,7 +49,7 @@ static __inline__ int enable_os_io(void)
return 0;
}
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
{
if (ioctl(io_fd, KDDISABIO, 0) < 0) {
perror("ioctl(KDDISABIO)");
Modified: trunk/vidix/sysdep/pci_isc.c
==============================================================================
--- trunk/vidix/sysdep/pci_isc.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/pci_isc.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -34,7 +34,7 @@
#include <sys/sysi86.h>
#include <sys/v86.h>
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
{
#if defined(SI86IOPL)
sysi86(SI86IOPL, 3);
@@ -44,7 +44,7 @@ static __inline__ int enable_os_io(void)
return 0;
}
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
{
#if defined(SI86IOPL)
sysi86(SI86IOPL, 0);
Modified: trunk/vidix/sysdep/pci_linux.c
==============================================================================
--- trunk/vidix/sysdep/pci_linux.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/pci_linux.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -88,7 +88,7 @@ static int pci_get_vendor(
}
#endif /* CONFIG_SVGAHELPER */
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
{
#ifdef CONFIG_SVGAHELPER
svgahelper_fd = open(DEV_SVGA, O_RDWR);
@@ -119,7 +119,7 @@ static __inline__ int enable_os_io(void)
return 0;
}
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
{
#ifdef CONFIG_SVGAHELPER
if (svgahelper_initialized == 1)
Modified: trunk/vidix/sysdep/pci_lynx.c
==============================================================================
--- trunk/vidix/sysdep/pci_lynx.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/pci_lynx.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -38,7 +38,7 @@
static unsigned char *pciConfBase;
-static __inline__ void enable_os_io(void)
+static inline void enable_os_io(void)
{
pciConfBase = (unsigned char *) smem_create("PCI-CONF",
(char *)0x80800000, 64*1024, SM_READ|SM_WRITE);
@@ -46,7 +46,7 @@ static __inline__ void enable_os_io(void
exit(1);
}
-static __inline__ void disable_os_io(void)
+static inline void disable_os_io(void)
{
smem_create(NULL, (char *) pciConfBase, 0, SM_DETACH);
smem_remove("PCI-CONF");
@@ -57,7 +57,7 @@ static __inline__ void disable_os_io(voi
static unsigned char *pciConfBase;
-static __inline__ unsigned long
+static inline unsigned long
static swapl(unsigned long val)
{
unsigned char *p = (unsigned char *)&val;
Modified: trunk/vidix/sysdep/pci_mach386.c
==============================================================================
--- trunk/vidix/sysdep/pci_mach386.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/pci_mach386.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -30,7 +30,7 @@
static int io_fd;
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
{
io_fd = -1 ;
if ((io_fd = open("/dev/iopl", O_RDWR, 0)) < 0) {
@@ -40,7 +40,7 @@ static __inline__ int enable_os_io(void)
return 0;
}
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
{
close(io_fd);
return 0;
Modified: trunk/vidix/sysdep/pci_netbsd.c
==============================================================================
--- trunk/vidix/sysdep/pci_netbsd.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/pci_netbsd.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -36,7 +36,7 @@
static int io_fd;
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
{
io_fd = -1 ;
#if !defined(USE_I386_IOPL)
@@ -53,7 +53,7 @@ static __inline__ int enable_os_io(void)
return 0;
}
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
{
#if !defined(USE_I386_IOPL)
close(io_fd);
Modified: trunk/vidix/sysdep/pci_openbsd.c
==============================================================================
--- trunk/vidix/sysdep/pci_openbsd.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/pci_openbsd.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -32,7 +32,7 @@
#include <sys/types.h>
#include <machine/sysarch.h>
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
{
if (i386_iopl(1) < 0) {
perror("i386_iopl");
@@ -41,7 +41,7 @@ static __inline__ int enable_os_io(void)
return 0;
}
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
{
/* Nothing to do */
return 0;
Modified: trunk/vidix/sysdep/pci_os2.c
==============================================================================
--- trunk/vidix/sysdep/pci_os2.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/pci_os2.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -31,7 +31,7 @@
static USHORT callgate[3] = {0,0,0};
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
{
HFILE hfd;
ULONG dlen,action;
@@ -71,7 +71,7 @@ static __inline__ int enable_os_io(void)
return 0;
}
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
{
/* Nothing to do */
return 0;
Modified: trunk/vidix/sysdep/pci_sco.c
==============================================================================
--- trunk/vidix/sysdep/pci_sco.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/pci_sco.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -35,7 +35,7 @@
#include <sys/sysi86.h>
#include <sys/v86.h>
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
{
#if defined(SI86IOPL)
sysi86(SI86IOPL, 3);
@@ -45,7 +45,7 @@ static __inline__ int enable_os_io(void)
return 0;
}
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
{
#if defined(SI86IOPL)
sysi86(SI86IOPL, 0);
Modified: trunk/vidix/sysdep/pci_svr4.c
==============================================================================
--- trunk/vidix/sysdep/pci_svr4.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/pci_svr4.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -44,7 +44,7 @@
# include <sys/psw.h>
#endif
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
{
#if defined(SI86IOPL)
sysi86(SI86IOPL, 3);
@@ -54,7 +54,7 @@ static __inline__ int enable_os_io(void)
return 0;
}
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
{
#if defined(SI86IOPL)
sysi86(SI86IOPL, 0);
Modified: trunk/vidix/sysdep/pci_win32.c
==============================================================================
--- trunk/vidix/sysdep/pci_win32.c Sun Feb 19 16:21:23 2012 (r34740)
+++ trunk/vidix/sysdep/pci_win32.c Sun Feb 19 16:21:28 2012 (r34741)
@@ -33,7 +33,7 @@
static HANDLE hDriver;
-static __inline__ int enable_os_io(void)
+static inline int enable_os_io(void)
{
if(IsWinNT()){
DWORD dwBytesReturned;
@@ -46,7 +46,7 @@ static __inline__ int enable_os_io(void)
return 0;
}
-static __inline__ int disable_os_io(void)
+static inline int disable_os_io(void)
{
if(IsWinNT()){
DWORD dwBytesReturned;
More information about the MPlayer-cvslog
mailing list