Skip to content

dix: unexport internal region helper functions #1389

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
+21 −15
Open

dix: unexport internal region helper functions #1389

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 dix/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ Equipment Corporation.
#include "dix/dix_priv.h"
#include "dix/input_priv.h"
#include "dix/gc_priv.h"
#include "dix/region_priv.h"
#include "dix/registry_priv.h"
#include "dix/screensaver_priv.h"
#include "dix/selection_priv.h"
Expand Down
6 changes: 4 additions & 2 deletions dix/region.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,13 @@ Equipment Corporation.

#include <dix-config.h>

#include "regionstr.h"
#include <pixman.h>
#include <X11/Xprotostr.h>
#include <X11/Xfuncproto.h>

#include "dix/region_priv.h"

#include "gc.h"
#include <pixman.h>

#undef assert
#ifdef REGION_DEBUG
Expand Down
15 changes: 15 additions & 0 deletions dix/region_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <[email protected]>
*/
#ifndef _XSERVER_DIX_REGION_PRIV_H
#define _XSERVER_DIX_REGION_PRIV_H

#include "include/regionstr.h"

void InitRegions(void);
Bool RegionRectAlloc(RegionPtr pRgn, int n);
Bool RegionIsValid(RegionPtr prgn);
void RegionPrint(RegionPtr pReg);

#endif /* _XSERVER_DIX_REGION_PRIV_H */
1 change: 1 addition & 0 deletions fb/fbpixmap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

#include <stdlib.h>

#include "dix/region_priv.h"
#include "fb/fb_priv.h"

#ifdef FB_DEBUG
Expand Down
13 changes: 0 additions & 13 deletions include/regionstr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,6 @@ RegionNull(RegionPtr _pReg)
(_pReg)->data = &RegionEmptyData;
}

extern _X_EXPORT void InitRegions(void);

extern _X_EXPORT RegionPtr RegionCreate(BoxPtr /*rect */ ,
int /*size */ );

Expand Down Expand Up @@ -328,17 +326,6 @@ RegionEqual(RegionPtr reg1, RegionPtr reg2)
return pixman_region_equal(reg1, reg2);
}

extern _X_EXPORT Bool RegionRectAlloc(RegionPtr /*pRgn */ ,
int /*n */
);

#ifdef DEBUG
extern _X_EXPORT Bool RegionIsValid(RegionPtr /*prgn */
);
#endif

extern _X_EXPORT void RegionPrint(RegionPtr /*pReg */ );

#define INCLUDE_LEGACY_REGION_DEFINES
#ifdef INCLUDE_LEGACY_REGION_DEFINES

Expand Down
Loading