Skip to content

dix: unexport several extension related functions #1383

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
+20 −14
Open

dix: unexport several extension related functions #1383

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 Xext/geext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <X11/extensions/ge.h>
#include <X11/extensions/geproto.h>

#include "dix/extension_priv.h"
#include "dix/dix_priv.h"
#include "dix/request_priv.h"
#include "miext/extinit_priv.h"
Expand Down
3 changes: 2 additions & 1 deletion Xext/xtest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>

#include "dix/input_priv.h"
#include "dix/dix_priv.h"
#include "dix/exevents_priv.h"
#include "dix/extension_priv.h"
#include "dix/input_priv.h"
#include "dix/inpututils_priv.h"
#include "dix/request_priv.h"
#include "mi/mi_priv.h"
Expand Down
1 change: 1 addition & 0 deletions Xi/sendexev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ SOFTWARE.
#include <X11/extensions/XIproto.h>

#include "dix/exevents_priv.h"
#include "dix/extension_priv.h"
#include "Xi/handlers.h"

#include "inputstr.h" /* DeviceIntPtr */
Expand Down
8 changes: 8 additions & 0 deletions dix/extension_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,12 @@ typedef struct {
extern CallbackListPtr ExtensionAccessCallback;
extern CallbackListPtr ExtensionDispatchCallback;

void EnableDisableExtensionError(const char *name, Bool enable);
void InitExtensions(int argc, char **argv);
void CloseDownExtensions(void);

ExtensionEntry *GetExtensionEntry(int major);

void NotImplemented(xEvent *, xEvent *) _X_NORETURN;

#endif /* _XSERVER_EXTENSION_PRIV_H */
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 @@ -89,6 +89,7 @@ Equipment Corporation.
#include "dix/callback_priv.h"
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h"
#include "dix/extension_priv.h"
#include "dix/input_priv.h"
#include "dix/gc_priv.h"
#include "dix/registry_priv.h"
Expand Down
1 change: 1 addition & 0 deletions dix/privates.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ from The Open Group.
#include <stddef.h>

#include "dix/colormap_priv.h"
#include "dix/extension_priv.h"
#include "dix/screenint_priv.h"

#include "windowstr.h"
Expand Down
1 change: 1 addition & 0 deletions dix/registry.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <X11/X.h>
#include <X11/Xproto.h>

#include "dix/extension_priv.h"
#include "dix/registry_priv.h"

#include "resource.h"
Expand Down
1 change: 1 addition & 0 deletions dix/swaprep.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ SOFTWARE.
#include <X11/fonts/fontstruct.h>

#include "dix/dix_priv.h"
#include "dix/extension_priv.h"

#include "misc.h"
#include "dixstruct.h"
Expand Down
1 change: 1 addition & 0 deletions dix/swapreq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ SOFTWARE.
#include <X11/Xproto.h>
#include <X11/Xprotostr.h>

#include "dix/extension_priv.h"
#include "dix/reqhandlers_priv.h"

#include "misc.h"
Expand Down
1 change: 1 addition & 0 deletions dix/tables.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ SOFTWARE.
#include <X11/Xproto.h>

#include "dix/dix_priv.h"
#include "dix/extension_priv.h"
#include "dix/reqhandlers_priv.h"

#include "windowstr.h"
Expand Down
7 changes: 0 additions & 7 deletions include/extension.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,6 @@ extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client */ );

extern _X_EXPORT Bool EnableDisableExtension(const char *name, Bool enable);

extern _X_EXPORT void EnableDisableExtensionError(const char *name,
Bool enable);

extern _X_EXPORT void InitExtensions(int argc, char **argv);

extern _X_EXPORT void CloseDownExtensions(void);

extern _X_EXPORT void LoadExtensionList(const ExtensionModule ext[],
int listSize, Bool external);

Expand Down
6 changes: 0 additions & 6 deletions include/extnsionst.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,6 @@ typedef void (*EventSwapPtr) (xEvent *, xEvent *);

extern _X_EXPORT EventSwapPtr EventSwapVector[128];

extern _X_EXPORT void
NotImplemented( /* FIXME: this may move to another file... */
xEvent *, xEvent *) _X_NORETURN;

extern _X_EXPORT ExtensionEntry *
AddExtension(const char * /*name */ ,
int /*NumEvents */ ,
Expand All @@ -95,7 +91,5 @@ AddExtension(const char * /*name */ ,

extern _X_EXPORT ExtensionEntry *
CheckExtension(const char *extname);
extern _X_EXPORT ExtensionEntry *
GetExtensionEntry(int major);

#endif /* EXTENSIONSTRUCT_H */
1 change: 1 addition & 0 deletions mi/miinitext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ SOFTWARE.
#undef CONFIG_MITSHM
#endif

#include "dix/extension_priv.h"
#include "miext/extinit_priv.h"

#include "misc.h"
Expand Down
1 change: 1 addition & 0 deletions os/utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#endif

#include "dix/dix_priv.h"
#include "dix/extension_priv.h"
#include "dix/input_priv.h"
#include "dix/screensaver_priv.h"
#include "miext/extinit_priv.h"
Expand Down
Loading