diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-07-10 02:02:56 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-09 23:06:41 -0700 |
| commit | a1d41e311c21eb6627caa0d168e070ceaf90806f (patch) | |
| tree | b0df47d2426c60005c136859c0a3fe8abef73dd7 /hw/xfree86/dri | |
| parent | b86aa74cafddf9bca5addfeb458a23f46ddcf132 (diff) | |
Move extension initialisation prototypes into extinit.h
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>
Diffstat (limited to 'hw/xfree86/dri')
| -rw-r--r-- | hw/xfree86/dri/dri.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/dri/drimodule.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/dri/xf86dri.c | 11 |
3 files changed, 9 insertions, 6 deletions
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 46a9ae457..a3e78701e 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -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; diff --git a/hw/xfree86/dri/drimodule.c b/hw/xfree86/dri/drimodule.c index eb42ef64a..6cb3bfb9b 100644 --- a/hw/xfree86/dri/drimodule.c +++ b/hw/xfree86/dri/drimodule.c @@ -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> diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index 310bb5e4e..ba74bb04f 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -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(); } |