summaryrefslogtreecommitdiff
path: root/include/servermd.h
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2007-06-18 16:51:13 -0700
committerIan Romanick <idr@us.ibm.com>2007-06-18 16:51:13 -0700
commitab7a6d860d4a275a810a64b1ba7b13726ed10575 (patch)
tree1198628dab08c3989dff073b4bbe6920a1feca59 /include/servermd.h
parente9130b8bac73a0843d5ff6b2216eccfb3e094a48 (diff)
parent2e7fef7d0837939e822c40b6ac77e7f0e66d57bd (diff)
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts: hw/xfree86/os-support/bus/Pci.c hw/xfree86/os-support/bus/linuxPci.c
Diffstat (limited to 'include/servermd.h')
-rw-r--r--include/servermd.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/servermd.h b/include/servermd.h
index e6ca11ed2..4f32a9d2b 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -515,7 +515,15 @@ SOFTWARE.
#define GLYPHPADBYTES 4
#define GETLEFTBITS_ALIGNMENT 1
#endif
-
+
+/* linux on IBM S/390 */
+#if defined (linux) && defined (__s390__)
+#define IMAGE_BYTE_ORDER MSBFirst
+#define BITMAP_BIT_ORDER MSBFirst
+#define GLYPHPADBYTES 4
+#define GETLEFTBITS_ALIGNMENT 1
+#endif /* linux/s390 */
+
/* size of buffer to use with GetImage, measured in bytes. There's obviously
* a trade-off between the amount of stack (or whatever ALLOCATE_LOCAL gives
* you) used and the number of times the ddx routine has to be called.