From: Francois Gouget <fgouget@free.fr>
Subject: ntdll: Work around a conflict between Wine and Solaris list.h.
Message-Id: <alpine.DEB.2.20.1510041630460.7922@amboise>
Date: Sun, 4 Oct 2015 16:32:17 +0200 (CEST)

Signed-off-by: Francois Gouget <fgouget@free.fr>
---

This is the same issue and same workaround as in commit f4575aaa.
Fortunately only 3 files are impacted.

 dlls/ntdll/directory.c | 18 ++++++++++++++++++
 dlls/ntdll/file.c      | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
index f589621..aa59f65 100644
--- a/dlls/ntdll/directory.c
+++ b/dlls/ntdll/directory.c
@@ -48,7 +48,25 @@
 #include <sys/attr.h>
 #endif
 #ifdef HAVE_SYS_VNODE_H
+/*
+ * Solaris defines its system list in sys/list.h.
+ * This need to be workaround it here.
+ */
+#define list SYSLIST
+#define list_next SYSLIST_NEXT
+#define list_prev SYSLIST_PREV
+#define list_head SYSLIST_HEAD
+#define list_tail SYSLIST_TAIL
+#define list_move_tail SYSLIST_MOVE_TAIL
+#define list_remove SYSLIST_REMOVE
 #include <sys/vnode.h>
+#undef list
+#undef list_next
+#undef list_prev
+#undef list_head
+#undef list_tail
+#undef list_move_tail
+#undef list_remove
 #endif
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index be6b591..1b65d04 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -61,7 +61,25 @@
 # include <utime.h>
 #endif
 #ifdef HAVE_SYS_VFS_H
+/*
+ * Solaris defines its system list in sys/list.h.
+ * This need to be workaround it here.
+ */
+#define list SYSLIST
+#define list_next SYSLIST_NEXT
+#define list_prev SYSLIST_PREV
+#define list_head SYSLIST_HEAD
+#define list_tail SYSLIST_TAIL
+#define list_move_tail SYSLIST_MOVE_TAIL
+#define list_remove SYSLIST_REMOVE
 # include <sys/vfs.h>
+#undef list
+#undef list_next
+#undef list_prev
+#undef list_head
+#undef list_tail
+#undef list_move_tail
+#undef list_remove
 #endif
 #ifdef HAVE_SYS_MOUNT_H
 # include <sys/mount.h>

-- 
2.5.3