diff options
| author | Mike DePaulo <mikedep333@users.noreply.github.com> | 2015-04-16 18:30:39 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@users.noreply.github.com> | 2015-04-16 18:30:39 -0400 |
| commit | 8b1577599271da1ac50ebb38d7297769f6b1139c (patch) | |
| tree | 7ece6e6befb03e6818f65687209df98cdb17307a /nx-X11/lib/X11/StColor.c | |
| parent | 0d9217127f3e81fa19037f4923949b10443c5f1d (diff) | |
| parent | ac9fbaabd6bdbca6dd1d94fa385aea41fdebf2c1 (diff) | |
| download | nx-libs-8b1577599271da1ac50ebb38d7297769f6b1139c.tar.gz nx-libs-8b1577599271da1ac50ebb38d7297769f6b1139c.tar.bz2 nx-libs-8b1577599271da1ac50ebb38d7297769f6b1139c.zip | |
Merge pull request #12 from sunweaver/pr/arch-cleanup.CRAY
arch cleanup (CRAY/WORD64) + X.Org CVE-2013-7439
Diffstat (limited to 'nx-X11/lib/X11/StColor.c')
| -rw-r--r-- | nx-X11/lib/X11/StColor.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/nx-X11/lib/X11/StColor.c b/nx-X11/lib/X11/StColor.c index b2b197a99..b6784b5e2 100644 --- a/nx-X11/lib/X11/StColor.c +++ b/nx-X11/lib/X11/StColor.c @@ -39,21 +39,13 @@ XColor *def; { xColorItem *citem; register xStoreColorsReq *req; -#ifdef MUSTCOPY - xColorItem citemdata; - long len = SIZEOF(xColorItem); - - citem = &citemdata; -#endif /* MUSTCOPY */ LockDisplay(dpy); GetReqExtra(StoreColors, SIZEOF(xColorItem), req); /* assume size is 4*n */ req->cmap = cmap; -#ifndef MUSTCOPY citem = (xColorItem *) NEXTPTR(req,xStoreColorsReq); -#endif /* not MUSTCOPY */ citem->pixel = def->pixel; citem->red = def->red; @@ -61,11 +53,6 @@ XColor *def; citem->blue = def->blue; citem->flags = def->flags; /* do_red, do_green, do_blue */ -#ifdef MUSTCOPY - dpy->bufptr -= SIZEOF(xColorItem); /* adjust for GetReqExtra */ - Data (dpy, (char *) citem, len); -#endif /* MUSTCOPY */ - UnlockDisplay(dpy); SyncHandle(); return 1; |