svn merge ^/branches/released .

1 files changed, 0 insertions, 67 deletions

diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index 5efe6506c..a65b63a03 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -50,7 +50,6 @@ SOFTWARE.
 

 #include "screenint.h"

 #include "regionstr.h"

-#include "bstore.h"

 #include "colormap.h"

 #include "cursor.h"

 #include "validate.h"

@@ -213,48 +212,6 @@ typedef    PixmapPtr (* CreatePixmapProcPtr)(
 typedef    Bool (* DestroyPixmapProcPtr)(

 	PixmapPtr /*pPixmap*/);

 

-typedef    void (* SaveDoomedAreasProcPtr)(

-	WindowPtr /*pWindow*/,

-	RegionPtr /*prgnSave*/,

-	int /*xorg*/,

-	int /*yorg*/);

-

-typedef    RegionPtr (* RestoreAreasProcPtr)(

-	WindowPtr /*pWindow*/,

-	RegionPtr /*prgnRestore*/);

-

-typedef    void (* ExposeCopyProcPtr)(

-	WindowPtr /*pSrc*/,

-	DrawablePtr /*pDst*/,

-	GCPtr /*pGC*/,

-	RegionPtr /*prgnExposed*/,

-	int /*srcx*/,

-	int /*srcy*/,

-	int /*dstx*/,

-	int /*dsty*/,

-	unsigned long /*plane*/);

-

-typedef    RegionPtr (* TranslateBackingStoreProcPtr)(

-	WindowPtr /*pWindow*/,

-	int /*windx*/,

-	int /*windy*/,

-	RegionPtr /*oldClip*/,

-	int /*oldx*/,

-	int /*oldy*/);

-

-typedef    RegionPtr (* ClearBackingStoreProcPtr)(

-	WindowPtr /*pWindow*/,

-	int /*x*/,

-	int /*y*/,

-	int /*w*/,

-	int /*h*/,

-	Bool /*generateExposures*/);

-

-typedef    void (* DrawGuaranteeProcPtr)(

-	WindowPtr /*pWindow*/,

-	GCPtr /*pGC*/,

-	int /*guarantee*/);

-    

 typedef    Bool (* RealizeFontProcPtr)(

 	ScreenPtr /*pScreen*/,

 	FontPtr /*pFont*/);

@@ -388,14 +345,6 @@ typedef    Bool (* MarkOverlappedWindowsProcPtr)(
 	WindowPtr /*firstChild*/,

 	WindowPtr * /*pLayerWin*/);

 

-typedef    Bool (* ChangeSaveUnderProcPtr)(

-	WindowPtr /*pLayerWin*/,

-	WindowPtr /*firstChild*/);

-

-typedef    void (* PostChangeSaveUnderProcPtr)(

-	WindowPtr /*pLayerWin*/,

-	WindowPtr /*firstChild*/);

-

 typedef    int (* ConfigNotifyProcPtr)(

 	WindowPtr /*pWin*/,

 	int /*x*/,

@@ -515,20 +464,6 @@ typedef struct _Screen {
     CreatePixmapProcPtr		CreatePixmap;

     DestroyPixmapProcPtr	DestroyPixmap;

 

-    /* Backing store procedures */

-

-    SaveDoomedAreasProcPtr	SaveDoomedAreas;

-    RestoreAreasProcPtr		RestoreAreas;

-    ExposeCopyProcPtr		ExposeCopy;

-    TranslateBackingStoreProcPtr TranslateBackingStore;

-    ClearBackingStoreProcPtr	ClearBackingStore;

-    DrawGuaranteeProcPtr	DrawGuarantee;

-    /*

-     * A read/write copy of the lower level backing store vector is needed now

-     * that the functions can be wrapped.

-     */

-    BSFuncRec			BackingStoreFuncs;

-    

     /* Font procedures */

 

     RealizeFontProcPtr		RealizeFont;

@@ -588,8 +523,6 @@ typedef struct _Screen {
 

     MarkWindowProcPtr		MarkWindow;

     MarkOverlappedWindowsProcPtr MarkOverlappedWindows;

-    ChangeSaveUnderProcPtr	ChangeSaveUnder;

-    PostChangeSaveUnderProcPtr	PostChangeSaveUnder;

     ConfigNotifyProcPtr		ConfigNotify;

     MoveWindowProcPtr		MoveWindow;

     ResizeWindowProcPtr		ResizeWindow;