diff options
| author | Eric Andersen <andersen@codepoet.org> | 2003-08-06 07:34:19 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2003-08-06 07:34:19 +0000 |
| commit | c774efe317442ee8e62ce2c6594c5e57776a8eee (patch) | |
| tree | ada60567b1411954fe021a07177b1187f629dc25 /util-linux | |
| parent | 7001480a5e52dfdb0840e3aed8ce255b411eb4c7 (diff) | |
| download | busybox-w32-c774efe317442ee8e62ce2c6594c5e57776a8eee.tar.gz busybox-w32-c774efe317442ee8e62ce2c6594c5e57776a8eee.tar.bz2 busybox-w32-c774efe317442ee8e62ce2c6594c5e57776a8eee.zip | |
extern inline is a bad bad thing. kill it (so mkfs_minix.c will
actually compile)
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/mkfs_minix.c | 22 |
1 files changed, 11 insertions, 11 deletions
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) | |||
| 254 | * an already mounted partition. Code adapted from mke2fs, Copyright | 254 | * an already mounted partition. Code adapted from mke2fs, Copyright |
| 255 | * (C) 1994 Theodore Ts'o. Also licensed under GPL. | 255 | * (C) 1994 Theodore Ts'o. Also licensed under GPL. |
| 256 | */ | 256 | */ |
| 257 | extern inline void check_mount(void) | 257 | static inline void check_mount(void) |
| 258 | { | 258 | { |
| 259 | FILE *f; | 259 | FILE *f; |
| 260 | struct mntent *mnt; | 260 | struct mntent *mnt; |
| @@ -282,7 +282,7 @@ static long valid_offset(int fd, int offset) | |||
| 282 | return 1; | 282 | return 1; |
| 283 | } | 283 | } |
| 284 | 284 | ||
| 285 | extern inline int count_blocks(int fd) | 285 | static inline int count_blocks(int fd) |
| 286 | { | 286 | { |
| 287 | int high, low; | 287 | int high, low; |
| 288 | 288 | ||
| @@ -301,7 +301,7 @@ extern inline int count_blocks(int fd) | |||
| 301 | return (low + 1); | 301 | return (low + 1); |
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | extern inline int get_size(const char *file) | 304 | static inline int get_size(const char *file) |
| 305 | { | 305 | { |
| 306 | int fd; | 306 | int fd; |
| 307 | long size; | 307 | long size; |
| @@ -318,7 +318,7 @@ extern inline int get_size(const char *file) | |||
| 318 | return size; | 318 | return size; |
| 319 | } | 319 | } |
| 320 | 320 | ||
| 321 | extern inline void write_tables(void) | 321 | static inline void write_tables(void) |
| 322 | { | 322 | { |
| 323 | /* Mark the super block valid. */ | 323 | /* Mark the super block valid. */ |
| 324 | Super.s_state |= MINIX_VALID_FS; | 324 | Super.s_state |= MINIX_VALID_FS; |
| @@ -368,7 +368,7 @@ static int get_free_block(void) | |||
| 368 | return blk; | 368 | return blk; |
| 369 | } | 369 | } |
| 370 | 370 | ||
| 371 | extern inline void mark_good_blocks(void) | 371 | static inline void mark_good_blocks(void) |
| 372 | { | 372 | { |
| 373 | int blk; | 373 | int blk; |
| 374 | 374 | ||
| @@ -386,7 +386,7 @@ static int next(int zone) | |||
| 386 | return 0; | 386 | return 0; |
| 387 | } | 387 | } |
| 388 | 388 | ||
| 389 | extern inline void make_bad_inode(void) | 389 | static inline void make_bad_inode(void) |
| 390 | { | 390 | { |
| 391 | struct minix_inode *inode = &Inode[MINIX_BAD_INO]; | 391 | struct minix_inode *inode = &Inode[MINIX_BAD_INO]; |
| 392 | int i, j, zone; | 392 | int i, j, zone; |
| @@ -437,7 +437,7 @@ extern inline void make_bad_inode(void) | |||
| 437 | } | 437 | } |
| 438 | 438 | ||
| 439 | #ifdef CONFIG_FEATURE_MINIX2 | 439 | #ifdef CONFIG_FEATURE_MINIX2 |
| 440 | extern inline void make_bad_inode2(void) | 440 | static inline void make_bad_inode2(void) |
| 441 | { | 441 | { |
| 442 | struct minix2_inode *inode = &Inode2[MINIX_BAD_INO]; | 442 | struct minix2_inode *inode = &Inode2[MINIX_BAD_INO]; |
| 443 | int i, j, zone; | 443 | int i, j, zone; |
| @@ -487,7 +487,7 @@ extern inline void make_bad_inode2(void) | |||
| 487 | } | 487 | } |
| 488 | #endif | 488 | #endif |
| 489 | 489 | ||
| 490 | extern inline void make_root_inode(void) | 490 | static inline void make_root_inode(void) |
| 491 | { | 491 | { |
| 492 | struct minix_inode *inode = &Inode[MINIX_ROOT_INO]; | 492 | struct minix_inode *inode = &Inode[MINIX_ROOT_INO]; |
| 493 | 493 | ||
| @@ -510,7 +510,7 @@ extern inline void make_root_inode(void) | |||
| 510 | } | 510 | } |
| 511 | 511 | ||
| 512 | #ifdef CONFIG_FEATURE_MINIX2 | 512 | #ifdef CONFIG_FEATURE_MINIX2 |
| 513 | extern inline void make_root_inode2(void) | 513 | static inline void make_root_inode2(void) |
| 514 | { | 514 | { |
| 515 | struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO]; | 515 | struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO]; |
| 516 | 516 | ||
| @@ -533,7 +533,7 @@ extern inline void make_root_inode2(void) | |||
| 533 | } | 533 | } |
| 534 | #endif | 534 | #endif |
| 535 | 535 | ||
| 536 | extern inline void setup_tables(void) | 536 | static inline void setup_tables(void) |
| 537 | { | 537 | { |
| 538 | int i; | 538 | int i; |
| 539 | unsigned long inodes; | 539 | unsigned long inodes; |
| @@ -603,7 +603,7 @@ extern inline void setup_tables(void) | |||
| 603 | * Perform a test of a block; return the number of | 603 | * Perform a test of a block; return the number of |
| 604 | * blocks readable/writeable. | 604 | * blocks readable/writeable. |
| 605 | */ | 605 | */ |
| 606 | extern inline long do_check(char *buffer, int try, unsigned int current_block) | 606 | static inline long do_check(char *buffer, int try, unsigned int current_block) |
| 607 | { | 607 | { |
| 608 | long got; | 608 | long got; |
| 609 | 609 | ||
