(submit/miext-extinit) treewide: clean up remaining consumers of extinit.h
Several sources including it without need. For consistency, those who still need someting from there should include exitinit_priv.h (which also pulls in extinit.h) Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
		
							parent
							
								
									c842dde3ef
								
							
						
					
					
						commit
						7c4e2dc1a4
					
				|  | @ -38,7 +38,6 @@ | ||||||
| #include "windowstr.h"          /* window structure  */ | #include "windowstr.h"          /* window structure  */ | ||||||
| #include "scrnintstr.h"         /* screen structure  */ | #include "scrnintstr.h"         /* screen structure  */ | ||||||
| #include "extnsionst.h" | #include "extnsionst.h" | ||||||
| #include "extinit.h"            /* LookupDeviceIntRec */ |  | ||||||
| #include "exevents.h" | #include "exevents.h" | ||||||
| #include "exglobals.h" | #include "exglobals.h" | ||||||
| #include "xigetclientpointer.h" | #include "xigetclientpointer.h" | ||||||
|  |  | ||||||
|  | @ -36,7 +36,7 @@ | ||||||
| #include <GL/glxtokens.h> | #include <GL/glxtokens.h> | ||||||
| #include <GL/internal/dri_interface.h> | #include <GL/internal/dri_interface.h> | ||||||
| #include <os.h> | #include <os.h> | ||||||
| #include "extinit.h" | #include "extinit_priv.h" | ||||||
| #include "glxserver.h" | #include "glxserver.h" | ||||||
| #include "glxext.h" | #include "glxext.h" | ||||||
| #include "glxcontext.h" | #include "glxcontext.h" | ||||||
|  |  | ||||||
|  | @ -38,7 +38,6 @@ | ||||||
| #include <propertyst.h> | #include <propertyst.h> | ||||||
| #include "privates.h" | #include "privates.h" | ||||||
| #include <os.h> | #include <os.h> | ||||||
| #include "extinit.h" |  | ||||||
| #include "glx_extinit.h" | #include "glx_extinit.h" | ||||||
| #include "unpack.h" | #include "unpack.h" | ||||||
| #include "glxutil.h" | #include "glxutil.h" | ||||||
|  |  | ||||||
|  | @ -38,7 +38,6 @@ | ||||||
| #include <os.h> | #include <os.h> | ||||||
| #include <colormapst.h> | #include <colormapst.h> | ||||||
| 
 | 
 | ||||||
| #include "extinit.h" |  | ||||||
| #include "privates.h" | #include "privates.h" | ||||||
| #include "glxserver.h" | #include "glxserver.h" | ||||||
| #include "glxutil.h" | #include "glxutil.h" | ||||||
|  |  | ||||||
|  | @ -42,7 +42,6 @@ | ||||||
| #include <X11/extensions/XIproto.h> | #include <X11/extensions/XIproto.h> | ||||||
| #include "XIstubs.h"            /* even though we don't use stubs.  cute, no? */ | #include "XIstubs.h"            /* even though we don't use stubs.  cute, no? */ | ||||||
| #include "exevents.h" | #include "exevents.h" | ||||||
| #include "extinit.h" |  | ||||||
| #include "exglobals.h" | #include "exglobals.h" | ||||||
| #include "eventstr.h" | #include "eventstr.h" | ||||||
| #include "xserver-properties.h" | #include "xserver-properties.h" | ||||||
|  |  | ||||||
|  | @ -41,7 +41,6 @@ from The Open Group. | ||||||
| #include <X11/keysym.h> | #include <X11/keysym.h> | ||||||
| #include "xserver-properties.h" | #include "xserver-properties.h" | ||||||
| #include "exevents.h" | #include "exevents.h" | ||||||
| #include "extinit.h" |  | ||||||
| 
 | 
 | ||||||
| void | void | ||||||
| ProcessInputEvents(void) | ProcessInputEvents(void) | ||||||
|  |  | ||||||
|  | @ -28,7 +28,6 @@ | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| #include "extension.h" | #include "extension.h" | ||||||
| #include "extinit.h" |  | ||||||
| #include "globals.h" | #include "globals.h" | ||||||
| 
 | 
 | ||||||
