summaryrefslogtreecommitdiff
path: root/hw/xfree86/fbdevhw
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-05-06 17:31:17 +0000
committerEgbert Eich <eich@suse.de>2004-05-06 17:31:17 +0000
commit75d96afcc4a1f201da665bd73b7067e8e7139a3f (patch)
tree1793eafe5a7445d21ad580227942e8d13a2f7209 /hw/xfree86/fbdevhw
parent7124cfaa006e840ba48dcc466c0dc8b34503a686 (diff)
BugZilla #601: Fixing makedepend choking on floating point exception
because CHAR_BIT is defined to __CHAR_BIT__ which is a compiler intrinsic define. BugZilla #605: Fixing build on IA64 which is broken due to the inclusion of the kernel header asm/page.h. Kernel headers however don't work with -ansi. The inclusion of asm/page.h can however savely be removed as it there are plenty of other ways to determine the page size.
Diffstat (limited to 'hw/xfree86/fbdevhw')
-rw-r--r--hw/xfree86/fbdevhw/fbdevhw.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index bff0571ad..6a8aafea7 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -14,7 +14,12 @@
#include "fbdevhw.h"
#include "fbpriv.h"
-#include "asm/page.h" /* #define for PAGE_* */
+#if 0
+/* kernel header doesn't work with -ansi */
+# include "asm/page.h" /* #define for PAGE_* */
+#else
+# define PAGE_MASK (~(getpagesize() - 1))
+#endif
#include "globals.h"
#define DPMS_SERVER
@@ -22,6 +27,8 @@
#define DEBUG 0
+#define PAGE_MASK (~(getpagesize() - 1))
+
#if DEBUG
# define TRACE_ENTER(str) ErrorF("fbdevHW: " str " %d\n",pScrn->scrnIndex)
#else