aboutsummaryrefslogtreecommitdiff
path: root/X11/extensions
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-12-23 15:22:40 +0100
committermarha <marha@users.sourceforge.net>2011-12-23 15:22:40 +0100
commitd1d04c7bd3f1465b7bb6690022d086c6bb005b70 (patch)
tree058884f2af1a2994f07d887c88bfdea63cc47703 /X11/extensions
parent52b728b4b397d26f8841848ee921950e083991d0 (diff)
downloadvcxsrv-d1d04c7bd3f1465b7bb6690022d086c6bb005b70.tar.gz
vcxsrv-d1d04c7bd3f1465b7bb6690022d086c6bb005b70.tar.bz2
vcxsrv-d1d04c7bd3f1465b7bb6690022d086c6bb005b70.zip
Synchronised files
Diffstat (limited to 'X11/extensions')
-rw-r--r--X11/extensions/XLbx.h4
-rw-r--r--X11/extensions/Xdbe.h10
-rw-r--r--X11/extensions/Xge.h2
-rw-r--r--X11/extensions/dpms.h10
-rw-r--r--X11/extensions/extutil.h6
-rw-r--r--X11/extensions/sync.h16
-rw-r--r--X11/extensions/xtestext1.h4
7 files changed, 26 insertions, 26 deletions
diff --git a/X11/extensions/XLbx.h b/X11/extensions/XLbx.h
index ce8c835bf..1af4f9ce2 100644
--- a/X11/extensions/XLbx.h
+++ b/X11/extensions/XLbx.h
@@ -15,11 +15,11 @@
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.
* BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-
+
#ifndef _XLBX_H_
#define _XLBX_H_
diff --git a/X11/extensions/Xdbe.h b/X11/extensions/Xdbe.h
index 14ce53d35..5c842a445 100644
--- a/X11/extensions/Xdbe.h
+++ b/X11/extensions/Xdbe.h
@@ -1,5 +1,5 @@
/******************************************************************************
- *
+ *
* Copyright (c) 1994, 1995 Hewlett-Packard Company
*
* Permission is hereby granted, free of charge, to any person obtaining
@@ -9,10 +9,10 @@
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
- *
+ *
* 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.
@@ -20,12 +20,12 @@
* 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 Hewlett-Packard
* Company 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 Hewlett-Packard Company.
- *
+ *
* Header file for Xlib-related DBE
*
*****************************************************************************/
diff --git a/X11/extensions/Xge.h b/X11/extensions/Xge.h
index 51382ffd0..76b5a6a01 100644
--- a/X11/extensions/Xge.h
+++ b/X11/extensions/Xge.h
@@ -36,7 +36,7 @@
_XFUNCPROTOBEGIN
/**
- * Generic Event mask.
+ * Generic Event mask.
* To be used whenever a list of masks per extension has to be provided.
*
* But, don't actually use the CARD{8,16,32} types. We can't get them them
diff --git a/X11/extensions/dpms.h b/X11/extensions/dpms.h
index 57e98f8ee..f85e6a725 100644
--- a/X11/extensions/dpms.h
+++ b/X11/extensions/dpms.h
@@ -14,14 +14,14 @@ 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
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+Except as contained in this notice, the name of Digital Equipment Corporation
shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
+dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
diff --git a/X11/extensions/extutil.h b/X11/extensions/extutil.h
index 031c520ae..29404d5ae 100644
--- a/X11/extensions/extutil.h
+++ b/X11/extensions/extutil.h
@@ -23,7 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*
* Author: Jim Fulton, MIT The Open Group
- *
+ *
* Xlib Extension-Writing Utilities
*
* This package contains utilities for writing the client API for various
@@ -123,7 +123,7 @@ extern void XextDestroyExtension(
extern XExtDisplayInfo *XextAddDisplay(
XExtensionInfo* /* extinfo */,
Display* /* dpy */,
- char* /* ext_name */,
+ _Xconst char* /* ext_name */,
XExtensionHooks* /* hooks */,
int /* nevents */,
XPointer /* data */
@@ -147,7 +147,7 @@ extern XExtDisplayInfo *XextFindDisplay(
/*
* helper macros to generate code that is common to all extensions; caller
* should prefix it with static if extension source is in one file; this
- * could be a utility function, but have to stack 6 unused arguments for
+ * could be a utility function, but have to stack 6 unused arguments for
* something that is called many, many times would be bad.
*/
#define XEXT_GENERATE_FIND_DISPLAY(proc,extinfo,extname,hooks,nev,data) \
diff --git a/X11/extensions/sync.h b/X11/extensions/sync.h
index a00d9c58a..d3a239f66 100644
--- a/X11/extensions/sync.h
+++ b/X11/extensions/sync.h
@@ -30,13 +30,13 @@ and Olivetti Research Limited, Cambridge, England.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Digital or Olivetti
not be used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL AND OLIVETTI DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
@@ -215,11 +215,11 @@ typedef struct {
} XSyncAlarmNotifyEvent;
/*
- * Errors
+ * Errors
*/
typedef struct {
- int type;
+ int type;
Display *display; /* Display the event was read from */
XSyncAlarm alarm; /* resource id */
unsigned long serial; /* serial number of failed request */
@@ -229,7 +229,7 @@ typedef struct {
} XSyncAlarmError;
typedef struct {
- int type;
+ int type;
Display *display; /* Display the event was read from */
XSyncCounter counter; /* resource id */
unsigned long serial; /* serial number of failed request */
@@ -238,7 +238,7 @@ typedef struct {
unsigned char minor_code; /* Minor op-code of failed request */
} XSyncCounterError;
-/*
+/*
* Prototypes
*/
diff --git a/X11/extensions/xtestext1.h b/X11/extensions/xtestext1.h
index 59cdd151d..67d015bb0 100644
--- a/X11/extensions/xtestext1.h
+++ b/X11/extensions/xtestext1.h
@@ -41,8 +41,8 @@ documentation, and that the name of Hewlett-Packard not be used in
advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
-Hewlett-Packard makes no representations about the
-suitability of this software for any purpose. It is provided
+Hewlett-Packard makes no representations about the
+suitability of this software for any purpose. It is provided
"as is" without express or implied warranty.
This software is not subject to any license of the American