| #include "xf86.h" | #include "xf86.h" | ||||||
|  |  | ||||||
|  | @ -42,7 +42,6 @@ | ||||||
| #include "os.h" | #include "os.h" | ||||||
| #include "xf86.h" | #include "xf86.h" | ||||||
| #include "xf86Priv.h" | #include "xf86Priv.h" | ||||||
| #include "extinit.h" |  | ||||||
| 
 | 
 | ||||||
| #ifdef XF86VIDMODE | #ifdef XF86VIDMODE | ||||||
| #include "vidmodestr.h" | #include "vidmodestr.h" | ||||||
|  |  | ||||||
|  | @ -66,7 +66,6 @@ | ||||||
| #include "xf86Xinput.h" | #include "xf86Xinput.h" | ||||||
| #include "xf86Optrec.h" | #include "xf86Optrec.h" | ||||||
| #include "mipointer.h" | #include "mipointer.h" | ||||||
| #include "extinit.h" |  | ||||||
| #include "loaderProcs.h" | #include "loaderProcs.h" | ||||||
| #include "systemd-logind.h" | #include "systemd-logind.h" | ||||||
| #include "exevents.h"           /* AddInputDevice */ | #include "exevents.h"           /* AddInputDevice */ | ||||||
|  |  | ||||||
|  | @ -42,7 +42,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||||||
| #include "micmap.h" | #include "micmap.h" | ||||||
| #include "globals.h" | #include "globals.h" | ||||||
| #include "glxserver.h" | #include "glxserver.h" | ||||||
| #include "extinit.h" |  | ||||||
| #include "glx_extinit.h" | #include "glx_extinit.h" | ||||||
| 
 | 
 | ||||||
| static MODULESETUPPROTO(glxSetup); | static MODULESETUPPROTO(glxSetup); | ||||||
|  |  | ||||||
|  | @ -54,7 +54,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||||||
| #include "misc.h" | #include "misc.h" | ||||||
| #include "dixstruct.h" | #include "dixstruct.h" | ||||||
| #include "extnsionst.h" | #include "extnsionst.h" | ||||||
| #include "extinit.h" |  | ||||||
| #include "colormapst.h" | #include "colormapst.h" | ||||||
| #include "cursorstr.h" | #include "cursorstr.h" | ||||||
| #include "scrnintstr.h" | #include "scrnintstr.h" | ||||||
|  |  | ||||||
|  | @ -48,7 +48,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||||||
| #include "misc.h" | #include "misc.h" | ||||||
| #include "dixstruct.h" | #include "dixstruct.h" | ||||||
| #include "extnsionst.h" | #include "extnsionst.h" | ||||||
| #include "extinit.h" |  | ||||||
| #include "colormapst.h" | #include "colormapst.h" | ||||||
| #include "cursorstr.h" | #include "cursorstr.h" | ||||||
| #include "scrnintstr.h" | #include "scrnintstr.h" | ||||||
|  |  | ||||||
|  | @ -53,7 +53,7 @@ | ||||||
| #include <X11/extensions/XI.h> | #include <X11/extensions/XI.h> | ||||||
| #include <X11/extensions/XIproto.h> | #include <X11/extensions/XIproto.h> | ||||||
| #include "exevents.h" | #include "exevents.h" | ||||||
| #include "extinit.h" | #include "extinit_priv.h" | ||||||
| #include "glx_extinit.h" | #include "glx_extinit.h" | ||||||
| #include "xserver-properties.h" | #include "xserver-properties.h" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -50,7 +50,7 @@ | ||||||
| #include "misc.h" | #include "misc.h" | ||||||
| #include "dixstruct.h" | #include "dixstruct.h" | ||||||
| #include "extnsionst.h" | #include "extnsionst.h" | ||||||
| #include "extinit.h" | #include "extinit_priv.h" | ||||||
| #include "colormapst.h" | #include "colormapst.h" | ||||||
| #include "cursorstr.h" | #include "cursorstr.h" | ||||||
| #include "scrnintstr.h" | #include "scrnintstr.h" | ||||||
|  |  | ||||||
|  | @ -35,7 +35,6 @@ | ||||||
| 
 | 
 | ||||||
