diff options
author | harti <harti@FreeBSD.org> | 2007-07-11 14:41:54 +0000 |
---|---|---|
committer | harti <harti@FreeBSD.org> | 2007-07-11 14:41:54 +0000 |
commit | 5d37f9d01f2b382e79cd88c5cee5f136c377f8dd (patch) | |
tree | 121e44da5ad53769f070e0fa4d4eb7575c9cfc3e /sys/contrib | |
parent | 64a08be33ad85f3c5d51d97ec56531248ccdd166 (diff) | |
download | FreeBSD-src-5d37f9d01f2b382e79cd88c5cee5f136c377f8dd.zip FreeBSD-src-5d37f9d01f2b382e79cd88c5cee5f136c377f8dd.tar.gz |
Vendor patch to remove some __inline qualifiers on non-static functions
because they seem to cause warnings in gcc-4.2.
Submitted by: mjacob
Approved by: re
Diffstat (limited to 'sys/contrib')
-rw-r--r-- | sys/contrib/ngatm/netnatm/api/cc_conn.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/contrib/ngatm/netnatm/api/cc_conn.c b/sys/contrib/ngatm/netnatm/api/cc_conn.c index a8e1b38..c57bc1a 100644 --- a/sys/contrib/ngatm/netnatm/api/cc_conn.c +++ b/sys/contrib/ngatm/netnatm/api/cc_conn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003-2004 + * Copyright (c) 2003-2007 * Hartmut Brandt * All rights reserved. * @@ -31,7 +31,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Begemot: libunimsg/netnatm/api/cc_conn.c,v 1.2 2004/07/16 18:45:11 brandt Exp $ + * $Id: cc_conn.c 1291 2007-07-10 10:35:38Z brandt_h $ * * ATM API as defined per af-saa-0108 * @@ -66,7 +66,7 @@ cc_conn_state2str(u_int s) return (stab[s]); } -__inline void +void cc_conn_set_state(struct ccconn *conn, enum conn_state ns) { if (conn->state != ns) { @@ -85,7 +85,7 @@ cc_party_state2str(u_int s) return (ptab[s]); } -__inline void +void cc_party_set_state(struct ccparty *party, enum party_state ns) { @@ -100,7 +100,7 @@ cc_party_set_state(struct ccparty *party, enum party_state ns) /* * Remove connection from its user's queue */ -__inline void +void cc_disconnect_from_user(struct ccconn *conn) { @@ -116,7 +116,7 @@ cc_disconnect_from_user(struct ccconn *conn) /* * Put connection on user queue */ -__inline void +void cc_connect_to_user(struct ccconn *conn, struct ccuser *user) { @@ -292,7 +292,7 @@ cc_conn_flush_cookies(struct ccconn *conn) } } -__inline void +void cc_conn_reset_acceptor(struct ccconn *conn) { if (conn->acceptor != NULL) { |