[pkgsrc/trunk]: pkgsrc/net/bird Restore inline support to working state.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a2c53cf2912f
branches:  trunk
changeset: 646144:a2c53cf2912f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Feb 04 20:50:50 2015 +0000

description:
Restore inline support to working state.

diffstat:

 net/bird/distinfo                  |   4 +-
 net/bird/patches/patch-lib_lists.h |  46 +++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diffs (76 lines):

diff -r c4d5eaa59ef6 -r a2c53cf2912f net/bird/distinfo
--- a/net/bird/distinfo Wed Feb 04 20:50:16 2015 +0000
+++ b/net/bird/distinfo Wed Feb 04 20:50:50 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2015/02/03 13:58:32 mef Exp $
+$NetBSD: distinfo,v 1.8 2015/02/04 20:50:50 joerg Exp $
 
 SHA1 (bird-1.4.5.tar.gz) = 9ef3200fa9cae4e545afe55eb4a017d1fd298c7a
 RMD160 (bird-1.4.5.tar.gz) = 4b45aaac768542e2eec9451a6be4dab4b338e7cb
 Size (bird-1.4.5.tar.gz) = 1284666 bytes
 SHA1 (patch-configure) = b22044e5be530867a05406d4b32d789933993d53
-SHA1 (patch-lib_lists.h) = 1ce09f2483dc74c8c26a57c2fd959f7ffb7ff216
+SHA1 (patch-lib_lists.h) = 69cdca1c8095f21e6ccf3ede0d00fda8f9fd0a9b
 SHA1 (patch-tools_Makefile.in) = 4a6ad298abbe8c42627528c9156ce581a6e07917
diff -r c4d5eaa59ef6 -r a2c53cf2912f net/bird/patches/patch-lib_lists.h
--- a/net/bird/patches/patch-lib_lists.h        Wed Feb 04 20:50:16 2015 +0000
+++ b/net/bird/patches/patch-lib_lists.h        Wed Feb 04 20:50:50 2015 +0000
@@ -1,34 +1,36 @@
-$NetBSD: patch-lib_lists.h,v 1.2 2015/02/03 13:58:32 mef Exp $
+$NetBSD: patch-lib_lists.h,v 1.3 2015/02/04 20:50:50 joerg Exp $
 
 date: 2012-06-29 21:37:45 +0900;  author: joerg;  state: Exp;
 Fix inline usage.
 
 --- lib/lists.h.orig   2014-04-01 18:24:10.000000000 +0900
 +++ lib/lists.h        2015-02-03 22:46:25.000000000 +0900
-@@ -50,13 +50,6 @@ typedef struct list {                       /* In fact two o
+@@ -50,6 +50,14 @@ typedef struct list {                       /* In fact two o
  
  #define EMPTY_LIST(list) (!(list).head->next)
  
--void add_tail(list *, node *);
--void add_head(list *, node *);
--void rem_node(node *);
--void rem2_node(node *);
--void add_tail_list(list *, list *);
--void init_list(list *);
--void insert_node(node *, node *);
- 
- #ifndef _BIRD_LISTS_C_
- #define LIST_INLINE extern inline
-@@ -66,4 +59,12 @@ void insert_node(node *, node *);
- #define LIST_INLINE
++
++#ifndef _BIRD_LISTS_C_
++#define LIST_INLINE static inline
++#include "lib/lists.c"
++#undef LIST_INLINE
++#else
++#define LIST_INLINE
++
+ void add_tail(list *, node *);
+ void add_head(list *, node *);
+ void rem_node(node *);
+@@ -57,13 +64,6 @@ void rem2_node(node *);
+ void add_tail_list(list *, list *);
+ void init_list(list *);
+ void insert_node(node *, node *);
+-
+-#ifndef _BIRD_LISTS_C_
+-#define LIST_INLINE extern inline
+-#include "lib/lists.c"
+-#undef LIST_INLINE
+-#else
+-#define LIST_INLINE
  #endif
  
-+void add_tail(list *, node *);
-+void add_head(list *, node *);
-+void rem_node(node *);
-+void rem2_node(node *);
-+void add_tail_list(list *, list *);
-+void init_list(list *);
-+void insert_node(node *, node *);
-+
  #endif