From 31db02c17d89aa6a261b7a7167f4c26d98ae4954 Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Wed, 3 Jan 2018 23:13:28 +0100 Subject: [PATCH] X11 fixes --- external/mit/xorg/bin/xdm/Makefile.inc | 3 +++ external/mit/xorg/tools/xkbcomp/xkbcomp-stubs.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 external/mit/xorg/bin/xdm/Makefile.inc diff --git a/external/mit/xorg/bin/xdm/Makefile.inc b/external/mit/xorg/bin/xdm/Makefile.inc new file mode 100644 index 000000000..308d7b9c3 --- /dev/null +++ b/external/mit/xorg/bin/xdm/Makefile.inc @@ -0,0 +1,3 @@ +#__MINIX +.include "../Makefile.inc" + diff --git a/external/mit/xorg/tools/xkbcomp/xkbcomp-stubs.c b/external/mit/xorg/tools/xkbcomp/xkbcomp-stubs.c index 5691099ce..9124ad079 100644 --- a/external/mit/xorg/tools/xkbcomp/xkbcomp-stubs.c +++ b/external/mit/xorg/tools/xkbcomp/xkbcomp-stubs.c @@ -157,7 +157,7 @@ _XGetRequest(Display *dpy, CARD8 type, size_t len) return NULL; } -#if defined(__minix) && defined(XTHREADS) +#if defined(XTHREADS) /* defined(__minix) */ void (*_XCreateMutex_fn)(LockInfoPtr) = NULL; void (**_XFreeMutex_fn_p)(LockInfoPtr) = &_XFreeMutex_fn; @@ -181,4 +181,4 @@ void (*_XUnlockMutex_fn)( , int /* line */ #endif ) = NULL; -#endif /* defined(__minix) && defined(XTHREADS) */ +#endif /* defined(XTHREADS) && defined(__minix)*/