Skip to content

dix: unexport lastResourceType and TypeMask #1388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −6
Open

dix: unexport lastResourceType and TypeMask #1388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Xext/xselinux_label.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <selinux/label.h>

#include "dix/registry_priv.h"
#include "dix/resource_priv.h"

#include "xselinuxint.h"

Expand Down
2 changes: 1 addition & 1 deletion dix/privates.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,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"
Expand Down
3 changes: 1 addition & 2 deletions dix/registry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 3 additions & 0 deletions dix/resource_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 0 additions & 3 deletions include/resource.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,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
*
Expand Down
Loading