(1829) dix: clean up including panoramix headers

* use their actual path instead of relying this to be in compiler's
  include path list.
* no need to do it only conditionally, no #ifdef needed

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-02-25 14:08:51 +01:00
parent e76867668e
commit 1f1afcf3ce
6 changed files with 11 additions and 21 deletions

View File

@@ -129,6 +129,8 @@ Equipment Corporation.
#include "os/bug_priv.h"
#include "os/client_priv.h"
#include "os/fmt.h"
#include "Xext/panoramiX.h"
#include "Xext/panoramiXsrv.h"
#include "xkb/xkbsrv_priv.h"
#include "misc.h"
@@ -139,10 +141,6 @@ Equipment Corporation.
#include "scrnintstr.h"
#include "cursorstr.h"
#include "dixstruct.h"
#ifdef XINERAMA
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif /* XINERAMA */
#include "globals.h"
#include "xace.h"
#include "probes.h"

View File

@@ -43,6 +43,8 @@
#include "dix/input_priv.h"
#include "mi/mi_priv.h"
#include "os/bug_priv.h"
#include "Xext/panoramiX.h"
#include "Xext/panoramiXsrv.h"
#include "misc.h"
#include "resource.h"
@@ -60,11 +62,6 @@
#include "xkbsrv.h"
#ifdef XINERAMA
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif /* XINERAMA */
#include "exglobals.h"
#include "exevents.h"
#include "extnsionst.h"

View File

@@ -98,6 +98,7 @@ Equipment Corporation.
#include "os/ddx_priv.h"
#include "os/osdep.h"
#include "os/screensaver.h"
#include "Xext/panoramiXsrv.h"
#include "scrnintstr.h"
#include "misc.h"
@@ -114,11 +115,7 @@ Equipment Corporation.
#include "extnsionst.h"
#include "privates.h"
#include "exevents.h"
#ifdef XINERAMA
#include "panoramiXsrv.h"
#else
#include "dixevents.h" /* InitEvents() */
#endif /* XINERAMA */
#ifdef DPMSExtension
#include <X11/extensions/dpmsconst.h>

View File

@@ -51,6 +51,8 @@ SOFTWARE.
#include "dix/dix_priv.h"
#include "dix/property_priv.h"
#include "Xext/panoramiX.h"
#include "Xext/panoramiXsrv.h"
#include "windowstr.h"
#include "propertyst.h"

View File

@@ -126,6 +126,8 @@ Equipment Corporation.
#include "dix/gc_priv.h"
#include "dix/registry_priv.h"
#include "os/osdep.h"
#include "Xext/panoramiX.h"
#include "Xext/panoramiXsrv.h"
#include "misc.h"
#include "os.h"
@@ -137,10 +139,6 @@ Equipment Corporation.
#include "colormap.h"
#include "inputstr.h"
#include "cursor.h"
#ifdef XINERAMA
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif /* XINERAMA */
#include "xace.h"
#include <assert.h>
#include "gcstruct.h"

View File

@@ -109,6 +109,8 @@ Equipment Corporation.
#include "os/auth.h"
#include "os/client_priv.h"
#include "os/screensaver.h"
#include "Xext/panoramiX.h"
#include "Xext/panoramiXsrv.h"
#include "misc.h"
#include "scrnintstr.h"
@@ -124,10 +126,6 @@ Equipment Corporation.
#include "gcstruct.h"
#include "servermd.h"
#include "mivalidate.h"
#ifdef XINERAMA
#include "panoramiX.h"
#include "panoramiXsrv.h"
#endif /* XINERAMA */
#include "dixevents.h"
#include "globals.h"
#ifdef COMPOSITE