diff --git a/miext/shadow/Makefile.am b/miext/shadow/Makefile.am index b611c9bb0..dabbf038c 100644 --- a/miext/shadow/Makefile.am +++ b/miext/shadow/Makefile.am @@ -13,7 +13,6 @@ libshadow_la_SOURCES = \ sh3224.c \ shafb4.c \ shafb8.c \ - shalloc.c \ shiplan2p4.c \ shiplan2p8.c \ shpacked.c \ diff --git a/miext/shadow/shadow.h b/miext/shadow/shadow.h index b8cd1b5c1..c08e1537c 100644 --- a/miext/shadow/shadow.h +++ b/miext/shadow/shadow.h @@ -81,8 +81,6 @@ shadowAdd(ScreenPtr pScreen, extern _X_EXPORT void shadowRemove(ScreenPtr pScreen, PixmapPtr pPixmap); -extern _X_EXPORT void *shadowAlloc(int width, int height, int bpp); - extern _X_EXPORT void shadowUpdateAfb4(ScreenPtr pScreen, shadowBufPtr pBuf); diff --git a/miext/shadow/shalloc.c b/miext/shadow/shalloc.c deleted file mode 100644 index 6a79085c4..000000000 --- a/miext/shadow/shalloc.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright © 2000 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#include -#include "scrnintstr.h" -#include "windowstr.h" -#include -#include "dixfontstr.h" -#include -#include "mi.h" -#include "regionstr.h" -#include "globals.h" -#include "gcstruct.h" -#include "shadow.h" - -void * -shadowAlloc(int width, int height, int bpp) -{ - int stride; - void *fb; - - /* Cant use PixmapBytePad -- the structure is probably not initialized yet */ - stride = BitmapBytePad(width * bpp); - fb = xallocarray(stride, height); - return fb; -}