Module Name: xsrc
Committed By: mrg
Date: Sat Jul 23 04:54:39 UTC 2011
Modified Files:
xsrc/external/mit/xextproto/dist: shmstr.h syncstr.h
Removed Files:
xsrc/external/mit/xextproto/dist/specs: appgroup.xml
Log Message:
merge xextproto 7.2.0
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xextproto/dist/shmstr.h \
xsrc/external/mit/xextproto/dist/syncstr.h
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/xextproto/dist/specs/appgroup.xml
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xextproto/dist/shmstr.h
diff -u xsrc/external/mit/xextproto/dist/shmstr.h:1.3 xsrc/external/mit/xextproto/dist/shmstr.h:1.4
--- xsrc/external/mit/xextproto/dist/shmstr.h:1.3 Sat May 22 02:18:31 2010
+++ xsrc/external/mit/xextproto/dist/shmstr.h Sat Jul 23 04:54:38 2011
@@ -1,12 +1,37 @@
-/* $NetBSD: shmstr.h,v 1.3 2010/05/22 02:18:31 mrg Exp $ */
+/************************************************************
+
+Copyright 1989, 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.
+
+********************************************************/
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
#ifndef _SHMSTR_H_
#define _SHMSTR_H_
-#warning this file is deprecated and provided only for source compatibility
+#include <X11/extensions/shmproto.h>
-#include "shmproto.h"
-
+#ifdef _XSHM_SERVER_
#define XSHM_PUT_IMAGE_ARGS \
DrawablePtr /* dst */, \
GCPtr /* pGC */, \
@@ -33,5 +58,6 @@
PixmapPtr (* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);
void (* PutImage)(XSHM_PUT_IMAGE_ARGS);
} ShmFuncs, *ShmFuncsPtr;
-
#endif
+
+#endif /* _SHMSTR_H_ */
Index: xsrc/external/mit/xextproto/dist/syncstr.h
diff -u xsrc/external/mit/xextproto/dist/syncstr.h:1.3 xsrc/external/mit/xextproto/dist/syncstr.h:1.4
--- xsrc/external/mit/xextproto/dist/syncstr.h:1.3 Sat Aug 14 08:09:59 2010
+++ xsrc/external/mit/xextproto/dist/syncstr.h Sat Jul 23 04:54:38 2011
@@ -1,4 +1,3 @@
-/* $Xorg: syncstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
/*
Copyright 1991, 1993, 1994, 1998 The Open Group
@@ -48,7 +47,6 @@
PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
-/* $XFree86: xc/include/extensions/syncstr.h,v 1.3 2003/07/16 01:38:24 dawes Exp $ */
#ifndef _SYNCSTR_H_
#define _SYNCSTR_H_
