summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan dot coopersmith at sun dot com>2005-09-20 16:53:34 +0000
committerAlan Coopersmith <alan dot coopersmith at sun dot com>2005-09-20 16:53:34 +0000
commit82fdd1720ecb78a47aa13963e332ee7fec6cfb2e (patch)
treeba7cc34ef1f0d031895cc57327b97b91296e456c
parent3cbaaa8286f37d7d245b8ddd019cd0377d6d7739 (diff)
Only include radeon_dri.h & radeon_sarea.h if XF86DRI is defined.
Include "compiler.h" to define __inline__ on non-gcc compilers
-rw-r--r--src/radeon.h1
-rw-r--r--src/radeon_exa.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/src/radeon.h b/src/radeon.h
index 46ea694..c820d9e 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -39,6 +39,7 @@
#define _RADEON_H_
#include "xf86str.h"
+#include "compiler.h"
/* PCI support */
#include "xf86Pci.h"
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index 10949cf..e5a9f21 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -35,11 +35,15 @@
#include "radeon.h"
#include "radeon_reg.h"
+#ifdef XF86DRI
#include "radeon_dri.h"
+#endif
#include "radeon_macros.h"
#include "radeon_probe.h"
#include "radeon_version.h"
+#ifdef XF86DRI
#include "radeon_sarea.h"
+#endif
#include "xf86.h"