Don't redefine standard identifiers. Bump revision.

3 files changed, 73 insertions, 2 deletions

diff --git a/net/libupnp/Makefile b/net/libupnp/Makefile
index 73429df7541..eb056775847 100644
--- a/net/libupnp/Makefile
+++ b/net/libupnp/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2020/01/26 05:26:25 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2020/03/20 20:46:40 joerg Exp $
 
 DISTNAME=		libupnp-1.8.4
+PKGREVISION=		1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=pupnp/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/net/libupnp/distinfo b/net/libupnp/distinfo
index 2f9d6d9df81..08c87c60ba9 100644
--- a/net/libupnp/distinfo
+++ b/net/libupnp/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.23 2019/09/02 12:58:54 nia Exp $
+$NetBSD: distinfo,v 1.24 2020/03/20 20:46:40 joerg Exp $
 
 SHA1 (libupnp-1.8.4.tar.bz2) = 93e7b3c94cf53eb59533b4b7b137ef5cc651e28b
 RMD160 (libupnp-1.8.4.tar.bz2) = b31fe48c65c4730eaf4fd523de299ca7e5ac8218
 SHA512 (libupnp-1.8.4.tar.bz2) = 403d7b6408a33330fc59fbe6284cc7bca10a675c41b323bba6b9c6461c8a82fbb39f4a1a07d1a3b55f049c637830ebf21bd825cd6c2f4eb17265018ccee9cbb6
 Size (libupnp-1.8.4.tar.bz2) = 676576 bytes
 SHA1 (patch-aa) = b3d00b441b3c0ae9aa0769223a4eaf6baa71a71c
+SHA1 (patch-upnp_inc_list.h) = d721e9081e95e3aadc3a40eeb8a177595f06cb27
diff --git a/net/libupnp/patches/patch-upnp_inc_list.h b/net/libupnp/patches/patch-upnp_inc_list.h
new file mode 100644
index 00000000000..99cf3e5f3a1
--- /dev/null
+++ b/net/libupnp/patches/patch-upnp_inc_list.h
@@ -0,0 +1,69 @@
+$NetBSD: patch-upnp_inc_list.h,v 1.1 2020/03/20 20:46:40 joerg Exp $
+
+Stop messing with standard symbols.
+
+--- upnp/inc/list.h.orig	2020-03-20 19:21:31.152627060 +0000
++++ upnp/inc/list.h
+@@ -22,9 +22,6 @@
+ 
+ #include "UpnpGlobal.h" /* For UPNP_INLINE */
+ 
+-#define bool int
+-#define true !0
+-
+ #undef READ_ONCE
+ #define READ_ONCE(x) x
+ 
+@@ -79,21 +76,21 @@ static UPNP_INLINE void INIT_LIST_HEAD(s
+ }
+ 
+ #ifdef CONFIG_DEBUG_LIST
+-extern bool __list_add_valid(struct list_head *newent,
++extern int __list_add_valid(struct list_head *newent,
+ 			      struct list_head *prev,
+ 			      struct list_head *next);
+-extern bool __list_del_entry_valid(struct list_head *entry);
++extern int __list_del_entry_valid(struct list_head *entry);
+ #else
+-static UPNP_INLINE bool __list_add_valid(struct list_head *newent,
++static UPNP_INLINE int __list_add_valid(struct list_head *newent,
+ 				struct list_head *prev,
+ 				struct list_head *next)
+ {
+-	return true;
++	return !0;
+ 	newent++; prev++; next++; /* against compiler warnings */
+ }
+-static UPNP_INLINE bool __list_del_entry_valid(struct list_head *entry)
++static UPNP_INLINE int __list_del_entry_valid(struct list_head *entry)
+ {
+-	return true;
++	return !0;
+ 	entry++; /* against compiler warnings */
+ }
+ #endif
+@@ -754,7 +751,7 @@ static UPNP_INLINE void hlist_add_fake(s
+ 	n->pprev = &n->next;
+ }
+ 
+-static UPNP_INLINE bool hlist_fake(struct hlist_node *h)
++static UPNP_INLINE int hlist_fake(struct hlist_node *h)
+ {
+ 	return h->pprev == &h->next;
+ }
+@@ -763,7 +760,7 @@ static UPNP_INLINE bool hlist_fake(struc
+  * Check whether the node is the only node of the head without
+  * accessing head:
+  */
+-static UPNP_INLINE bool
++static UPNP_INLINE int
+ hlist_is_singular_node(struct hlist_node *n, struct hlist_head *h)
+ {
+ 	return !n->next && n->pprev == &h->first;
+@@ -838,6 +835,4 @@ static UPNP_INLINE void hlist_move_list(
+ 	     pos && ({ n = pos->member.next; 1; });			\
+ 	     pos = hlist_entry_safe(n, typeof(*pos), member))
+ 
+-#undef bool
+-#undef true
+ #endif