mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-26 01:59:57 +00:00
Merge 25cc9a3796 into a8192aa709
This commit is contained in:
commit
cbdd2096f3
5 changed files with 6 additions and 6 deletions
|
|
@ -23,6 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
#include "dix/registry_priv.h"
|
||||
#include "dix/request_priv.h"
|
||||
#include "dix/resource_priv.h"
|
||||
|
||||
#include "xselinuxint.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -54,10 +54,10 @@ from The Open Group.
|
|||
#include <stddef.h>
|
||||
|
||||
#include "dix/colormap_priv.h"
|
||||
#include "dix/resource_priv.h"
|
||||
#include "dix/screenint_priv.h"
|
||||
|
||||
#include "windowstr.h"
|
||||
#include "resource.h"
|
||||
#include "privates.h"
|
||||
#include "gcstruct.h"
|
||||
#include "cursorstr.h"
|
||||
|
|
|
|||
|
|
@ -25,8 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include <X11/Xproto.h>
|
||||
|
||||
#include "dix/registry_priv.h"
|
||||
|
||||
#include "resource.h"
|
||||
#include "dix/resource_priv.h"
|
||||
|
||||
#define BASE_SIZE 16
|
||||
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@
|
|||
#include "include/dix.h"
|
||||
#include "include/resource.h"
|
||||
|
||||
extern RESTYPE lastResourceType;
|
||||
extern RESTYPE TypeMask;
|
||||
|
||||
#define SameClient(obj,client) \
|
||||
(CLIENT_BITS((obj)->resource) == (client)->clientAsMask)
|
||||
|
||||
|
|
|
|||
|
|
@ -230,9 +230,6 @@ extern _X_EXPORT int dixLookupResourceByClass(void **result,
|
|||
ClientPtr client,
|
||||
Mask access_mode);
|
||||
|
||||
extern _X_EXPORT RESTYPE lastResourceType;
|
||||
extern _X_EXPORT RESTYPE TypeMask;
|
||||
|
||||
/*
|
||||
* @brief allocate a XID (resource ID) for the server itself
|
||||
*
|
||||
|
|
|
|||
Loading…
Reference in a new issue