From 7da3f4a786d9b61f4129c7dbbef80c84abbfde68 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Thu, 7 Jul 2005 03:12:40 +0000
Subject: [PATCH] Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901>
 Fix warnings     about redefined macros (Peter Breitenlohner)

---
 hw/xfree86/utils/xorgcfg/loader.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/xfree86/utils/xorgcfg/loader.h b/hw/xfree86/utils/xorgcfg/loader.h
index 5066b753d..8e4da34c3 100644
--- a/hw/xfree86/utils/xorgcfg/loader.h
+++ b/hw/xfree86/utils/xorgcfg/loader.h
@@ -36,7 +36,9 @@
 
 #else
 
+#ifndef XFree86LOADER
 #define XFree86LOADER		/* not really */
+#endif
 #define IN_LOADER
 
 #include "xf86.h"
@@ -44,7 +46,9 @@
 #include "xf86Opt.h"
 #include "xf86Module.h"
 
+#ifndef XINPUT
 #define XINPUT
+#endif
 #include "xf86Xinput.h"
 
 #include <X11/fonts/fontmod.h>