Petr Sumbera : server: Workaround for conflict between Wine and Solaris list.h.
Alexandre Julliard
julliard at winehq.org
Fri Apr 11 06:28:02 CDT 2008
Module: wine
Branch: master
Commit: f4575aaa5f0f179a9021a160f865091ceb8ab1ea
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4575aaa5f0f179a9021a160f865091ceb8ab1ea
Author: Petr Sumbera <petr.sumbera at sun.com>
Date: Thu Apr 10 17:03:18 2008 +0200
server: Workaround for conflict between Wine and Solaris list.h.
---
server/fd.c | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/server/fd.c b/server/fd.c
index 41e404c..0d33e77 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -44,7 +44,25 @@
#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.
+ */
+#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_PARAM_H
#include <sys/param.h>
More information about the wine-cvs
mailing list