diff options
author | stefanf <stefanf@FreeBSD.org> | 2004-07-04 16:11:03 +0000 |
---|---|---|
committer | stefanf <stefanf@FreeBSD.org> | 2004-07-04 16:11:03 +0000 |
commit | 9dea8aeba1c4f733fc95d1dfd11cfc8d3092a654 (patch) | |
tree | 0e3fe3a61275cb24fb693e8710ebc6420adf5306 /sys/netgraph | |
parent | c8bc9c77afa1fbbf704376606a236020afdfba8e (diff) | |
download | FreeBSD-src-9dea8aeba1c4f733fc95d1dfd11cfc8d3092a654.zip FreeBSD-src-9dea8aeba1c4f733fc95d1dfd11cfc8d3092a654.tar.gz |
Consistently use __inline instead of __inline__ as the former is an empty macro
in <sys/cdefs.h> for compilers without support for inline.
Diffstat (limited to 'sys/netgraph')
-rw-r--r-- | sys/netgraph/ng_async.c | 2 | ||||
-rw-r--r-- | sys/netgraph/ng_eiface.c | 4 | ||||
-rw-r--r-- | sys/netgraph/ng_fec.c | 4 | ||||
-rw-r--r-- | sys/netgraph/ng_gif_demux.c | 8 | ||||
-rw-r--r-- | sys/netgraph/ng_iface.c | 12 | ||||
-rw-r--r-- | sys/netgraph/ng_sppp.c | 4 |
6 files changed, 17 insertions, 17 deletions
diff --git a/sys/netgraph/ng_async.c b/sys/netgraph/ng_async.c index ae0e278..4c2f3f6 100644 --- a/sys/netgraph/ng_async.c +++ b/sys/netgraph/ng_async.c @@ -390,7 +390,7 @@ nga_disconnect(hook_p hook) /* * Encode a byte into the async buffer */ -static __inline__ void +static __inline void nga_async_add(const sc_p sc, u_int16_t *fcs, u_int32_t accm, int *len, u_char x) { *fcs = PPP_FCS(*fcs, x); diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c index aad1365..6a7d536 100644 --- a/sys/netgraph/ng_eiface.c +++ b/sys/netgraph/ng_eiface.c @@ -127,7 +127,7 @@ static int ng_units_in_use = 0; * Find the first free unit number for a new interface. * Increase the size of the unit bitmap as necessary. */ -static __inline__ int +static __inline int ng_eiface_get_unit(int *unit) { int index, bit; @@ -163,7 +163,7 @@ ng_eiface_get_unit(int *unit) /* * Free a no longer needed unit number. */ -static __inline__ void +static __inline void ng_eiface_free_unit(int unit) { int index, bit; diff --git a/sys/netgraph/ng_fec.c b/sys/netgraph/ng_fec.c index 5997162..3e451f7 100644 --- a/sys/netgraph/ng_fec.c +++ b/sys/netgraph/ng_fec.c @@ -261,7 +261,7 @@ static int ng_units_in_use = 0; * Find the first free unit number for a new interface. * Increase the size of the unit bitmap as necessary. */ -static __inline__ int +static __inline int ng_fec_get_unit(int *unit) { int index, bit; @@ -297,7 +297,7 @@ ng_fec_get_unit(int *unit) /* * Free a no longer needed unit number. */ -static __inline__ void +static __inline void ng_fec_free_unit(int unit) { int index, bit; diff --git a/sys/netgraph/ng_gif_demux.c b/sys/netgraph/ng_gif_demux.c index 3c4d309..b1fbaff 100644 --- a/sys/netgraph/ng_gif_demux.c +++ b/sys/netgraph/ng_gif_demux.c @@ -163,7 +163,7 @@ NETGRAPH_INIT(gif_demux, &ng_gif_demux_typestruct); /* * Get the family descriptor from the family ID */ -static __inline__ iffam_p +static __inline iffam_p get_iffam_from_af(sa_family_t family) { iffam_p iffam; @@ -180,7 +180,7 @@ get_iffam_from_af(sa_family_t family) /* * Get the family descriptor from the hook */ -static __inline__ iffam_p +static __inline iffam_p get_iffam_from_hook(priv_p priv, hook_p hook) { int k; @@ -195,7 +195,7 @@ get_iffam_from_hook(priv_p priv, hook_p hook) * Get the hook from the iffam descriptor */ -static __inline__ hook_p * +static __inline hook_p * get_hook_from_iffam(priv_p priv, iffam_p iffam) { return (&priv->hooks[iffam - gFamilies]); @@ -204,7 +204,7 @@ get_hook_from_iffam(priv_p priv, iffam_p iffam) /* * Get the iffam descriptor from the name */ -static __inline__ iffam_p +static __inline iffam_p get_iffam_from_name(const char *name) { iffam_p iffam; diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c index c200191..899bf22 100644 --- a/sys/netgraph/ng_iface.c +++ b/sys/netgraph/ng_iface.c @@ -225,7 +225,7 @@ static int ng_units_in_use = 0; /* * Get the family descriptor from the family ID */ -static __inline__ iffam_p +static __inline iffam_p get_iffam_from_af(sa_family_t family) { iffam_p iffam; @@ -242,7 +242,7 @@ get_iffam_from_af(sa_family_t family) /* * Get the family descriptor from the hook */ -static __inline__ iffam_p +static __inline iffam_p get_iffam_from_hook(priv_p priv, hook_p hook) { int k; @@ -257,7 +257,7 @@ get_iffam_from_hook(priv_p priv, hook_p hook) * Get the hook from the iffam descriptor */ -static __inline__ hook_p * +static __inline hook_p * get_hook_from_iffam(priv_p priv, iffam_p iffam) { return (&priv->hooks[iffam - gFamilies]); @@ -266,7 +266,7 @@ get_hook_from_iffam(priv_p priv, iffam_p iffam) /* * Get the iffam descriptor from the name */ -static __inline__ iffam_p +static __inline iffam_p get_iffam_from_name(const char *name) { iffam_p iffam; @@ -284,7 +284,7 @@ get_iffam_from_name(const char *name) * Find the first free unit number for a new interface. * Increase the size of the unit bitmap as necessary. */ -static __inline__ int +static __inline int ng_iface_get_unit(int *unit) { int index, bit; @@ -320,7 +320,7 @@ ng_iface_get_unit(int *unit) /* * Free a no longer needed unit number. */ -static __inline__ void +static __inline void ng_iface_free_unit(int unit) { int index, bit; diff --git a/sys/netgraph/ng_sppp.c b/sys/netgraph/ng_sppp.c index 3f3c97f..22fcbd7 100644 --- a/sys/netgraph/ng_sppp.c +++ b/sys/netgraph/ng_sppp.c @@ -116,7 +116,7 @@ static unsigned char ng_units_in_use = 0; * Find the first free unit number for a new interface. * Increase the size of the unit bitmap as necessary. */ -static __inline__ int +static __inline int ng_sppp_get_unit (int *unit) { int index, bit; @@ -156,7 +156,7 @@ ng_sppp_get_unit (int *unit) /* * Free a no longer needed unit number. */ -static __inline__ void +static __inline void ng_sppp_free_unit (int unit) { int index, bit; |