aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2018-02-26 04:56:21 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-26 05:01:59 +0100
commit2853ab292345ef5d1c690289f9d55a0ccdf32450 (patch)
treea5d129a0d4ab8d971a532fc9544bfe2b0866737c
parent50a33794069fd22e615f6208cd4c82a64452b485 (diff)
downloadnx-libs-2853ab292345ef5d1c690289f9d55a0ccdf32450.tar.gz
nx-libs-2853ab292345ef5d1c690289f9d55a0ccdf32450.tar.bz2
nx-libs-2853ab292345ef5d1c690289f9d55a0ccdf32450.zip
Lift dix to xorg-xserver-7.1/1.1.0 state - non-functional changes only
-rw-r--r--nx-X11/programs/Xserver/dix/globals.c2
-rw-r--r--nx-X11/programs/Xserver/dix/pixmap.c1
-rw-r--r--nx-X11/programs/Xserver/dix/window.c22
3 files changed, 24 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/dix/globals.c b/nx-X11/programs/Xserver/dix/globals.c
index 04e6585dd..4d33a6c96 100644
--- a/nx-X11/programs/Xserver/dix/globals.c
+++ b/nx-X11/programs/Xserver/dix/globals.c
@@ -89,7 +89,7 @@ unsigned long serverGeneration = 0;
/* these next four are initialized in main.c */
CARD32 ScreenSaverTime;
CARD32 ScreenSaverInterval;
-int ScreenSaverBlanking;
+int ScreenSaverBlanking;
int ScreenSaverAllowExposures;
#ifdef DPMSExtension
diff --git a/nx-X11/programs/Xserver/dix/pixmap.c b/nx-X11/programs/Xserver/dix/pixmap.c
index f13473498..247fa34ab 100644
--- a/nx-X11/programs/Xserver/dix/pixmap.c
+++ b/nx-X11/programs/Xserver/dix/pixmap.c
@@ -124,6 +124,7 @@ AllocatePixmap(ScreenPtr pScreen, int pixDataSize)
* is a quick workaround intended to fix a problem reported
* by Valgrind due to fbBlt() writing just after the end of
* the pixmap buffer. This may be a RENDER bug.
+ * This is not included in xorg upstream!
*/
pPixmap = (PixmapPtr)calloc(1, pScreen->totalPixmapSize + pixDataSize + 4);
diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c
index 7cb5a5f4b..5f9d234b7 100644
--- a/nx-X11/programs/Xserver/dix/window.c
+++ b/nx-X11/programs/Xserver/dix/window.c
@@ -1,5 +1,27 @@
/*
+Copyright (c) 2006, Red Hat, Inc.
+
+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
+RED HAT 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 Red Hat shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Red Hat.
+
Copyright 1987, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its