diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-08-28 07:25:21 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-08-28 07:25:21 -0400 |
| commit | 85547073265ae9bc4ae3af920a6d3214fd1ca0c5 (patch) | |
| tree | 2e720a9d55fe3cf65e735c8ce66866fb8c749d18 /fb/fb.h | |
| parent | 860a09cfb8afc0a293c7eb5e01762724eb86847a (diff) | |
| parent | 7d54399cfdaa7f54e28828267a76b89c4e8e798f (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
include/miscstruct.h
mi/mibstore.c
mi/midispcur.c
os/Makefile.am
Diffstat (limited to 'fb/fb.h')
| -rw-r--r-- | fb/fb.h | 20 |
1 files changed, 2 insertions, 18 deletions
@@ -26,7 +26,7 @@ #define _FB_H_ #include <X11/X.h> -#include <pixman/pixman.h> +#include <pixman.h> #include "scrnintstr.h" #include "pixmap.h" @@ -1263,23 +1263,6 @@ fbBltPlane (FbBits *src, Pixel planeMask); /* - * fbbstore.c - */ -void -fbSaveAreas(PixmapPtr pPixmap, - RegionPtr prgnSave, - int xorg, - int yorg, - WindowPtr pWin); - -void -fbRestoreAreas(PixmapPtr pPixmap, - RegionPtr prgnRestore, - int xorg, - int yorg, - WindowPtr pWin); - -/* * fbcmap.c */ int @@ -2118,6 +2101,7 @@ fbPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what); pixman_image_t *image_from_pict (PicturePtr pict, Bool has_clip); +void free_pixman_pict (PicturePtr, pixman_image_t *); #endif /* _FB_H_ */ |