aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHartmut Brandt <harti@FreeBSD.org>2007-07-11 14:41:54 +0000
committerHartmut Brandt <harti@FreeBSD.org>2007-07-11 14:41:54 +0000
commite52e259e88a113f12460ed40723d552aaa1aaaf6 (patch)
tree94ee144baf55b2082dca8c632fc248750d257ccb
parent7ccfba936fa67d3ba8d8256d40800945ce9918c1 (diff)
downloadsrc-vendor/ngatm.tar.gz
src-vendor/ngatm.zip
Vendor patch to remove some __inline qualifiers on non-static functionsvendor/ngatm
because they seem to cause warnings in gcc-4.2. Submitted by: mjacob Approved by: re
Notes
Notes: svn path=/vendor-sys/ngatm/dist/; revision=171364
-rw-r--r--sys/contrib/ngatm/netnatm/api/cc_conn.c14
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 a8e1b3832cb7..c57bc1a2b234 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) {