Fix build on FreeBSD 11 and later.

Reported by:	KIRIYAMA Kazuhiko <kiri [...] kx.openedu.org>
Tested by:	Kurt Jaeger <lists [...] opsec.eu>,
		"Herbert J. Skuhra" <herbert [...] mailbox.org>
This commit is contained in:
Hajimu UMEMOTO 2016-07-21 17:47:02 +00:00
parent 4f82a541d4
commit 97a72db9ee
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=418883
2 changed files with 33 additions and 0 deletions

View File

@ -0,0 +1,22 @@
--- ccan/list/list.h.orig 2015-09-06 07:10:54 UTC
+++ ccan/list/list.h
@@ -57,7 +57,7 @@ struct list_head
* Example:
* static struct list_head my_list = LIST_HEAD_INIT(my_list);
*/
-#define LIST_HEAD_INIT(name) { { &name.n, &name.n } }
+#define CCAN_LIST_HEAD_INIT(name) { { &name.n, &name.n } }
/**
* LIST_HEAD - define and initialize an empty list_head
@@ -72,8 +72,8 @@ struct list_head
* Example:
* static LIST_HEAD(my_global_list);
*/
-#define LIST_HEAD(name) \
- struct list_head name = LIST_HEAD_INIT(name)
+#define CCAN_LIST_HEAD(name) \
+ struct list_head name = CCAN_LIST_HEAD_INIT(name)
/**
* list_head_init - initialize a list_head

View File

@ -0,0 +1,11 @@
--- thread_pthread.c.orig 2016-04-15 16:07:07 UTC
+++ thread_pthread.c
@@ -1154,7 +1154,7 @@ native_sleep(rb_thread_t *th, struct tim
}
#ifdef USE_UBF_LIST
-static LIST_HEAD(ubf_list_head);
+static CCAN_LIST_HEAD(ubf_list_head);
/* The thread 'th' is registered to be trying unblock. */
static void