diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-23 10:05:55 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-23 10:05:55 +0100 |
| commit | 0f834b91a4768673833ab4917e87d86c237bb1a6 (patch) | |
| tree | 363489504ed4b2d360259b8de4c9e392918e5d02 /xorg-server/hw/xfree86/dri/drimodule.c | |
| parent | fc72edebf875378459368c5383d9023730cbca54 (diff) | |
| download | vcxsrv-0f834b91a4768673833ab4917e87d86c237bb1a6.tar.gz vcxsrv-0f834b91a4768673833ab4917e87d86c237bb1a6.tar.bz2 vcxsrv-0f834b91a4768673833ab4917e87d86c237bb1a6.zip | |
libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update
23 Mar 2012
Diffstat (limited to 'xorg-server/hw/xfree86/dri/drimodule.c')
| -rw-r--r-- | xorg-server/hw/xfree86/dri/drimodule.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/xorg-server/hw/xfree86/dri/drimodule.c b/xorg-server/hw/xfree86/dri/drimodule.c index 28f6ad8c0..83eca4eb9 100644 --- a/xorg-server/hw/xfree86/dri/drimodule.c +++ b/xorg-server/hw/xfree86/dri/drimodule.c @@ -44,26 +44,25 @@ static MODULESETUPPROTO(driSetup); drmServerInfo DRIDRMServerInfo; -static XF86ModuleVersionInfo VersRec = -{ - "dri", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 1, 0, 0, - ABI_CLASS_EXTENSION, - ABI_EXTENSION_VERSION, - MOD_CLASS_NONE, - {0,0,0,0} +static XF86ModuleVersionInfo VersRec = { + "dri", + MODULEVENDORSTRING, + MODINFOSTRING1, + MODINFOSTRING2, + XORG_VERSION_CURRENT, + 1, 0, 0, + ABI_CLASS_EXTENSION, + ABI_EXTENSION_VERSION, + MOD_CLASS_NONE, + {0, 0, 0, 0} }; extern void XFree86DRIExtensionInit(INITARGS); + #define _XF86DRI_SERVER_ #include <X11/dri/xf86driproto.h> -static ExtensionModule XF86DRIExt = -{ +static ExtensionModule XF86DRIExt = { XFree86DRIExtensionInit, XF86DRINAME, &noXFree86DRIExtension, @@ -79,15 +78,16 @@ driSetup(pointer module, pointer opts, int *errmaj, int *errmin) static Bool setupDone = FALSE; if (!setupDone) { - setupDone = TRUE; - LoadExtension(&XF86DRIExt, FALSE); - } else { - if (errmaj) *errmaj = LDR_ONCEONLY; + setupDone = TRUE; + LoadExtension(&XF86DRIExt, FALSE); + } + else { + if (errmaj) + *errmaj = LDR_ONCEONLY; } drmSetServerInfo(&DRIDRMServerInfo); /* Need a non-NULL return value to indicate success */ - return (pointer)1; + return (pointer) 1; } - |