From dcfb97204b021738c0ee9f1f8f40243dfa0b2ce0 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Fri, 22 Apr 2005 22:04:37 +0000
Subject: [PATCH] Work around clash between Solaris headers and module loader
 headers over     definition of FILE.

---
 hw/xfree86/os-support/xf86_libc.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/xfree86/os-support/xf86_libc.h b/hw/xfree86/os-support/xf86_libc.h
index eda777566..eb3a1dfda 100644
--- a/hw/xfree86/os-support/xf86_libc.h
+++ b/hw/xfree86/os-support/xf86_libc.h
@@ -707,6 +707,10 @@ typedef int xf86jmp_buf[1024];
 #undef FILENAME_MAX
 #define FILENAME_MAX		1024
 
+#if (defined(sun) && defined(__SVR4)) 
+# define _FILEDEFED /* Already have FILE defined, don't redefine it */
+#endif
+
 #endif /* XFree86LOADER  && !DONT_DEFINE_WRAPPERS */
 
 #if defined(XFree86LOADER) && \