aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2018-02-26 02:56:58 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-26 02:56:58 +0100
commit35d166b808939a1518c011d0469125b69dc768d7 (patch)
tree915451e80a2c988779741b596c64ef870cbecfdb
parentd59e8d7f43d8a39155cb4d1884cf65b871fd3de6 (diff)
downloadnx-libs-35d166b808939a1518c011d0469125b69dc768d7.tar.gz
nx-libs-35d166b808939a1518c011d0469125b69dc768d7.tar.bz2
nx-libs-35d166b808939a1518c011d0469125b69dc768d7.zip
Lift XFIXES to xorg-xserver-1.4.2 state - non-functional changes only
-rw-r--r--nx-X11/programs/Xserver/xfixes/cursor.c2
-rw-r--r--nx-X11/programs/Xserver/xfixes/region.c2
-rw-r--r--nx-X11/programs/Xserver/xfixes/saveset.c2
-rw-r--r--nx-X11/programs/Xserver/xfixes/select.c4
-rw-r--r--nx-X11/programs/Xserver/xfixes/xfixes.c2
-rw-r--r--nx-X11/programs/Xserver/xfixes/xfixes.h2
-rw-r--r--nx-X11/programs/Xserver/xfixes/xfixesint.h2
7 files changed, 1 insertions, 15 deletions
diff --git a/nx-X11/programs/Xserver/xfixes/cursor.c b/nx-X11/programs/Xserver/xfixes/cursor.c
index 12efbd75f..152bda500 100644
--- a/nx-X11/programs/Xserver/xfixes/cursor.c
+++ b/nx-X11/programs/Xserver/xfixes/cursor.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/nx-X11/programs/Xserver/xfixes/region.c b/nx-X11/programs/Xserver/xfixes/region.c
index 9ac1fae3f..ba8c62835 100644
--- a/nx-X11/programs/Xserver/xfixes/region.c
+++ b/nx-X11/programs/Xserver/xfixes/region.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/nx-X11/programs/Xserver/xfixes/saveset.c b/nx-X11/programs/Xserver/xfixes/saveset.c
index 57d9afc2e..4d4cf5628 100644
--- a/nx-X11/programs/Xserver/xfixes/saveset.c
+++ b/nx-X11/programs/Xserver/xfixes/saveset.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/nx-X11/programs/Xserver/xfixes/select.c b/nx-X11/programs/Xserver/xfixes/select.c
index f05c72c2e..e457fd5cc 100644
--- a/nx-X11/programs/Xserver/xfixes/select.c
+++ b/nx-X11/programs/Xserver/xfixes/select.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -206,7 +204,7 @@ ProcXFixesSelectSelectionInput (ClientPtr client)
return rc;
#else
pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client,
- DixReadAccess);
+ DixReadAccess);
if (!pWin)
return(BadWindow);
#endif
diff --git a/nx-X11/programs/Xserver/xfixes/xfixes.c b/nx-X11/programs/Xserver/xfixes/xfixes.c
index 7447c5873..fadaf73b2 100644
--- a/nx-X11/programs/Xserver/xfixes/xfixes.c
+++ b/nx-X11/programs/Xserver/xfixes/xfixes.c
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/nx-X11/programs/Xserver/xfixes/xfixes.h b/nx-X11/programs/Xserver/xfixes/xfixes.h
index 0f1e3b070..81dd83daf 100644
--- a/nx-X11/programs/Xserver/xfixes/xfixes.h
+++ b/nx-X11/programs/Xserver/xfixes/xfixes.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/nx-X11/programs/Xserver/xfixes/xfixesint.h b/nx-X11/programs/Xserver/xfixes/xfixesint.h
index 17f0dbeac..6dc5d39c5 100644
--- a/nx-X11/programs/Xserver/xfixes/xfixesint.h
+++ b/nx-X11/programs/Xserver/xfixes/xfixesint.h
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Copyright © 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its