diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-07-24 09:00:22 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-07-24 15:46:08 -0400 |
| commit | d6228cb22aa89b90834d80d98b91862c1fc01b54 (patch) | |
| tree | 4e284d35f26e728cfe5c4502f25ddf1c5591aa58 /hw/xfree86 | |
| parent | 990fc643ae90c034187707e7de414d80640ec6da (diff) | |
Shape extension is built-in and mandatory.
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/dixmods/extmod/modinit.c | 9 | ||||
| -rw-r--r-- | hw/xfree86/dixmods/extmod/modinit.h | 2 | ||||
| -rw-r--r-- | hw/xfree86/loader/dixsym.c | 3 |
3 files changed, 0 insertions, 14 deletions
diff --git a/hw/xfree86/dixmods/extmod/modinit.c b/hw/xfree86/dixmods/extmod/modinit.c index a18118a53..bfbd31c10 100644 --- a/hw/xfree86/dixmods/extmod/modinit.c +++ b/hw/xfree86/dixmods/extmod/modinit.c @@ -47,15 +47,6 @@ static ExtensionModule extensionModules[] = { NULL }, #endif -#ifdef SHAPE - { - ShapeExtensionInit, - SHAPENAME, - &noShapeExtension, - NULL, - NULL - }, -#endif #ifdef MULTIBUFFER { MultibufferExtensionInit, diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index fe95c4922..a376a596e 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -7,10 +7,8 @@ #define INITARGS void #endif -#ifdef SHAPE #define _SHAPE_SERVER_ /* don't want Xlib structures */ #include <X11/extensions/shapestr.h> -#endif #ifdef MULTIBUFFER extern void MultibufferExtensionInit(INITARGS); diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index eb7988f64..748e8952f 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -374,9 +374,6 @@ _X_HIDDEN void *dixLookupTab[] = { #ifdef RENDER SYMVAR(noRenderExtension) #endif -#ifdef SHAPE - SYMVAR(noShapeExtension) -#endif #ifdef XCSECURITY SYMVAR(noSecurityExtension) #endif |