diff --git a/dix/main.c b/dix/main.c index ee3fccab53..21a22c3333 100644 --- a/dix/main.c +++ b/dix/main.c @@ -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" diff --git a/dix/region.c b/dix/region.c index 1967c085c5..a6c5fa6225 100644 --- a/dix/region.c +++ b/dix/region.c @@ -77,11 +77,13 @@ Equipment Corporation. #include -#include "regionstr.h" +#include #include #include + +#include "dix/region_priv.h" + #include "gc.h" -#include #undef assert #ifdef REGION_DEBUG diff --git a/dix/region_priv.h b/dix/region_priv.h new file mode 100644 index 0000000000..bdcf8ae799 --- /dev/null +++ b/dix/region_priv.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: MIT OR X11 + * + * Copyright © 2024 Enrico Weigelt, metux IT consult + */ +#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 */ diff --git a/fb/fbpixmap.c b/fb/fbpixmap.c index a1b93884b7..6e3c382009 100644 --- a/fb/fbpixmap.c +++ b/fb/fbpixmap.c @@ -24,6 +24,7 @@ #include +#include "dix/region_priv.h" #include "fb/fb_priv.h" #ifdef FB_DEBUG diff --git a/include/regionstr.h b/include/regionstr.h index 8716dcf736..e89bbc1ad3 100644 --- a/include/regionstr.h +++ b/include/regionstr.h @@ -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 */ ); @@ -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