| #include "misc.h" | #include "misc.h" | ||||||
| #include "os.h" | #include "os.h" | ||||||
| #include "extinit.h" |  | ||||||
| 
 | 
 | ||||||
| #ifdef XF86VIDMODE | #ifdef XF86VIDMODE | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -50,7 +50,6 @@ in this Software without prior written authorization from The Open Group. | ||||||
| #include   <X11/extensions/XI.h> | #include   <X11/extensions/XI.h> | ||||||
| #include   <X11/extensions/XIproto.h> | #include   <X11/extensions/XIproto.h> | ||||||
| #include   <X11/extensions/geproto.h> | #include   <X11/extensions/geproto.h> | ||||||
| #include   "extinit.h" |  | ||||||
| #include   "exglobals.h" | #include   "exglobals.h" | ||||||
| #include   "eventstr.h" | #include   "eventstr.h" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -48,7 +48,7 @@ | ||||||
| 
 | 
 | ||||||
| #include "inputstr.h" | #include "inputstr.h" | ||||||
| #include "windowstr.h" | #include "windowstr.h" | ||||||
| #include "extinit.h"            /* for XInputExtensionInit */ | #include "extinit_priv.h"            /* for XInputExtensionInit */ | ||||||
| #include "scrnintstr.h" | #include "scrnintstr.h" | ||||||
| #include "xiselectev.h" | #include "xiselectev.h" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -34,7 +34,7 @@ | ||||||
| #include <X11/extensions/XI2proto.h> | #include <X11/extensions/XI2proto.h> | ||||||
| #include <X11/Xatom.h> | #include <X11/Xatom.h> | ||||||
| #include "inputstr.h" | #include "inputstr.h" | ||||||
| #include "extinit.h" | #include "extinit_priv.h" | ||||||
| #include "exglobals.h" | #include "exglobals.h" | ||||||
| #include "scrnintstr.h" | #include "scrnintstr.h" | ||||||
| #include "xkbsrv.h" | #include "xkbsrv.h" | ||||||
|  |  | ||||||
|  | @ -47,7 +47,7 @@ | ||||||
| #include "dix/exevents_priv.h" | #include "dix/exevents_priv.h" | ||||||
| 
 | 
 | ||||||
| #include "inputstr.h" | #include "inputstr.h" | ||||||
| #include "extinit.h"            /* for XInputExtensionInit */ | #include "extinit_priv.h"            /* for XInputExtensionInit */ | ||||||
| #include "scrnintstr.h" | #include "scrnintstr.h" | ||||||
| #include "xiqueryversion.h" | #include "xiqueryversion.h" | ||||||
| #include "protocol-common.h" | #include "protocol-common.h" | ||||||
|  |  | ||||||
|  | @ -56,7 +56,7 @@ | ||||||
| #include <X11/extensions/XI2proto.h> | #include <X11/extensions/XI2proto.h> | ||||||
| #include "inputstr.h" | #include "inputstr.h" | ||||||
| #include "windowstr.h" | #include "windowstr.h" | ||||||
| #include "extinit.h"            /* for XInputExtensionInit */ | #include "extinit_priv.h"            /* for XInputExtensionInit */ | ||||||
| #include "scrnintstr.h" | #include "scrnintstr.h" | ||||||
| #include "exglobals.h" | #include "exglobals.h" | ||||||
| #include "xiselectev.h" | #include "xiselectev.h" | ||||||
|  |  | ||||||
|  | @ -43,7 +43,7 @@ | ||||||
| #include <X11/extensions/XI2proto.h> | #include <X11/extensions/XI2proto.h> | ||||||
| #include "inputstr.h" | #include "inputstr.h" | ||||||
| #include "windowstr.h" | #include "windowstr.h" | ||||||
| #include "extinit.h"            /* for XInputExtensionInit */ | #include "extinit_priv.h"            /* for XInputExtensionInit */ | ||||||
| #include "scrnintstr.h" | #include "scrnintstr.h" | ||||||
| #include "xisetclientpointer.h" | #include "xisetclientpointer.h" | ||||||
| #include "exevents.h" | #include "exevents.h" | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue