hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-07 23:02:23 +00:00
Code Issues Projects Releases Wiki Activity

Move extension initialisation prototypes into extinit.h

Browse source 
Create extinit.h (and xf86Extensions.h, for Xorg-specific extensions) to
hold all our extension initialisation prototypes, rather than
duplicating them everywhere.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Daniel Stone 2012-07-10 02:02:56 +01:00 • committed by Keith Packard
commit a1d41e311c
65 changed files with 264 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/xfree86/dri/dri.c
View file

@ -51,6 +51,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "extinit.h"
#include "colormapst.h"
#include "cursorstr.h"
#include "scrnintstr.h"
@ -68,6 +69,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "xf86_OSproc.h"
#include "inputstr.h"
#include "xf86VGAarbiter.h"
#include "xf86Extensions.h"
static int DRIEntPrivIndex = -1;
static DevPrivateKeyRec DRIScreenPrivKeyRec;

2
hw/xfree86/dri/drimodule.c
View file

@ -37,6 +37,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif
#include "xf86Module.h"
#include "xf86Extensions.h"
#include "globals.h"
#include "xf86drm.h"
@ -57,7 +58,6 @@ static XF86ModuleVersionInfo VersRec = {
{0, 0, 0, 0}
};
extern void XFree86DRIExtensionInit(void);
#define _XF86DRI_SERVER_
#include <X11/dri/xf86driproto.h>

11
hw/xfree86/dri/xf86dri.c
View file

@ -47,6 +47,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h"
#include "extinit.h"
#include "colormapst.h"
#include "cursorstr.h"
#include "scrnintstr.h"
@ -60,17 +61,17 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "dristruct.h"
#include "xf86drm.h"
#include "protocol-versions.h"
#include "xf86Extensions.h"
static int DRIErrorBase;
static void XF86DRIResetProc(ExtensionEntry * extEntry);
static void XF86DRIResetProc(ExtensionEntry *extEntry);
static unsigned char DRIReqCode = 0;
extern void XFree86DRIExtensionInit(void);
/*ARGSUSED*/ static void
XF86DRIResetProc(ExtensionEntry * extEntry)
/*ARGSUSED*/
static void
XF86DRIResetProc(ExtensionEntry *extEntry)
{
DRIReset();
}