changeset 1378:1831d86117a3 libavcodec

warning fixes
author al3x
date Fri, 25 Jul 2003 13:15:16 +0000
parents 326852ff8fee
children f0d3fdee007e
files alpha/asm.h bswap.h
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/alpha/asm.h	Thu Jul 24 23:44:45 2003 +0000
+++ b/alpha/asm.h	Fri Jul 25 13:15:16 2003 +0000
@@ -42,14 +42,14 @@
 #define AMASK_CIX (1 << 2)
 #define AMASK_MVI (1 << 8)
 
-inline static uint64_t BYTE_VEC(uint64_t x)
+static inline uint64_t BYTE_VEC(uint64_t x)
 {
     x |= x <<  8;
     x |= x << 16;
     x |= x << 32;
     return x;
 }
-inline static uint64_t WORD_VEC(uint64_t x)
+static inline uint64_t WORD_VEC(uint64_t x)
 {
     x |= x << 16;
     x |= x << 32;
--- a/bswap.h	Thu Jul 24 23:44:45 2003 +0000
+++ b/bswap.h	Fri Jul 25 13:15:16 2003 +0000
@@ -11,7 +11,7 @@
 #else
 
 #ifdef ARCH_X86
-inline static unsigned short ByteSwap16(unsigned short x)
+static inline unsigned short ByteSwap16(unsigned short x)
 {
   __asm("xchgb %b0,%h0"	:
         "=q" (x)	:
@@ -20,7 +20,7 @@
 }
 #define bswap_16(x) ByteSwap16(x)
 
-inline static unsigned int ByteSwap32(unsigned int x)
+static inline unsigned int ByteSwap32(unsigned int x)
 {
 #if __CPU__ > 386
  __asm("bswap	%0":
@@ -36,7 +36,7 @@
 }
 #define bswap_32(x) ByteSwap32(x)
 
-inline static unsigned long long int ByteSwap64(unsigned long long int x)
+static inline unsigned long long int ByteSwap64(unsigned long long int x)
 {
   register union { __extension__ uint64_t __ll;
           uint32_t __l[2]; } __x;
@@ -66,7 +66,7 @@
 #define bswap_16(x) ByteSwap16(x)
 #define bswap_32(x) ByteSwap32(x)
 
-inline static uint64_t ByteSwap64(uint64_t x)
+static inline uint64_t ByteSwap64(uint64_t x)
 {
     union { 
         uint64_t ll;
@@ -90,7 +90,7 @@
      ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >>  8) | \
       (((x) & 0x0000ff00) <<  8) | (((x) & 0x000000ff) << 24))
 
-inline static uint64_t ByteSwap64(uint64_t x)
+static inline uint64_t ByteSwap64(uint64_t x)
 {
     union { 
         uint64_t ll;