inline -> __inline.

Headers should always use `__inline' for inline functions to avoid
syntax errors when modules that don't even use the offending functions
are compiled with `gcc -ansi'.
This commit is contained in:
Bruce Evans 1995-04-23 08:05:49 +00:00
parent 625fa10a30
commit 7666fb4753
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=8010
2 changed files with 15 additions and 15 deletions

View File

@ -31,21 +31,21 @@
* SUCH DAMAGE.
*
* @(#)libkern.h 8.1 (Berkeley) 6/10/93
* $Id: libkern.h,v 1.5 1994/11/14 14:56:46 bde Exp $
* $Id: libkern.h,v 1.6 1995/03/16 18:12:58 bde Exp $
*/
#include <sys/types.h>
static inline int imax(int a, int b) { return (a > b ? a : b); }
static inline int imin(int a, int b) { return (a < b ? a : b); }
static inline long lmax(long a, long b) { return (a > b ? a : b); }
static inline long lmin(long a, long b) { return (a < b ? a : b); }
static inline u_int max(u_int a, u_int b) { return (a > b ? a : b); }
static inline u_int min(u_int a, u_int b) { return (a < b ? a : b); }
static inline quad_t qmax(quad_t a, quad_t b) { return (a > b ? a : b); }
static inline quad_t qmin(quad_t a, quad_t b) { return (a < b ? a : b); }
static inline u_long ulmax(u_long a, u_long b) { return (a > b ? a : b); }
static inline u_long ulmin(u_long a, u_long b) { return (a < b ? a : b); }
static __inline int imax(int a, int b) { return (a > b ? a : b); }
static __inline int imin(int a, int b) { return (a < b ? a : b); }
static __inline long lmax(long a, long b) { return (a > b ? a : b); }
static __inline long lmin(long a, long b) { return (a < b ? a : b); }
static __inline u_int max(u_int a, u_int b) { return (a > b ? a : b); }
static __inline u_int min(u_int a, u_int b) { return (a < b ? a : b); }
static __inline quad_t qmax(quad_t a, quad_t b) { return (a > b ? a : b); }
static __inline quad_t qmin(quad_t a, quad_t b) { return (a < b ? a : b); }
static __inline u_long ulmax(u_long a, u_long b) { return (a > b ? a : b); }
static __inline u_long ulmin(u_long a, u_long b) { return (a < b ? a : b); }
/* Prototypes for non-quad routines. */
int bcmp __P((const void *, const void *, size_t));

View File

@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: vm_page.h,v 1.16 1995/03/01 23:30:01 davidg Exp $
* $Id: vm_page.h,v 1.17 1995/03/26 23:33:14 davidg Exp $
*/
/*
@ -256,7 +256,7 @@ int vm_page_bits __P((int, int));
* overhead and should be used only for *very* temporary
* holding ("wiring").
*/
static inline void
static __inline void
vm_page_hold(vm_page_t mem)
{
mem->hold_count++;
@ -266,7 +266,7 @@ vm_page_hold(vm_page_t mem)
#include <sys/systm.h> /* make GCC shut up */
#endif
static inline void
static __inline void
vm_page_unhold(vm_page_t mem)
{
#ifdef DIAGNOSTIC
@ -277,7 +277,7 @@ vm_page_unhold(vm_page_t mem)
#endif
}
static inline void
static __inline void
vm_page_protect(vm_page_t mem, int prot)
{
if (prot == VM_PROT_NONE) {