Skip to content

Commit 95499a9

Browse files
committed
dix: unexport enableIndirectGLX
Still needs to be _X_EXPORT'ed for internal modules, but not supposed to be visible to external drivers. Signed-off-by: Enrico Weigelt, metux IT consult <[email protected]>
1 parent 9d89346 commit 95499a9

File tree

6 files changed

+10
-2
lines changed

6 files changed

+10
-2
lines changed

dix/dix_priv.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ extern HWEventQueuePtr checkForInput[2];
6060
/* -retro mode */
6161
extern Bool party_like_its_1989;
6262

63+
/* needed by libglx and libglamor (server modules) */
64+
extern _X_EXPORT Bool enableIndirectGLX;
65+
6366
/*
6467
* @brief callback right after one screen's root window has been initialized
6568
*

glamor/glamor_glx_provider.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@
3232

3333
#include <dix-config.h>
3434

35+
#include "dix/dix_priv.h"
36+
3537
#define MESA_EGL_NO_X11_HEADERS
3638
#define EGL_NO_X11
3739
#include <epoxy/egl.h>

glx/createcontext.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
#include <dix-config.h>
2424

2525
#include <GL/glxtokens.h>
26+
27+
#include "dix/dix_priv.h"
28+
2629
#include "glxserver.h"
2730
#include "glxext.h"
2831
#include "indirect_dispatch.h"

glx/extension_string.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
#include <dix-config.h>
3535

36+
#include "dix/dix_priv.h"
3637
#include "include/extinit.h"
3738

3839
#include "extension_string.h"

hw/xfree86/common/xf86Config.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#include <sys/types.h>
5151
#include <grp.h>
5252

53+
#include "dix/dix_priv.h"
5354
#include "dix/resource_priv.h"
5455
#include "dix/screensaver_priv.h"
5556
#include "include/extinit.h"

include/opaque.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ from The Open Group.
3333

3434
#include "globals.h"
3535

36-
// needed by libglx and libglamor (server modules)
37-
extern _X_EXPORT Bool enableIndirectGLX;
3836
extern _X_EXPORT Bool bgNoneRoot;
3937

4038
#endif /* OPAQUE_H */

0 commit comments

Comments
 (0)