compile_fix.patch

From ddc792037977606a4901d72513e689bfb4990107 Mon Sep 17 00:00:00 2001
From: Max Schwarz <Max@x-quadraht.de>
Date: Sat, 24 Sep 2011 18:54:44 +0200
Subject: [PATCH] compile fix: guard XF86OptionPtr typedef

Signed-off-by: Max Schwarz <Max@x-quadraht.de>
---
 hw/xfree86/common/xf86Opt.h         |    3 +++
 hw/xfree86/os-support/xf86_OSproc.h |    3 +++
 hw/xfree86/parser/xf86Optrec.h      |    3 +++
 3 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/hw/xfree86/common/xf86Opt.h b/hw/xfree86/common/xf86Opt.h
index 68ce166..a423379 100644
--- a/hw/xfree86/common/xf86Opt.h
+++ b/hw/xfree86/common/xf86Opt.h
@@ -69,7 +69,10 @@ typedef struct {
     Bool                found;
 } OptionInfoRec, *OptionInfoPtr;

+#ifndef DEFINED_XF86OPTIONPTR
 typedef struct _XF86OptionRec *XF86OptionPtr;
+#define DEFINED_XF86OPTIONPTR
+#endif

 extern _X_EXPORT int xf86SetIntOption(XF86OptionPtr optlist, const char *name, int deflt);
 extern _X_EXPORT double xf86SetRealOption(XF86OptionPtr optlist, const char *name, double deflt);
diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index fb64a34..6a98d40 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -129,7 +129,10 @@

 _XFUNCPROTOBEGIN

+#ifndef DEFINED_XF86OPTIONPTR
 typedef struct _XF86OptionRec *XF86OptionPtr;
+#define DEFINED_XF86OPTIONPTR
+#endif

 /* public functions */
 extern _X_EXPORT Bool xf86LinearVidMem(void);
diff --git a/hw/xfree86/parser/xf86Optrec.h b/hw/xfree86/parser/xf86Optrec.h
index 70bd744..18234ce 100644
--- a/hw/xfree86/parser/xf86Optrec.h
+++ b/hw/xfree86/parser/xf86Optrec.h
@@ -91,7 +91,10 @@ typedef struct _XF86OptionRec
 }
 XF86OptionRec;

+#ifndef DEFINED_XF86OPTIONPTR
 typedef struct _XF86OptionRec *XF86OptionPtr;
+#define DEFINED_XF86OPTIONPTR
+#endif

 extern _X_EXPORT XF86OptionPtr xf86addNewOption(XF86OptionPtr head, char *name, char *val);
 extern _X_EXPORT XF86OptionPtr xf86optionListDup(XF86OptionPtr opt);
--
1.7.4.1