<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Sep 23, 2014 at 12:32 PM, Adam Jackson <span dir="ltr"><<a href="mailto:ajax@redhat.com" target="_blank">ajax@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Adam Jackson <<a href="mailto:ajax@redhat.com">ajax@redhat.com</a>><br>
---<br>
composite/compinit.c | 4 ++--<br>
dix/window.c | 2 +-<br>
include/windowstr.h | 2 +-<br>
mi/miexpose.c | 2 +-<br>
4 files changed, 5 insertions(+), 5 deletions(-)<br>
<br>
diff --git a/composite/compinit.c b/composite/compinit.c<br>
index 48e938f..111c16e 100644<br>
--- a/composite/compinit.c<br>
+++ b/composite/compinit.c<br>
@@ -119,12 +119,12 @@ compChangeWindowAttributes(WindowPtr pWin, unsigned long mask)<br>
pScreen->backingStoreSupport != NotUseful) {<br>
if (pWin->backingStore != NotUseful && !pWin->backStorage) {<br>
compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);<br>
- pWin->backStorage = (void *) (intptr_t) 1;<br>
+ pWin->backStorage = TRUE;<br>
}<br>
else if (pWin->backingStore == NotUseful && pWin->backStorage) {<br>
compUnredirectWindow(serverClient, pWin,<br>
CompositeRedirectAutomatic);<br>
- pWin->backStorage = NULL;<br>
+ pWin->backStorage = FALSE;<br></blockquote><div><br></div><div>Here you use TRUE / FALSE<br> <br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
}<br>
}<br>
<br>
diff --git a/dix/window.c b/dix/window.c<br>
index f227e4c..e1645c3 100644<br>
--- a/dix/window.c<br>
+++ b/dix/window.c<br>
@@ -362,7 +362,7 @@ SetWindowToDefaults(WindowPtr pWin)<br>
pWin->cursorIsNone = TRUE;<br>
<br>
pWin->backingStore = NotUseful;<br>
- pWin->backStorage = (void *) NULL;<br>
+ pWin->backStorage = 0;<br></blockquote><div><br></div><div>Here you use 0.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
pWin->mapped = FALSE; /* off */<br>
pWin->realized = FALSE; /* off */<br>
diff --git a/include/windowstr.h b/include/windowstr.h<br>
index 81f5f8c..740f4a6 100644<br>
--- a/include/windowstr.h<br>
+++ b/include/windowstr.h<br>
@@ -144,12 +144,12 @@ typedef struct _Window {<br>
Mask eventMask; /* mask from the creating client */<br>
PixUnion background;<br>
PixUnion border;<br>
- void *backStorage; /* null when BS disabled */<br>
WindowOptPtr optional;<br>
unsigned backgroundState:2; /* None, Relative, Pixel, Pixmap */<br>
unsigned borderIsPixel:1;<br>
unsigned cursorIsNone:1; /* else real cursor (might inherit) */<br>
unsigned backingStore:2;<br>
+ unsigned backStorage:1; /* if bs is allocated */<br>
unsigned saveUnder:1;<br>
unsigned bitGravity:4;<br>
unsigned winGravity:4;<br>
diff --git a/mi/miexpose.c b/mi/miexpose.c<br>
index 555f3b2..de8ee6c 100644<br>
--- a/mi/miexpose.c<br>
+++ b/mi/miexpose.c<br>
@@ -143,7 +143,7 @@ miHandleExposures(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable,<br>
if (!pGC->graphicsExposures &&<br>
(pDstDrawable->type == DRAWABLE_PIXMAP) &&<br>
((pSrcDrawable->type == DRAWABLE_PIXMAP) ||<br>
- (((WindowPtr) pSrcDrawable)->backStorage == NULL)))<br>
+ (((WindowPtr) pSrcDrawable)->backStorage == 0)))<br>
return NULL;<br></blockquote><div><br></div><div>Here you use 0.<br><br>Why the inconsistency?<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
srcBox.x1 = srcx;<br>
<span class="HOEnZb"><font color="#888888">--<br>
1.9.3<br>
<br>
_______________________________________________<br>
<a href="mailto:xorg-devel@lists.x.org">xorg-devel@lists.x.org</a>: X.Org development<br>
Archives: <a href="http://lists.x.org/archives/xorg-devel" target="_blank">http://lists.x.org/archives/xorg-devel</a><br>
Info: <a href="http://lists.x.org/mailman/listinfo/xorg-devel" target="_blank">http://lists.x.org/mailman/listinfo/xorg-devel</a><br>
</font></span></blockquote></div><br><br clear="all"><br>-- <br> Jasper<br>
</div></div>