Fix inline usage.

2 files changed, 69 insertions, 1 deletions

diff --git a/chat/ircd-hybrid/distinfo b/chat/ircd-hybrid/distinfo
index 99c283d4fdf..7b9bc0783b0 100644
--- a/chat/ircd-hybrid/distinfo
+++ b/chat/ircd-hybrid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2011/08/29 01:24:02 dholland Exp $
+$NetBSD: distinfo,v 1.14 2012/12/20 22:01:22 joerg Exp $
 
 SHA1 (ircd-hybrid-7.2.3.tgz) = f8a61e5500d28a4b4cded5f096c3627c2e5f01a0
 RMD160 (ircd-hybrid-7.2.3.tgz) = 58bec65da2492480b9a4e86777c6c19a4b568408
@@ -13,5 +13,6 @@ SHA1 (patch-ag) = 34e4e1d6af0398f893916b8daef666103cb4d005
 SHA1 (patch-ah) = 398bff5e39ce04eccd959b612c84282c26e02224
 SHA1 (patch-ai) = 85e2f0650e22d8b948f65f66c6f35a9465f07b53
 SHA1 (patch-include_memory_h) = dbfa0d3987716e70464054d4f67facd42f3b1973
+SHA1 (patch-include_tools.h) = 1381a32a05095d9e40fcc929db5fa8f2fb7e048d
 SHA1 (patch-servlink_makefile_in) = d8f3b2d5877b0851a9e10fb1ebb201f9cfcfb162
 SHA1 (patch-src_makefile_in) = d92326eb9bcc9db84add691561a2319881e118b3
diff --git a/chat/ircd-hybrid/patches/patch-include_tools.h b/chat/ircd-hybrid/patches/patch-include_tools.h
new file mode 100644
index 00000000000..8a1daf48401
--- /dev/null
+++ b/chat/ircd-hybrid/patches/patch-include_tools.h
@@ -0,0 +1,67 @@
+$NetBSD: patch-include_tools.h,v 1.1 2012/12/20 22:01:22 joerg Exp $
+
+--- include/tools.h.orig	2007-02-28 04:17:43.000000000 +0000
++++ include/tools.h
+@@ -98,7 +98,7 @@ void mem_frob(void *data, int len);
+  * which is mine.
+  *   -- adrian
+  */
+-extern inline void
++extern inline __attribute__((__gnu_inline__)) void
+ dlinkAdd(void *data, dlink_node * m, dlink_list * list)
+ {
+  m->data = data;
+@@ -113,7 +113,7 @@ dlinkAdd(void *data, dlink_node * m, dli
+  list->length++;
+ }
+ 
+-extern inline void
++extern inline __attribute__((__gnu_inline__))  void
+ dlinkAddBefore(dlink_node *b, void *data, dlink_node *m, dlink_list *list)
+ {
+     /* Shortcut - if its the first one, call dlinkAdd only */
+@@ -129,7 +129,7 @@ dlinkAddBefore(dlink_node *b, void *data
+     }
+ }
+ 
+-extern inline void
++extern inline __attribute__((__gnu_inline__))  void
+ dlinkAddTail(void *data, dlink_node *m, dlink_list *list)
+ {
+  m->data = data;
+@@ -147,7 +147,7 @@ dlinkAddTail(void *data, dlink_node *m, 
+ /* Execution profiles show that this function is called the most
+  * often of all non-spontaneous functions. So it had better be
+  * efficient. */
+-extern inline void
++extern inline __attribute__((__gnu_inline__))  void
+ dlinkDelete(dlink_node *m, dlink_list *list)
+ {
+  /* Assumption: If m->next == NULL, then list->tail == m
+@@ -177,7 +177,7 @@ dlinkDelete(dlink_node *m, dlink_list *l
+  * output	- pointer to link or NULL if not found
+  * side effects	- Look for ptr in the linked listed pointed to by link.
+  */
+-extern inline dlink_node *
++extern inline __attribute__((__gnu_inline__))  dlink_node *
+ dlinkFind(dlink_list *list, void *data)
+ {
+   dlink_node *ptr;
+@@ -191,7 +191,7 @@ dlinkFind(dlink_list *list, void *data)
+   return(NULL);
+ }
+ 
+-extern inline void
++extern inline __attribute__((__gnu_inline__))  void
+ dlinkMoveList(dlink_list *from, dlink_list *to)
+ {
+   /* There are three cases */
+@@ -226,7 +226,7 @@ dlinkMoveList(dlink_list *from, dlink_li
+   /* I think I got that right */
+ }
+ 
+-extern inline dlink_node *
++extern inline __attribute__((__gnu_inline__))  dlink_node *
+ dlinkFindDelete(dlink_list *list, void *data)
+ {
+   dlink_node *m;