diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-06-21 16:23:31 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alanc@alf.(none)> | 2006-06-21 16:23:31 -0700 |
| commit | 90af38fa0c46c2081d2becac262a614c26ba6ef1 (patch) | |
| tree | c13dad117611a78caef93ef0d1d795976b4df8a7 /dix | |
| parent | 3e098efa35ba70ad4d5699af3130a3b02e1cb06e (diff) | |
| parent | 77c947b900faf34f425eef1549d8210c475e093b (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:
Xext/appgroup.c
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/dispatch.c | 2 | ||||
| -rw-r--r-- | dix/window.c | 2 | ||||
| -rw-r--r-- | dix/xpstubs.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/dix/dispatch.c b/dix/dispatch.c index 04347438d..a754a2f9e 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -111,7 +111,7 @@ int ProcInitialConnection(); #include "xace.h" #endif #ifdef XAPPGROUP -#include <X11/extensions/Xagsrv.h> +#include "appgroup.h" #endif #ifdef XKB #ifndef XKB_IN_SERVER diff --git a/dix/window.c b/dix/window.c index 45a80391f..d90e39be0 100644 --- a/dix/window.c +++ b/dix/window.c @@ -127,7 +127,7 @@ Equipment Corporation. #include "globals.h" #ifdef XAPPGROUP -#include <X11/extensions/Xagsrv.h> +#include "appgroup.h" #endif #ifdef XACE #include "xace.h" diff --git a/dix/xpstubs.c b/dix/xpstubs.c index 5135cc398..c06a524fa 100644 --- a/dix/xpstubs.c +++ b/dix/xpstubs.c @@ -35,6 +35,9 @@ from The Open Group. #include <X11/fonts/font.h> #ifdef XPRINT #include "DiPrint.h" +#else +extern Bool XpClientIsBitmapClient(ClientPtr client); +extern Bool XpClientIsPrintClient(ClientPtr client, FontPathElementPtr fpe); #endif Bool |