Francois Gouget : ntdll: Work around a conflict between Wine and Solaris list.h.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 67c2e06fcd7b49d21a61d9e17aa7e01a0503621b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=67c2e06fcd7b49d21a61d9e17aa7e01a0503621b

Author: Francois Gouget <fgouget at free.fr>
Date:   Mon Oct  5 10:01:56 2015 +0200

ntdll: Work around a conflict between Wine and Solaris list.h.

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

---

 dlls/ntdll/directory.c | 15 +++++++++++++++
 dlls/ntdll/file.c      | 15 +++++++++++++++
 server/fd.c            |  5 +----
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
index f589621..4faafe9 100644
--- a/dlls/ntdll/directory.c
+++ b/dlls/ntdll/directory.c
@@ -48,7 +48,22 @@
 #include <sys/attr.h>
 #endif
 #ifdef HAVE_SYS_VNODE_H
+/* Work around a conflict with Solaris' system list defined in sys/list.h. */
+#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..8f89ba5 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -61,7 +61,22 @@
 # include <utime.h>
 #endif
 #ifdef HAVE_SYS_VFS_H
+/* Work around a conflict with Solaris' system list defined in sys/list.h. */
+#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>
diff --git a/server/fd.c b/server/fd.c
index 6c78a0a..fe778f1 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -44,10 +44,7 @@
 #include <sys/statvfs.h>
 #endif
 #ifdef HAVE_SYS_VFS_H
-/*
- * Solaris defines its system list in sys/list.h.
- * This need to be workaround it here.
- */
+/* Work around a conflict with Solaris' system list defined in sys/list.h. */
 #define list SYSLIST
 #define list_next SYSLIST_NEXT
 #define list_prev SYSLIST_PREV