Skip to content

Commit 200ee04

Browse files
committed
dix: unexport several extension related functions
These aren't used (neither supposed to be used) by any drivers, so no need to keep them public. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
1 parent bef8267 commit 200ee04

File tree

14 files changed

+23
-15
lines changed

14 files changed

+23
-15
lines changed

Xext/geext.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <X11/extensions/ge.h>
2929
#include <X11/extensions/geproto.h>
3030

31+
#include "dix/extension_priv.h"
3132
#include "dix/dix_priv.h"
3233
#include "dix/request_priv.h"
3334
#include "miext/extinit_priv.h"

Xext/xtest.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@
3535
#include <X11/extensions/XI.h>
3636
#include <X11/extensions/XIproto.h>
3737

38-
#include "dix/input_priv.h"
3938
#include "dix/dix_priv.h"
4039
#include "dix/exevents_priv.h"
40+
#include "dix/extension_priv.h"
41+
#include "dix/input_priv.h"
4142
#include "dix/inpututils_priv.h"
4243
#include "dix/request_priv.h"
4344
#include "mi/mi_priv.h"

Xi/sendexev.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ SOFTWARE.
5656
#include <X11/extensions/XIproto.h>
5757

5858
#include "dix/exevents_priv.h"
59+
#include "dix/extension_priv.h"
5960
#include "Xi/handlers.h"
6061

6162
#include "inputstr.h" /* DeviceIntPtr */

dix/extension_priv.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,12 @@ typedef struct {
5858
extern CallbackListPtr ExtensionAccessCallback;
5959
extern CallbackListPtr ExtensionDispatchCallback;
6060

61+
void EnableDisableExtensionError(const char *name, Bool enable);
62+
void InitExtensions(int argc, char **argv);
63+
void CloseDownExtensions(void);
64+
65+
ExtensionEntry *GetExtensionEntry(int major);
66+
67+
void NotImplemented(xEvent *, xEvent *) _X_NORETURN;
68+
6169
#endif /* _XSERVER_EXTENSION_PRIV_H */

dix/main.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ Equipment Corporation.
8989
#include "dix/callback_priv.h"
9090
#include "dix/cursor_priv.h"
9191
#include "dix/dix_priv.h"
92+
#include "dix/extension_priv.h"
9293
#include "dix/input_priv.h"
9394
#include "dix/gc_priv.h"
9495
#include "dix/registry_priv.h"

dix/privates.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ from The Open Group.
5353
#include <stddef.h>
5454

5555
#include "dix/colormap_priv.h"
56+
#include "dix/extension_priv.h"
5657
#include "dix/screenint_priv.h"
5758

5859
#include "windowstr.h"

dix/registry.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2424
#include <X11/X.h>
2525
#include <X11/Xproto.h>
2626

27+
#include "dix/extension_priv.h"
2728
#include "dix/registry_priv.h"
2829

2930
#include "resource.h"

dix/swaprep.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,12 @@ SOFTWARE.
4848

4949
#include <X11/X.h>
5050
#include <X11/Xproto.h>
51+
#include <X11/fonts/fontstruct.h>
52+
53+
#include "dix/extension_priv.h"
54+
5155
#include "misc.h"
5256
#include "dixstruct.h"
53-
#include <X11/fonts/fontstruct.h>
5457
#include "scrnintstr.h"
5558
#include "swaprep.h"
5659
#include "globals.h"

dix/swapreq.c

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

53+
#include "dix/extension_priv.h"
5354
#include "dix/reqhandlers_priv.h"
5455

5556
#include "misc.h"

dix/tables.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ SOFTWARE.
4949
#include <X11/X.h>
5050
#include <X11/Xproto.h>
5151

52+
#include "extension_priv.h"
5253
#include "dix/reqhandlers_priv.h"
5354

5455
#include "windowstr.h"

0 commit comments

Comments
 (0)