Signed-off-by: Alan Coopersmith <[email protected]> --- Xext/shm.c | 6 ++++++ hw/xfree86/os-support/xf86_OSlib.h | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Xext/shm.c b/Xext/shm.c index 9c8beb2..b2c86a5 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -58,6 +58,12 @@ in this Software without prior written authorization from The Open Group. /* Needed for Solaris cross-zone shared memory extension */ #ifdef HAVE_SHMCTL64 + +/* Workaround conflicts between Solaris <sys/list.h> & Xorg "list.h" */ +#define _SYS_LIST_H +typedef struct list_node list_node_t; +typedef struct list list_t; + #include <sys/ipc_impl.h> #define SHMSTAT(id, buf) shmctl64(id, IPC_STAT64, buf) #define SHMSTAT_TYPE struct shmid_ds64 diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index 1d59060..7010864 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -98,8 +98,8 @@ # if !(defined (sun) && defined (SVR4)) # include <sys/immu.h> # include <sys/region.h> +# include <sys/proc.h> # endif -# include <sys/proc.h> # include <sys/tss.h> # include <sys/sysi86.h> # if defined(SVR4) && !defined(sun) -- 1.7.3.2 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
