diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-01-08 19:02:16 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-01-08 19:02:16 +0000 |
| commit | dd98ce78407c9eddd7adaad1d73d6910e6949b87 (patch) | |
| tree | 6a2a5570ce89b075c9344aa8fea32be2e2c9d22d | |
| parent | a99429b2bc6407ff2a094e6ee30ce2032f734966 (diff) | |
Bug #5523: Make radeon compile without USE_XAA. (Tilman Sauerbeck)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/radeon.h | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2006-01-08 Adam Jackson <ajax@freedesktop.org> + + * src/radeon.h: + Bug #5523: Make radeon compile without USE_XAA. (Tilman Sauerbeck) + 2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> * configure.ac: diff --git a/src/radeon.h b/src/radeon.h index 2c8b8ab4..57db4e93 100644 --- a/src/radeon.h +++ b/src/radeon.h @@ -41,6 +41,7 @@ #include "xf86str.h" #include "xf86_ansic.h" #include "compiler.h" +#include "xf86fbman.h" /* PCI support */ #include "xf86Pci.h" @@ -50,7 +51,6 @@ #endif #ifdef USE_XAA #include "xaa.h" -#include "xf86fbman.h" #endif /* Exa and Cursor Support */ @@ -399,14 +399,14 @@ typedef struct { #ifdef USE_EXA ExaDriverRec exa; -#endif -#ifdef USE_XAA - XAAInfoRecPtr accel; int engineMode; #define EXA_ENGINEMODE_UNKNOWN 0 #define EXA_ENGINEMODE_2D 1 #define EXA_ENGINEMODE_3D 2 #endif +#ifdef USE_XAA + XAAInfoRecPtr accel; +#endif Bool accelOn; xf86CursorInfoPtr cursor; #ifdef USE_EXA |