Support compiling with `gcc -ansi'.

5 files changed, 27 insertions, 27 deletions

diff --git a/sys/gnu/ext2fs/ext2_linux_balloc.c b/sys/gnu/ext2fs/ext2_linux_balloc.c
index aa17650..717b0e0 100644
--- a/sys/gnu/ext2fs/ext2_linux_balloc.c
+++ b/sys/gnu/ext2fs/ext2_linux_balloc.c
@@ -143,8 +143,8 @@ static int load__block_bitmap (struct mount * mp,
 	return 0;
 }
 
-static inline int load_block_bitmap (struct mount * mp,
-				     unsigned int block_group)
+static __inline int load_block_bitmap (struct mount * mp,
+				       unsigned int block_group)
 {
 	struct ext2_sb_info *sb = VFSTOUFS(mp)->um_e2fs;
 	if (sb->s_loaded_block_bitmaps > 0 &&
@@ -484,9 +484,9 @@ static unsigned long ext2_count_free_blocks (struct mount * mp)
 }
 #endif /* unused */
 
-static inline int block_in_use (unsigned long block,
-				struct ext2_sb_info * sb,
-				unsigned char * map)
+static __inline int block_in_use (unsigned long block,
+				  struct ext2_sb_info * sb,
+				  unsigned char * map)
 {
 	return test_bit ((block - sb->s_es->s_first_data_block) %
 			 EXT2_BLOCKS_PER_GROUP(sb), map);
diff --git a/sys/gnu/ext2fs/i386-bitops.h b/sys/gnu/ext2fs/i386-bitops.h
index 618913e..0674475 100644
--- a/sys/gnu/ext2fs/i386-bitops.h
+++ b/sys/gnu/ext2fs/i386-bitops.h
@@ -72,7 +72,7 @@ static __inline__ int test_bit(int nr, void * addr)
 /*
  * Find-bit routines..
  */
-static inline int find_first_zero_bit(void * addr, unsigned size)
+static __inline__ int find_first_zero_bit(void * addr, unsigned size)
 {
 	int res;
 
@@ -96,7 +96,7 @@ static inline int find_first_zero_bit(void * addr, unsigned size)
 	return res;
 }
 
-static inline int find_next_zero_bit (void * addr, int size, int offset)
+static __inline__ int find_next_zero_bit (void * addr, int size, int offset)
 {
 	unsigned long * p = ((unsigned long *) addr) + (offset >> 5);
 	int set = 0, bit = offset & 31, res;
@@ -128,7 +128,7 @@ static inline int find_next_zero_bit (void * addr, int size, int offset)
  * ffz = Find First Zero in word. Undefined if no zero exists,
  * so code should check against ~0UL first..
  */
-static inline unsigned long ffz(unsigned long word)
+static __inline__ unsigned long ffz(unsigned long word)
 {
 	__asm__("bsfl %1,%0"
 		:"=r" (word)
@@ -142,7 +142,7 @@ static inline unsigned long ffz(unsigned long word)
 /*
  * find the first occurrence of byte 'c', or 1 past the area if none
  */
-static inline char * memscan(void * addr, unsigned char c, int size)
+static __inline__ char * memscan(void * addr, unsigned char c, int size)
 {
         if (!size)
                 return addr;
diff --git a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
index aa17650..717b0e0 100644
--- a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
@@ -143,8 +143,8 @@ static int load__block_bitmap (struct mount * mp,
 	return 0;
 }
 
-static inline int load_block_bitmap (struct mount * mp,
-				     unsigned int block_group)
+static __inline int load_block_bitmap (struct mount * mp,
+				       unsigned int block_group)
 {
 	struct ext2_sb_info *sb = VFSTOUFS(mp)->um_e2fs;
 	if (sb->s_loaded_block_bitmaps > 0 &&
@@ -484,9 +484,9 @@ static unsigned long ext2_count_free_blocks (struct mount * mp)
 }
 #endif /* unused */
 
-static inline int block_in_use (unsigned long block,
-				struct ext2_sb_info * sb,
-				unsigned char * map)
+static __inline int block_in_use (unsigned long block,
+				  struct ext2_sb_info * sb,
+				  unsigned char * map)
 {
 	return test_bit ((block - sb->s_es->s_first_data_block) %
 			 EXT2_BLOCKS_PER_GROUP(sb), map);
diff --git a/sys/gnu/fs/ext2fs/i386-bitops.h b/sys/gnu/fs/ext2fs/i386-bitops.h
index 618913e..0674475 100644
--- a/sys/gnu/fs/ext2fs/i386-bitops.h
+++ b/sys/gnu/fs/ext2fs/i386-bitops.h
@@ -72,7 +72,7 @@ static __inline__ int test_bit(int nr, void * addr)
 /*
  * Find-bit routines..
  */
-static inline int find_first_zero_bit(void * addr, unsigned size)
+static __inline__ int find_first_zero_bit(void * addr, unsigned size)
 {
 	int res;
 
@@ -96,7 +96,7 @@ static inline int find_first_zero_bit(void * addr, unsigned size)
 	return res;
 }
 
-static inline int find_next_zero_bit (void * addr, int size, int offset)
+static __inline__ int find_next_zero_bit (void * addr, int size, int offset)
 {
 	unsigned long * p = ((unsigned long *) addr) + (offset >> 5);
 	int set = 0, bit = offset & 31, res;
@@ -128,7 +128,7 @@ static inline int find_next_zero_bit (void * addr, int size, int offset)
  * ffz = Find First Zero in word. Undefined if no zero exists,
  * so code should check against ~0UL first..
  */
-static inline unsigned long ffz(unsigned long word)
+static __inline__ unsigned long ffz(unsigned long word)
 {
 	__asm__("bsfl %1,%0"
 		:"=r" (word)
@@ -142,7 +142,7 @@ static inline unsigned long ffz(unsigned long word)
 /*
  * find the first occurrence of byte 'c', or 1 past the area if none
  */
-static inline char * memscan(void * addr, unsigned char c, int size)
+static __inline__ char * memscan(void * addr, unsigned char c, int size)
 {
         if (!size)
                 return addr;
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index cf98b7e..a8280a3 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.30 1997/12/16 17:39:57 eivind Exp $
+ *  dgb.c $Id: dgb.c,v 1.31 1998/01/24 02:54:07 eivind Exp $
  *
  *  Digiboard driver.
  *
@@ -311,10 +311,10 @@ static int dgbdebug=0;
 SYSCTL_INT(_debug, OID_AUTO, dgb_debug, CTLFLAG_RW,
 	&dgbdebug, 0, "");
 
-static int setwin __P((struct dgb_softc *sc, unsigned addr));
-static int setinitwin __P((struct dgb_softc *sc, unsigned addr));
-static void hidewin __P((struct dgb_softc *sc));
-static void towin __P((struct dgb_softc *sc, int win));
+static __inline int setwin __P((struct dgb_softc *sc, unsigned addr));
+static __inline int setinitwin __P((struct dgb_softc *sc, unsigned addr));
+static __inline void hidewin __P((struct dgb_softc *sc));
+static __inline void towin __P((struct dgb_softc *sc, int win));
 
 /*Helg: to allow recursive dgb...() calls */
 typedef struct
@@ -349,7 +349,7 @@ bmws_set(BoardMemWinState ws)
 	}
 }
 
-static inline int 
+static __inline int 
 setwin(sc,addr)
 	struct dgb_softc *sc;
 	unsigned int addr;
@@ -364,7 +364,7 @@ setwin(sc,addr)
 	}
 }
 
-static inline int 
+static __inline int 
 setinitwin(sc,addr)
 	struct dgb_softc *sc;
 	unsigned int addr;
@@ -379,7 +379,7 @@ setinitwin(sc,addr)
 	}
 }
 
-static inline void
+static __inline void
 hidewin(sc)
 	struct dgb_softc *sc;
 {
@@ -390,7 +390,7 @@ hidewin(sc)
 		outb(bmws.port=sc->port, bmws.data);
 }
 
-static inline void
+static __inline void
 towin(sc,win)
 	struct dgb_softc *sc;
 	int win;