From: Eric Andersen <andersen@codepoet.org>
Date: Wed, 6 Aug 2003 07:34:19 +0000 (-0000)
Subject: extern inline is a bad bad thing.  kill it (so mkfs_minix.c will
X-Git-Tag: 1_00_pre3~99
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c774efe317442ee8e62ce2c6594c5e57776a8eee;p=oweals%2Fbusybox.git

extern inline is a bad bad thing.  kill it (so mkfs_minix.c will
actually compile)
---

diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index 75a909e6b..767f998cc 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -254,7 +254,7 @@ static inline int bit(char * a,unsigned int i)
  * an already mounted partition.  Code adapted from mke2fs, Copyright
  * (C) 1994 Theodore Ts'o.  Also licensed under GPL.
  */
-extern inline void check_mount(void)
+static inline void check_mount(void)
 {
 	FILE *f;
 	struct mntent *mnt;
@@ -282,7 +282,7 @@ static long valid_offset(int fd, int offset)
 	return 1;
 }
 
-extern inline int count_blocks(int fd)
+static inline int count_blocks(int fd)
 {
 	int high, low;
 
@@ -301,7 +301,7 @@ extern inline int count_blocks(int fd)
 	return (low + 1);
 }
 
-extern inline int get_size(const char *file)
+static inline int get_size(const char *file)
 {
 	int fd;
 	long size;
@@ -318,7 +318,7 @@ extern inline int get_size(const char *file)
 	return size;
 }
 
-extern inline void write_tables(void)
+static inline void write_tables(void)
 {
 	/* Mark the super block valid. */
 	Super.s_state |= MINIX_VALID_FS;
@@ -368,7 +368,7 @@ static int get_free_block(void)
 	return blk;
 }
 
-extern inline void mark_good_blocks(void)
+static inline void mark_good_blocks(void)
 {
 	int blk;
 
@@ -386,7 +386,7 @@ static int next(int zone)
 	return 0;
 }
 
-extern inline void make_bad_inode(void)
+static inline void make_bad_inode(void)
 {
 	struct minix_inode *inode = &Inode[MINIX_BAD_INO];
 	int i, j, zone;
@@ -437,7 +437,7 @@ extern inline void make_bad_inode(void)
 }
 
 #ifdef CONFIG_FEATURE_MINIX2
-extern inline void make_bad_inode2(void)
+static inline void make_bad_inode2(void)
 {
 	struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
 	int i, j, zone;
@@ -487,7 +487,7 @@ extern inline void make_bad_inode2(void)
 }
 #endif
 
-extern inline void make_root_inode(void)
+static inline void make_root_inode(void)
 {
 	struct minix_inode *inode = &Inode[MINIX_ROOT_INO];
 
@@ -510,7 +510,7 @@ extern inline void make_root_inode(void)
 }
 
 #ifdef CONFIG_FEATURE_MINIX2
-extern inline void make_root_inode2(void)
+static inline void make_root_inode2(void)
 {
 	struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO];
 
@@ -533,7 +533,7 @@ extern inline void make_root_inode2(void)
 }
 #endif
 
-extern inline void setup_tables(void)
+static inline void setup_tables(void)
 {
 	int i;
 	unsigned long inodes;
@@ -603,7 +603,7 @@ extern inline void setup_tables(void)
  * Perform a test of a block; return the number of
  * blocks readable/writeable.
  */
-extern inline long do_check(char *buffer, int try, unsigned int current_block)
+static inline long do_check(char *buffer, int try, unsigned int current_block)
 {
 	long got;