git update 8/7/2010

1 files changed, 74 insertions, 75 deletions

diff --git a/libX11/src/AllPlanes.c b/libX11/src/AllPlanes.c
index 7d422a6f4..02fff2340 100644
--- a/libX11/src/AllPlanes.c
+++ b/libX11/src/AllPlanes.c
@@ -1,75 +1,74 @@
-/*
-
-Copyright 1986, 1998  The Open Group
-
-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.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Xlibint.h"
-
-Status XAllocColorPlanes(
-    register Display *dpy,
-    Colormap cmap,
-    Bool contig,
-    unsigned long *pixels, /* LISTofCARD32 */ /* RETURN */
-    int ncolors,
-    int nreds,
-    int ngreens,
-    int nblues,
-    unsigned long *rmask,
-    unsigned long *gmask,
-    unsigned long *bmask) /* CARD32 */ /* RETURN */
-{
-    xAllocColorPlanesReply rep;
-    Status status;
-    register xAllocColorPlanesReq *req;
-
-    LockDisplay(dpy);
-    GetReq(AllocColorPlanes,req);
-
-    req->cmap = cmap;
-    req->colors = ncolors;
-    req->red = nreds;
-    req->green = ngreens;
-    req->blue = nblues;
-    req->contiguous = contig;
-
-    status = _XReply(dpy, (xReply *)&rep, 0, xFalse);
-
-
-    if (status) {
-	*rmask = rep.redMask;
-	*gmask = rep.greenMask;
-	*bmask = rep.blueMask;
-
-	/* sizeof(CARD32) = 4 */
-	_XRead32 (dpy, (long *) pixels, (long)(ncolors * 4));
-    }
-
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return(status);
-}
+/*

+

+Copyright 1986, 1998  The Open Group

+

+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.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include "Xlibint.h"

+

+Status XAllocColorPlanes(

+    register Display *dpy,

+    Colormap cmap,

+    Bool contig,

+    unsigned long *pixels, /* LISTofCARD32 */ /* RETURN */

+    int ncolors,

+    int nreds,

+    int ngreens,

+    int nblues,

+    unsigned long *rmask,

+    unsigned long *gmask,

+    unsigned long *bmask) /* CARD32 */ /* RETURN */

+{

+    xAllocColorPlanesReply rep;

+    Status status;

+    register xAllocColorPlanesReq *req;

+

+    LockDisplay(dpy);

+    GetReq(AllocColorPlanes,req);

+

+    req->cmap = cmap;

+    req->colors = ncolors;

+    req->red = nreds;

+    req->green = ngreens;

+    req->blue = nblues;

+    req->contiguous = contig;

+

+    status = _XReply(dpy, (xReply *)&rep, 0, xFalse);

+

+

+    if (status) {

+	*rmask = rep.redMask;

+	*gmask = rep.greenMask;

+	*bmask = rep.blueMask;

+

+	/* sizeof(CARD32) = 4 */

+	_XRead32 (dpy, (long *) pixels, (long)(ncolors * 4));

+    }

+

+    UnlockDisplay(dpy);

+    SyncHandle();

+    return(status);

+}