mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-22 20:35:43 +00:00
Merge branch 'master' into XACE-SELINUX
Conflicts: dix/dixutils.c
This commit is contained in:
commit
e2a720c9a1
72 changed files with 1893 additions and 6318 deletions
|
|
@ -207,10 +207,6 @@ extern int (* ProcVector[256]) (ClientPtr /*client*/);
|
|||
|
||||
extern int (* SwappedProcVector[256]) (ClientPtr /*client*/);
|
||||
|
||||
#ifdef K5AUTH
|
||||
extern int (*k5_Vector[256])(ClientPtr /*client*/);
|
||||
#endif
|
||||
|
||||
extern ReplySwapPtr ReplySwapVector[256];
|
||||
|
||||
extern int ProcBadRequest(ClientPtr /*client*/);
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
Loading…
Reference in a new issue