diff options
author | bde <bde@FreeBSD.org> | 1995-11-09 08:41:25 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1995-11-09 08:41:25 +0000 |
commit | aded75dcc7f6064842d12a20701f44cece2752ec (patch) | |
tree | 866a77c31ac69b4168aea5f7ae55384668be1668 /sys/gnu/fs/ext2fs/i386-bitops.h | |
parent | 449a11eb8852c894681575cf4226b1c639a2f9bc (diff) | |
download | FreeBSD-src-aded75dcc7f6064842d12a20701f44cece2752ec.zip FreeBSD-src-aded75dcc7f6064842d12a20701f44cece2752ec.tar.gz |
ext2_inode_cnv.c:
Included <sys/vnode.h> and its prerequisite <sys/proc.h>, and cleaned
up includes. The vop_t changes made the non-inclusion of vnode.h
fatal instead of just sloppy.
i386_bitops.h:
Changed `extern inline' to `static inline'. `extern inline' is a
Linuxism that stops things from compiling without -O. Fixed
idempotency identifier.
Misc:
Added prototypes. Staticized some functions so that prototypes are
unnecessary. Added casts. Cleaned up includes.
Diffstat (limited to 'sys/gnu/fs/ext2fs/i386-bitops.h')
-rw-r--r-- | sys/gnu/fs/ext2fs/i386-bitops.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/gnu/fs/ext2fs/i386-bitops.h b/sys/gnu/fs/ext2fs/i386-bitops.h index a66679e..618913e 100644 --- a/sys/gnu/fs/ext2fs/i386-bitops.h +++ b/sys/gnu/fs/ext2fs/i386-bitops.h @@ -4,8 +4,8 @@ * * XXX replace with Mach routines or reprogram in C */ -#ifndef _I386_BITOPS_H -#define _I386_BITOPS_H +#ifndef _SYS_GNU_EXT2FS_I386_BITOPS_H_ +#define _SYS_GNU_EXT2FS_I386_BITOPS_H_ /* * Copyright 1992, Linus Torvalds. @@ -25,7 +25,7 @@ struct __dummy { unsigned long a[100]; }; #define ADDR (*(struct __dummy *) addr) -extern __inline__ int set_bit(int nr, void * addr) +static __inline__ int set_bit(int nr, void * addr) { int oldbit; @@ -35,7 +35,7 @@ extern __inline__ int set_bit(int nr, void * addr) return oldbit; } -extern __inline__ int clear_bit(int nr, void * addr) +static __inline__ int clear_bit(int nr, void * addr) { int oldbit; @@ -45,7 +45,7 @@ extern __inline__ int clear_bit(int nr, void * addr) return oldbit; } -extern __inline__ int change_bit(int nr, void * addr) +static __inline__ int change_bit(int nr, void * addr) { int oldbit; @@ -59,7 +59,7 @@ extern __inline__ int change_bit(int nr, void * addr) * This routine doesn't need to be atomic, but it's faster to code it * this way. */ -extern __inline__ int test_bit(int nr, void * addr) +static __inline__ int test_bit(int nr, void * addr) { int oldbit; @@ -72,7 +72,7 @@ extern __inline__ int test_bit(int nr, void * addr) /* * Find-bit routines.. */ -extern 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 @@ extern inline int find_first_zero_bit(void * addr, unsigned size) return res; } -extern 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 @@ extern 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.. */ -extern 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 @@ extern inline unsigned long ffz(unsigned long word) /* * find the first occurrence of byte 'c', or 1 past the area if none */ -extern 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; @@ -156,4 +156,4 @@ extern inline char * memscan(void * addr, unsigned char c, int size) return addr; } -#endif /* _I386_BITOPS_H */ +#endif /* !_SYS_GNU_EXT2FS_I386_BITOPS_H_ */ |