diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-08-28 07:25:21 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-08-28 07:25:21 -0400 |
| commit | 85547073265ae9bc4ae3af920a6d3214fd1ca0c5 (patch) | |
| tree | 2e720a9d55fe3cf65e735c8ce66866fb8c749d18 /include | |
| parent | 860a09cfb8afc0a293c7eb5e01762724eb86847a (diff) | |
| parent | 7d54399cfdaa7f54e28828267a76b89c4e8e798f (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
include/miscstruct.h
mi/mibstore.c
mi/midispcur.c
os/Makefile.am
Diffstat (limited to 'include')
| -rw-r--r-- | include/bstorestr.h | 2 | ||||
| -rw-r--r-- | include/dix-config.h.in | 3 | ||||
| -rw-r--r-- | include/miscstruct.h | 2 | ||||
| -rw-r--r-- | include/xorg-server.h.in | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/include/bstorestr.h b/include/bstorestr.h index 14e2fe1da..cf7820ba4 100644 --- a/include/bstorestr.h +++ b/include/bstorestr.h @@ -45,13 +45,11 @@ typedef PixmapPtr (* BackingStoreGetImagePixmapProcPtr)(void); typedef PixmapPtr (* BackingStoreGetSpansPixmapProcPtr)(void); typedef struct _BSFuncs { - BackingStoreSaveAreasProcPtr SaveAreas; BackingStoreRestoreAreasProcPtr RestoreAreas; BackingStoreSetClipmaskRgnProcPtr SetClipmaskRgn; BackingStoreGetImagePixmapProcPtr GetImagePixmap; BackingStoreGetSpansPixmapProcPtr GetSpansPixmap; - } BSFuncRec, *BSFuncPtr; #endif /* _BSTORESTR_H_ */ diff --git a/include/dix-config.h.in b/include/dix-config.h.in index bea713122..01142a59d 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -282,6 +282,9 @@ /* Support MIT-SCREEN-SAVER extension */ #undef SCREENSAVER +/* Support Secure RPC ("SUN-DES-1") authentication for X11 clients */ +#undef SECURE_RPC + /* Use a lock to prevent multiple servers on a display */ #undef SERVER_LOCK diff --git a/include/miscstruct.h b/include/miscstruct.h index 81f699ad1..409b102c0 100644 --- a/include/miscstruct.h +++ b/include/miscstruct.h @@ -50,7 +50,7 @@ SOFTWARE. #include "misc.h" #include <X11/Xprotostr.h> -#include <pixman/pixman.h> +#include <pixman.h> typedef xPoint DDXPointRec; diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in index 3c2ff470c..c117dfa33 100644 --- a/include/xorg-server.h.in +++ b/include/xorg-server.h.in @@ -251,4 +251,7 @@ /* Loadable XFree86 server awesomeness */ #undef XFree86LOADER +/* Use libpciaccess */ +#undef XSERVER_LIBPCIACCESS + #endif /* _XORG_SERVER_H_ */ |