diff options
Diffstat (limited to 'xc/include')
89 files changed, 656 insertions, 185 deletions
diff --git a/xc/include/DECkeysym.h b/xc/include/DECkeysym.h index d651b1f40..595c84eda 100644 --- a/xc/include/DECkeysym.h +++ b/xc/include/DECkeysym.h @@ -1,4 +1,4 @@ -/* $TOG: DECkeysym.h /main/5 1998/02/09 11:18:07 kaleb $ */ +/* $Xorg: DECkeysym.h,v 1.3 2000/08/18 04:05:43 coskrey Exp $ */ /*********************************************************** diff --git a/xc/include/GL/glu.h b/xc/include/GL/glu.h new file mode 100644 index 000000000..e2eaf5a15 --- /dev/null +++ b/xc/include/GL/glu.h @@ -0,0 +1,325 @@ +/* $XFree86: xc/include/GL/glu.h,v 1.1 2001/01/15 22:17:50 dawes Exp $ */ + +/* +** License Applicability. Except to the extent portions of this file are +** made subject to an alternative license as permitted in the SGI Free +** Software License B, Version 1.1 (the "License"), the contents of this +** file are subject only to the provisions of the License. You may not use +** this file except in compliance with the License. You may obtain a copy +** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 +** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: +** +** http://oss.sgi.com/projects/FreeB +** +** Note that, as provided in the License, the Software is distributed on an +** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS +** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND +** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A +** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. +** +** Original Code. The Original Code is: OpenGL Sample Implementation, +** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, +** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. +** Copyright in any portions created by third parties is as indicated +** elsewhere herein. All Rights Reserved. +** +** Additional Notice Provisions: This software was created using the +** OpenGL(R) version 1.2.1 Sample Implementation published by SGI, but has +** not been independently verified as being compliant with the OpenGL(R) +** version 1.2.1 Specification. +*/ + +#ifndef __glu_h__ +#define __glu_h__ + +#include <GL/gl.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/*************************************************************/ + +/* Extensions */ +#define GLU_EXT_object_space_tess 1 +#define GLU_EXT_nurbs_tessellator 1 + +/* Boolean */ +#define GLU_FALSE 0 +#define GLU_TRUE 1 + +/* Version */ +#define GLU_VERSION_1_1 1 +#define GLU_VERSION_1_2 1 +#define GLU_VERSION_1_3 1 + +/* StringName */ +#define GLU_VERSION 100800 +#define GLU_EXTENSIONS 100801 + +/* ErrorCode */ +#define GLU_INVALID_ENUM 100900 +#define GLU_INVALID_VALUE 100901 +#define GLU_OUT_OF_MEMORY 100902 +#define GLU_INVALID_OPERATION 100904 + +/* NurbsDisplay */ +/* GLU_FILL */ +#define GLU_OUTLINE_POLYGON 100240 +#define GLU_OUTLINE_PATCH 100241 + +/* NurbsCallback */ +#define GLU_NURBS_ERROR 100103 +#define GLU_ERROR 100103 +#define GLU_NURBS_BEGIN 100164 +#define GLU_NURBS_BEGIN_EXT 100164 +#define GLU_NURBS_VERTEX 100165 +#define GLU_NURBS_VERTEX_EXT 100165 +#define GLU_NURBS_NORMAL 100166 +#define GLU_NURBS_NORMAL_EXT 100166 +#define GLU_NURBS_COLOR 100167 +#define GLU_NURBS_COLOR_EXT 100167 +#define GLU_NURBS_TEXTURE_COORD 100168 +#define GLU_NURBS_TEX_COORD_EXT 100168 +#define GLU_NURBS_END 100169 +#define GLU_NURBS_END_EXT 100169 +#define GLU_NURBS_BEGIN_DATA 100170 +#define GLU_NURBS_BEGIN_DATA_EXT 100170 +#define GLU_NURBS_VERTEX_DATA 100171 +#define GLU_NURBS_VERTEX_DATA_EXT 100171 +#define GLU_NURBS_NORMAL_DATA 100172 +#define GLU_NURBS_NORMAL_DATA_EXT 100172 +#define GLU_NURBS_COLOR_DATA 100173 +#define GLU_NURBS_COLOR_DATA_EXT 100173 +#define GLU_NURBS_TEXTURE_COORD_DATA 100174 +#define GLU_NURBS_TEX_COORD_DATA_EXT 100174 +#define GLU_NURBS_END_DATA 100175 +#define GLU_NURBS_END_DATA_EXT 100175 + +/* NurbsError */ +#define GLU_NURBS_ERROR1 100251 +#define GLU_NURBS_ERROR2 100252 +#define GLU_NURBS_ERROR3 100253 +#define GLU_NURBS_ERROR4 100254 +#define GLU_NURBS_ERROR5 100255 +#define GLU_NURBS_ERROR6 100256 +#define GLU_NURBS_ERROR7 100257 +#define GLU_NURBS_ERROR8 100258 +#define GLU_NURBS_ERROR9 100259 +#define GLU_NURBS_ERROR10 100260 +#define GLU_NURBS_ERROR11 100261 +#define GLU_NURBS_ERROR12 100262 +#define GLU_NURBS_ERROR13 100263 +#define GLU_NURBS_ERROR14 100264 +#define GLU_NURBS_ERROR15 100265 +#define GLU_NURBS_ERROR16 100266 +#define GLU_NURBS_ERROR17 100267 +#define GLU_NURBS_ERROR18 100268 +#define GLU_NURBS_ERROR19 100269 +#define GLU_NURBS_ERROR20 100270 +#define GLU_NURBS_ERROR21 100271 +#define GLU_NURBS_ERROR22 100272 +#define GLU_NURBS_ERROR23 100273 +#define GLU_NURBS_ERROR24 100274 +#define GLU_NURBS_ERROR25 100275 +#define GLU_NURBS_ERROR26 100276 +#define GLU_NURBS_ERROR27 100277 +#define GLU_NURBS_ERROR28 100278 +#define GLU_NURBS_ERROR29 100279 +#define GLU_NURBS_ERROR30 100280 +#define GLU_NURBS_ERROR31 100281 +#define GLU_NURBS_ERROR32 100282 +#define GLU_NURBS_ERROR33 100283 +#define GLU_NURBS_ERROR34 100284 +#define GLU_NURBS_ERROR35 100285 +#define GLU_NURBS_ERROR36 100286 +#define GLU_NURBS_ERROR37 100287 + +/* NurbsProperty */ +#define GLU_AUTO_LOAD_MATRIX 100200 +#define GLU_CULLING 100201 +#define GLU_SAMPLING_TOLERANCE 100203 +#define GLU_DISPLAY_MODE 100204 +#define GLU_PARAMETRIC_TOLERANCE 100202 +#define GLU_SAMPLING_METHOD 100205 +#define GLU_U_STEP 100206 +#define GLU_V_STEP 100207 +#define GLU_NURBS_MODE 100160 +#define GLU_NURBS_MODE_EXT 100160 +#define GLU_NURBS_TESSELLATOR 100161 +#define GLU_NURBS_TESSELLATOR_EXT 100161 +#define GLU_NURBS_RENDERER 100162 +#define GLU_NURBS_RENDERER_EXT 100162 + +/* NurbsSampling */ +#define GLU_OBJECT_PARAMETRIC_ERROR 100208 +#define GLU_OBJECT_PARAMETRIC_ERROR_EXT 100208 +#define GLU_OBJECT_PATH_LENGTH 100209 +#define GLU_OBJECT_PATH_LENGTH_EXT 100209 +#define GLU_PATH_LENGTH 100215 +#define GLU_PARAMETRIC_ERROR 100216 +#define GLU_DOMAIN_DISTANCE 100217 + +/* NurbsTrim */ +#define GLU_MAP1_TRIM_2 100210 +#define GLU_MAP1_TRIM_3 100211 + +/* QuadricDrawStyle */ +#define GLU_POINT 100010 +#define GLU_LINE 100011 +#define GLU_FILL 100012 +#define GLU_SILHOUETTE 100013 + +/* QuadricCallback */ +/* GLU_ERROR */ + +/* QuadricNormal */ +#define GLU_SMOOTH 100000 +#define GLU_FLAT 100001 +#define GLU_NONE 100002 + +/* QuadricOrientation */ +#define GLU_OUTSIDE 100020 +#define GLU_INSIDE 100021 + +/* TessCallback */ +#define GLU_TESS_BEGIN 100100 +#define GLU_BEGIN 100100 +#define GLU_TESS_VERTEX 100101 +#define GLU_VERTEX 100101 +#define GLU_TESS_END 100102 +#define GLU_END 100102 +#define GLU_TESS_ERROR 100103 +#define GLU_TESS_EDGE_FLAG 100104 +#define GLU_EDGE_FLAG 100104 +#define GLU_TESS_COMBINE 100105 +#define GLU_TESS_BEGIN_DATA 100106 +#define GLU_TESS_VERTEX_DATA 100107 +#define GLU_TESS_END_DATA 100108 +#define GLU_TESS_ERROR_DATA 100109 +#define GLU_TESS_EDGE_FLAG_DATA 100110 +#define GLU_TESS_COMBINE_DATA 100111 + +/* TessContour */ +#define GLU_CW 100120 +#define GLU_CCW 100121 +#define GLU_INTERIOR 100122 +#define GLU_EXTERIOR 100123 +#define GLU_UNKNOWN 100124 + +/* TessProperty */ +#define GLU_TESS_WINDING_RULE 100140 +#define GLU_TESS_BOUNDARY_ONLY 100141 +#define GLU_TESS_TOLERANCE 100142 + +/* TessError */ +#define GLU_TESS_ERROR1 100151 +#define GLU_TESS_ERROR2 100152 +#define GLU_TESS_ERROR3 100153 +#define GLU_TESS_ERROR4 100154 +#define GLU_TESS_ERROR5 100155 +#define GLU_TESS_ERROR6 100156 +#define GLU_TESS_ERROR7 100157 +#define GLU_TESS_ERROR8 100158 +#define GLU_TESS_MISSING_BEGIN_POLYGON 100151 +#define GLU_TESS_MISSING_BEGIN_CONTOUR 100152 +#define GLU_TESS_MISSING_END_POLYGON 100153 +#define GLU_TESS_MISSING_END_CONTOUR 100154 +#define GLU_TESS_COORD_TOO_LARGE 100155 +#define GLU_TESS_NEED_COMBINE_CALLBACK 100156 + +/* TessWinding */ +#define GLU_TESS_WINDING_ODD 100130 +#define GLU_TESS_WINDING_NONZERO 100131 +#define GLU_TESS_WINDING_POSITIVE 100132 +#define GLU_TESS_WINDING_NEGATIVE 100133 +#define GLU_TESS_WINDING_ABS_GEQ_TWO 100134 + +/*************************************************************/ + + +#ifdef __cplusplus +class GLUnurbs; +class GLUquadric; +class GLUtesselator; +#else +typedef struct GLUnurbs GLUnurbs; +typedef struct GLUquadric GLUquadric; +typedef struct GLUtesselator GLUtesselator; +#endif + +typedef struct GLUnurbs GLUnurbsObj; +typedef struct GLUquadric GLUquadricObj; +typedef struct GLUtesselator GLUtesselatorObj; +typedef struct GLUtesselator GLUtriangulatorObj; + +#define GLU_TESS_MAX_COORD 1.0e150 + +/* Internal convenience typedefs */ +typedef void (*_GLUfuncptr)(); + +extern void gluBeginCurve (GLUnurbs* nurb); +extern void gluBeginPolygon (GLUtesselator* tess); +extern void gluBeginSurface (GLUnurbs* nurb); +extern void gluBeginTrim (GLUnurbs* nurb); +extern GLint gluBuild1DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data); +extern GLint gluBuild1DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *data); +extern GLint gluBuild2DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data); +extern GLint gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data); +extern GLint gluBuild3DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data); +extern GLint gluBuild3DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data); +extern GLboolean gluCheckExtension (const GLubyte *extName, const GLubyte *extString); +extern void gluCylinder (GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks); +extern void gluDeleteNurbsRenderer (GLUnurbs* nurb); +extern void gluDeleteQuadric (GLUquadric* quad); +extern void gluDeleteTess (GLUtesselator* tess); +extern void gluDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops); +extern void gluEndCurve (GLUnurbs* nurb); +extern void gluEndPolygon (GLUtesselator* tess); +extern void gluEndSurface (GLUnurbs* nurb); +extern void gluEndTrim (GLUnurbs* nurb); +extern const GLubyte * gluErrorString (GLenum error); +extern void gluGetNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat* data); +extern const GLubyte * gluGetString (GLenum name); +extern void gluGetTessProperty (GLUtesselator* tess, GLenum which, GLdouble* data); +extern void gluLoadSamplingMatrices (GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view); +extern void gluLookAt (GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ); +extern GLUnurbs* gluNewNurbsRenderer (void); +extern GLUquadric* gluNewQuadric (void); +extern GLUtesselator* gluNewTess (void); +extern void gluNextContour (GLUtesselator* tess, GLenum type); +extern void gluNurbsCallback (GLUnurbs* nurb, GLenum which, _GLUfuncptr CallBackFunc); +extern void gluNurbsCallbackData (GLUnurbs* nurb, GLvoid* userData); +extern void gluNurbsCallbackDataEXT (GLUnurbs* nurb, GLvoid* userData); +extern void gluNurbsCurve (GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type); +extern void gluNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat value); +extern void gluNurbsSurface (GLUnurbs* nurb, GLint sKnotCount, GLfloat* sKnots, GLint tKnotCount, GLfloat* tKnots, GLint sStride, GLint tStride, GLfloat* control, GLint sOrder, GLint tOrder, GLenum type); +extern void gluOrtho2D (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top); +extern void gluPartialDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep); +extern void gluPerspective (GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar); +extern void gluPickMatrix (GLdouble x, GLdouble y, GLdouble delX, GLdouble delY, GLint *viewport); +extern GLint gluProject (GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* winX, GLdouble* winY, GLdouble* winZ); +extern void gluPwlCurve (GLUnurbs* nurb, GLint count, GLfloat* data, GLint stride, GLenum type); +extern void gluQuadricCallback (GLUquadric* quad, GLenum which, _GLUfuncptr CallBackFunc); +extern void gluQuadricDrawStyle (GLUquadric* quad, GLenum draw); +extern void gluQuadricNormals (GLUquadric* quad, GLenum normal); +extern void gluQuadricOrientation (GLUquadric* quad, GLenum orientation); +extern void gluQuadricTexture (GLUquadric* quad, GLboolean texture); +extern GLint gluScaleImage (GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid* dataOut); +extern void gluSphere (GLUquadric* quad, GLdouble radius, GLint slices, GLint stacks); +extern void gluTessBeginContour (GLUtesselator* tess); +extern void gluTessBeginPolygon (GLUtesselator* tess, GLvoid* data); +extern void gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc); +extern void gluTessEndContour (GLUtesselator* tess); +extern void gluTessEndPolygon (GLUtesselator* tess); +extern void gluTessNormal (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ); +extern void gluTessProperty (GLUtesselator* tess, GLenum which, GLdouble data); +extern void gluTessVertex (GLUtesselator* tess, GLdouble *location, GLvoid* data); +extern GLint gluUnProject (GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* objX, GLdouble* objY, GLdouble* objZ); +extern GLint gluUnProject4 (GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble near, GLdouble far, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW); + +#ifdef __cplusplus +} +#endif + +#endif /* __glu_h__ */ diff --git a/xc/include/HPkeysym.h b/xc/include/HPkeysym.h index 14ddcc7a0..9e0049c3b 100644 --- a/xc/include/HPkeysym.h +++ b/xc/include/HPkeysym.h @@ -1,4 +1,4 @@ -/* $TOG: HPkeysym.h /main/5 1998/06/29 08:53:32 kaleb $ */ +/* $Xorg: HPkeysym.h,v 1.4 2000/08/18 04:05:43 coskrey Exp $ */ /* Copyright 1987, 1998 The Open Group @@ -52,6 +52,10 @@ performance, or use of this material. */ +#ifndef _HPKEYSYM_H + +#define _HPKEYSYM + #define hpXK_ClearLine 0x1000FF6F #define hpXK_InsertLine 0x1000FF70 #define hpXK_DeleteLine 0x1000FF71 @@ -153,3 +157,5 @@ performance, or use of this material. #define XK_IO 0x100000ee #define XK_longminus 0x100000f6 #define XK_block 0x100000fc + +#endif /* _HPKEYSYM_H */ diff --git a/xc/include/Imakefile b/xc/include/Imakefile index 98899f60f..af2d84d88 100644 --- a/xc/include/Imakefile +++ b/xc/include/Imakefile @@ -1,9 +1,9 @@ -XCOMM $TOG: Imakefile /main/93 1997/06/13 15:34:58 kaleb $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $ -XCOMM $XFree86: xc/include/Imakefile,v 3.25 2000/07/02 19:23:34 dawes Exp $ +XCOMM $XFree86: xc/include/Imakefile,v 3.27 2001/01/21 21:19:08 tsi Exp $ #define IHaveSubdirs #define PassCDebugFlags /**/ @@ -52,11 +52,7 @@ BuildIncludes($(HEADERS),X11,..) InstallMultipleFlags($(HEADERS),$(INCDIR)/X11,$(INSTINCFLAGS)) MakeSubdirs($(SUBDIRS)) - -depend:: - -clean:: - +DependSubdirs($(SUBDIRS)) InstallDriverSDKNonExecFile(X.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(Xalloca.h,$(DRIVERSDKINCLUDEDIR)) diff --git a/xc/include/Sunkeysym.h b/xc/include/Sunkeysym.h index 55f20d117..fb7897ef6 100644 --- a/xc/include/Sunkeysym.h +++ b/xc/include/Sunkeysym.h @@ -1,4 +1,4 @@ -/* $TOG: Sunkeysym.h /main/6 1998/02/09 11:18:19 kaleb $ */ +/* $Xorg: Sunkeysym.h,v 1.3 2000/08/18 04:05:43 coskrey Exp $ */ /************************************************************ diff --git a/xc/include/X.h b/xc/include/X.h index 0a98d1aec..a82a5379a 100644 --- a/xc/include/X.h +++ b/xc/include/X.h @@ -1,5 +1,5 @@ /* - * $TOG: X.h /main/9 1998/02/09 11:18:23 kaleb $ + * $Xorg: X.h,v 1.3 2000/08/18 04:05:43 coskrey Exp $ */ /* Definitions for the X window system likely to be used by applications */ @@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/X.h,v 1.3 1999/08/22 08:58:48 dawes Exp $ */ +/* $XFree86: xc/include/X.h,v 1.4 2001/01/17 17:53:09 dawes Exp $ */ #define X_PROTOCOL 11 /* current protocol version */ #define X_PROTOCOL_REVISION 0 /* current minor version */ diff --git a/xc/include/XWDFile.h b/xc/include/XWDFile.h index 4030fc40e..210e81bd4 100644 --- a/xc/include/XWDFile.h +++ b/xc/include/XWDFile.h @@ -1,4 +1,4 @@ -/* $TOG: XWDFile.h /main/19 1998/02/09 11:18:28 kaleb $ */ +/* $Xorg: XWDFile.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /* Copyright 1985, 1986, 1998 The Open Group diff --git a/xc/include/Xalloca.h b/xc/include/Xalloca.h index 73a45069f..486a337d6 100644 --- a/xc/include/Xalloca.h +++ b/xc/include/Xalloca.h @@ -1,4 +1,4 @@ -/* $TOG: Xalloca.h /main/7 1998/02/09 11:18:32 kaleb $ */ +/* $Xorg: Xalloca.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /* @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/Xalloca.h,v 3.8 2000/02/17 14:00:31 dawes Exp $ */ +/* $XFree86: xc/include/Xalloca.h,v 3.9 2001/01/17 17:53:10 dawes Exp $ */ /* * The purpose of this header is to define the macros ALLOCATE_LOCAL and diff --git a/xc/include/Xfuncproto.h b/xc/include/Xfuncproto.h index 41807922e..bbf246dff 100644 --- a/xc/include/Xfuncproto.h +++ b/xc/include/Xfuncproto.h @@ -1,4 +1,4 @@ -/* $TOG: Xfuncproto.h /main/10 1998/02/09 11:18:40 kaleb $ */ +/* $Xorg: Xfuncproto.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /* * Copyright 1989, 1991, 1998 The Open Group diff --git a/xc/include/Xfuncs.h b/xc/include/Xfuncs.h index 124b342e3..5088df6a8 100644 --- a/xc/include/Xfuncs.h +++ b/xc/include/Xfuncs.h @@ -1,5 +1,5 @@ /* - * $TOG: Xfuncs.h /main/17 1998/02/09 11:18:43 kaleb $ + * $Xorg: Xfuncs.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ * * Copyright 1990, 1998 The Open Group @@ -21,7 +21,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. * */ -/* $XFree86: xc/include/Xfuncs.h,v 3.6 2000/01/22 15:34:22 dawes Exp $ */ +/* $XFree86: xc/include/Xfuncs.h,v 3.7 2001/01/17 17:53:11 dawes Exp $ */ #ifndef _XFUNCS_H_ #define _XFUNCS_H_ diff --git a/xc/include/Xmd.h b/xc/include/Xmd.h index 852976417..c464ddc63 100644 --- a/xc/include/Xmd.h +++ b/xc/include/Xmd.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/Xmd.h,v 3.8 2000/08/23 22:10:01 tsi Exp $ */ +/* $XFree86: xc/include/Xmd.h,v 3.9 2001/01/17 17:53:11 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -43,7 +43,7 @@ SOFTWARE. ******************************************************************/ #ifndef XMD_H #define XMD_H 1 -/* $TOG: Xmd.h /main/36 1998/02/09 11:18:48 kaleb $ */ +/* $Xorg: Xmd.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /* * Xmd.h: MACHINE DEPENDENT DECLARATIONS. */ diff --git a/xc/include/Xos.h b/xc/include/Xos.h index 30ce3d56f..3b2c866a4 100644 --- a/xc/include/Xos.h +++ b/xc/include/Xos.h @@ -1,5 +1,5 @@ /* - * $TOG: Xos.h /main/71 1998/02/09 11:18:52 kaleb $ + * $Xorg: Xos.h,v 1.5 2000/08/18 04:05:44 coskrey Exp $ * * Copyright 1987, 1998 The Open Group @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. * The X Window System is a Trademark of The Open Group. * */ -/* $XFree86: xc/include/Xos.h,v 3.30 2000/08/10 17:40:27 dawes Exp $ */ +/* $XFree86: xc/include/Xos.h,v 3.32 2001/02/15 18:20:28 dawes Exp $ */ /* This is a collection of things to try and minimize system dependencies * in a "signficant" number of source files. @@ -56,6 +56,14 @@ in this Software without prior written authorization from The Open Group. #endif #endif /* USG */ +#ifdef _SEQUENT_ +/* + * in_systm.h compatibility between SysV and BSD types u_char u_short u_long + * select.h for typedef of args to select, fd_set, may use SVR4 later + */ +#include <netinet/in_systm.h> +#include <sys/select.h> +#endif /* _SEQUENT_ */ /* * Just about everyone needs the strings routines. We provide both forms here, @@ -149,10 +157,10 @@ extern int sys_nerr; #endif /* CSRG_BASED */ /* - * Get struct timeval + * Get struct timeval and struct tm */ -#ifdef SYSV +#if defined(SYSV) && !defined(_SEQUENT_) #ifndef USL #include <sys/time.h> @@ -209,8 +217,7 @@ struct timeval { #include <sys/time.h> #elif defined(MINIX) || defined(_SEQUENT_) || defined(Lynx) #include <time.h> -#else -#ifdef __QNX__ +#elif defined (__QNX__) typedef unsigned long fd_mask; /* Make sure we get 256 bit select masks */ #define FD_SETSIZE 256 @@ -219,7 +226,7 @@ typedef unsigned long fd_mask; #include <time.h> #else #include <sys/time.h> -#endif /* QNX */ +#include <time.h> #endif /* defined(_POSIX_SOURCE) && defined(SVR4) */ #endif /* SYSV */ diff --git a/xc/include/Xos_r.h b/xc/include/Xos_r.h index b80d123b2..be068c100 100644 --- a/xc/include/Xos_r.h +++ b/xc/include/Xos_r.h @@ -1,4 +1,4 @@ -/* $TOG: Xos_r.h /main/7 1998/02/09 11:18:56 kaleb $ */ +/* $Xorg: Xos_r.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -18,7 +18,7 @@ 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. */ -/* $XFree86: xc/include/Xos_r.h,v 1.7 2000/08/28 15:29:11 dawes Exp $ */ +/* $XFree86: xc/include/Xos_r.h,v 1.8 2001/01/17 17:53:11 dawes Exp $ */ /* * Various and sundry Thread-Safe functions used by X11, Motif, and CDE. diff --git a/xc/include/Xosdefs.h b/xc/include/Xosdefs.h index 12652cf60..84733d19a 100644 --- a/xc/include/Xosdefs.h +++ b/xc/include/Xosdefs.h @@ -1,7 +1,7 @@ /* * O/S-dependent (mis)feature macro definitions * - * $TOG: Xosdefs.h /main/17 1998/02/09 11:19:02 kaleb $ + * $Xorg: Xosdefs.h,v 1.4 2000/08/18 04:05:44 coskrey Exp $ * Copyright 1991, 1998 The Open Group @@ -21,7 +21,7 @@ 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. */ -/* $XFree86: xc/include/Xosdefs.h,v 3.14 1998/12/20 11:56:46 dawes Exp $ */ +/* $XFree86: xc/include/Xosdefs.h,v 3.16 2001/01/17 17:53:11 dawes Exp $ */ #ifndef _XOSDEFS_H_ #define _XOSDEFS_H_ @@ -77,14 +77,12 @@ in this Software without prior written authorization from The Open Group. #ifdef i386 #ifdef SYSV -#if !(defined(ISC) && defined(_POSIX_SOURCE)) -#ifndef SCO -#ifndef _SCO_DS /* SCO 5.0 has SVR4 header files */ +#if !defined(ISC) && !defined(SCO) && !defined(_SEQUENT_) +#if !defined(_POSIX_SOURCE) && !defined(_SCO_DS) #define X_NOT_POSIX #endif #define X_NOT_STDC_ENV #endif -#endif /* !(defined(ISC) && defined(_POSIX_SOURCE)) */ #endif #endif @@ -117,6 +115,10 @@ in this Software without prior written authorization from The Open Group. #define NULL_NOT_ZERO #endif +#ifdef __DARWIN__ +#define NULL_NOT_ZERO +#endif + #ifdef __GNU__ #define PATH_MAX 4096 #define MAXPATHLEN 4096 diff --git a/xc/include/Xpoll.h b/xc/include/Xpoll.h index 6ad335cb8..c678af2c0 100644 --- a/xc/include/Xpoll.h +++ b/xc/include/Xpoll.h @@ -1,4 +1,4 @@ -/* $TOG: Xpoll.h /main/8 1998/02/09 11:19:06 kaleb $ */ +/* $Xorg: Xpoll.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /* @@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/include/Xpoll.h,v 3.7 2000/09/19 12:46:05 eich Exp $ */ +/* $XFree86: xc/include/Xpoll.h,v 3.8 2001/01/17 17:53:11 dawes Exp $ */ #ifndef _XPOLL_H_ #define _XPOLL_H_ diff --git a/xc/include/Xproto.h b/xc/include/Xproto.h index 6ed0b5d3c..b745ffbdc 100644 --- a/xc/include/Xproto.h +++ b/xc/include/Xproto.h @@ -1,5 +1,5 @@ /* - * $TOG: Xproto.h /main/22 1998/02/09 11:19:10 kaleb $ + * $Xorg: Xproto.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /* Definitions for the X window system used by server and c bindings */ diff --git a/xc/include/Xprotostr.h b/xc/include/Xprotostr.h index 7ec7add06..27d78bda1 100644 --- a/xc/include/Xprotostr.h +++ b/xc/include/Xprotostr.h @@ -1,4 +1,4 @@ -/* $TOG: Xprotostr.h /main/6 1998/02/09 11:19:17 kaleb $ */ +/* $Xorg: Xprotostr.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ #ifndef XPROTOSTRUCTS_H #define XPROTOSTRUCTS_H diff --git a/xc/include/Xthreads.h b/xc/include/Xthreads.h index 1e697388d..abebb2010 100644 --- a/xc/include/Xthreads.h +++ b/xc/include/Xthreads.h @@ -1,5 +1,5 @@ /* - * $TOG: Xthreads.h /main/37 1998/02/09 11:19:20 kaleb $ + * $Xorg: Xthreads.h,v 1.4 2000/08/18 04:05:44 coskrey Exp $ * * Copyright 1993, 1998 The Open Group @@ -21,7 +21,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. * * */ -/* $XFree86: xc/include/Xthreads.h,v 3.7 2000/06/25 16:03:43 tsi Exp $ */ +/* $XFree86: xc/include/Xthreads.h,v 3.8 2001/01/17 17:53:12 dawes Exp $ */ #ifndef _XTHREADS_H_ #define _XTHREADS_H_ @@ -59,7 +59,7 @@ typedef struct mutex xmutex_rec; #define xcondition_broadcast(cv) condition_broadcast(cv) #define xcondition_set_name(cv,str) condition_set_name(cv,str) #else /* !CTHREADS */ -#if defined(SVR4) && !defined(__sgi) +#if defined(SVR4) && !defined(__sgi) && !defined(_SEQUENT_) #include <thread.h> #include <synch.h> typedef thread_t xthread_t; diff --git a/xc/include/Xw32defs.h b/xc/include/Xw32defs.h index 3fb3e4c0d..6b661c4c6 100644 --- a/xc/include/Xw32defs.h +++ b/xc/include/Xw32defs.h @@ -1,4 +1,4 @@ -/* $XConsortium: Xw32defs.h /main/5 1996/11/13 14:43:44 lehors $ */ +/* $Xorg: Xw32defs.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ #ifndef _XW32DEFS_H #define _XW32DEFS_H diff --git a/xc/include/Xwinsock.h b/xc/include/Xwinsock.h index 711bc8c01..6674f4674 100644 --- a/xc/include/Xwinsock.h +++ b/xc/include/Xwinsock.h @@ -1,4 +1,4 @@ -/* $TOG: Xwinsock.h /main/2 1998/02/09 11:19:29 kaleb $ */ +/* $Xorg: Xwinsock.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/xc/include/bitmaps/Imakefile b/xc/include/bitmaps/Imakefile index 013439efe..953d6d025 100644 --- a/xc/include/bitmaps/Imakefile +++ b/xc/include/bitmaps/Imakefile @@ -1,4 +1,4 @@ -XCOMM $XConsortium: Imakefile /main/32 1996/09/28 16:17:53 rws $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $ HEADERS = \ 1x1 \ diff --git a/xc/include/extensions/Imakefile b/xc/include/extensions/Imakefile index 2f84cc058..496bb4f38 100644 --- a/xc/include/extensions/Imakefile +++ b/xc/include/extensions/Imakefile @@ -1,5 +1,9 @@ -XCOMM $TOG: Imakefile /main/50 1997/11/24 16:47:55 kaleb $ -XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.36 2000/08/26 16:15:52 keithp Exp $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $ + + + + +XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.37 2001/01/17 17:53:15 dawes Exp $ #if BuildScreenSaverLibrary SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h diff --git a/xc/include/extensions/MITMisc.h b/xc/include/extensions/MITMisc.h index da919abba..039feffb7 100644 --- a/xc/include/extensions/MITMisc.h +++ b/xc/include/extensions/MITMisc.h @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. /* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */ -/* $TOG: MITMisc.h /main/6 1998/02/09 11:19:47 kaleb $ */ +/* $Xorg: MITMisc.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ #ifndef _XMITMISC_H_ #define _XMITMISC_H_ diff --git a/xc/include/extensions/Print.h b/xc/include/extensions/Print.h index 497923fe4..dc9c66d42 100644 --- a/xc/include/extensions/Print.h +++ b/xc/include/extensions/Print.h @@ -1,6 +1,4 @@ -/* $XFree86: xc/include/extensions/Print.h,v 1.4 2000/01/25 18:37:31 dawes Exp $ */ - -/* $XConsortium: Print.h /main/3 1996/12/10 14:59:02 rws $ */ +/* $Xorg: Print.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -59,6 +57,7 @@ ** ****************************************************************************** *****************************************************************************/ +/* $XFree86: xc/include/extensions/Print.h,v 1.5 2001/01/17 17:53:15 dawes Exp $ */ #ifndef _XpPrint_H_ #define _XpPrint_H_ diff --git a/xc/include/extensions/Printstr.h b/xc/include/extensions/Printstr.h index e3a38628c..32868bf0a 100644 --- a/xc/include/extensions/Printstr.h +++ b/xc/include/extensions/Printstr.h @@ -1,6 +1,4 @@ -/* $XFree86: xc/include/extensions/Printstr.h,v 1.3 1999/12/16 02:26:32 robin Exp $ */ - -/* $XConsortium: Printstr.h /main/2 1996/11/16 15:20:15 rws $ */ +/* $Xorg: Printstr.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /****************************************************************************** ****************************************************************************** ** @@ -45,6 +43,7 @@ ** ****************************************************************************** *****************************************************************************/ +/* $XFree86: xc/include/extensions/Printstr.h,v 1.4 2001/01/17 17:53:16 dawes Exp $ */ #ifndef _XpPrintstr_H_ diff --git a/xc/include/extensions/XEVI.h b/xc/include/extensions/XEVI.h index 71a9eaca8..988f42e5e 100644 --- a/xc/include/extensions/XEVI.h +++ b/xc/include/extensions/XEVI.h @@ -1,4 +1,4 @@ -/* $TOG: XEVI.h /main/1 1997/11/24 16:48:01 kaleb $ */ +/* $Xorg: XEVI.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /************************************************************ Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc. Permission to use, copy, modify, and distribute this diff --git a/xc/include/extensions/XEVIstr.h b/xc/include/extensions/XEVIstr.h index d41b929ed..234db7f72 100644 --- a/xc/include/extensions/XEVIstr.h +++ b/xc/include/extensions/XEVIstr.h @@ -1,4 +1,4 @@ -/* $TOG: XEVIstr.h /main/2 1997/12/11 18:46:06 kaleb $ */ +/* $Xorg: XEVIstr.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /************************************************************ Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc. Permission to use, copy, modify, and distribute this diff --git a/xc/include/extensions/XI.h b/xc/include/extensions/XI.h index f92bba332..4c2888fbb 100644 --- a/xc/include/extensions/XI.h +++ b/xc/include/extensions/XI.h @@ -1,4 +1,4 @@ -/* $TOG: XI.h /main/17 1998/02/09 11:20:09 kaleb $ */ +/* $Xorg: XI.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /************************************************************ @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XI.h,v 1.3 1998/12/06 13:30:37 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XI.h,v 1.4 2001/01/17 17:53:16 dawes Exp $ */ /* Definitions used by the server, library and client */ diff --git a/xc/include/extensions/XIE.h b/xc/include/extensions/XIE.h index 1fa7b583b..4a6158075 100644 --- a/xc/include/extensions/XIE.h +++ b/xc/include/extensions/XIE.h @@ -1,4 +1,4 @@ -/* $TOG: XIE.h /main/6 1998/02/09 11:20:14 kaleb $ */ +/* $Xorg: XIE.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /****************************************************************************** diff --git a/xc/include/extensions/XIEproto.h b/xc/include/extensions/XIEproto.h index aebf0b32d..8c7ae8134 100644 --- a/xc/include/extensions/XIEproto.h +++ b/xc/include/extensions/XIEproto.h @@ -1,4 +1,4 @@ -/* $TOG: XIEproto.h /main/7 1998/02/09 11:20:18 kaleb $ */ +/* $Xorg: XIEproto.h,v 1.5 2000/08/18 04:05:45 coskrey Exp $ */ /****************************************************************************** Copyright 1993, 1994, 1998 The Open Group @@ -577,7 +577,11 @@ typedef struct { CARD32 nameSpace B32; xieTypPhototag phototag B16; CARD16 type B16; +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_operator; +#else CARD8 operator; +#endif CARD8 pad[11]; } xieFloOperatorErr; diff --git a/xc/include/extensions/XIEprotost.h b/xc/include/extensions/XIEprotost.h index 8b48251ce..382ebb201 100644 --- a/xc/include/extensions/XIEprotost.h +++ b/xc/include/extensions/XIEprotost.h @@ -1,4 +1,4 @@ -/* $TOG: XIEprotost.h /main/7 1998/02/09 11:20:23 kaleb $ */ +/* $Xorg: XIEprotost.h,v 1.6 2000/08/18 04:05:45 coskrey Exp $ */ /****************************************************************************** @@ -228,7 +228,11 @@ typedef struct { typedef struct { CARD16 elemType B16; CARD16 elemLength B16; +#if defined(__cplusplus) || defined(c_plusplus) + xieTypDataClass c_class; +#else xieTypDataClass class; +#endif xieTypOrientation bandOrder; CARD16 pad B16; CARD32 length0 B32; @@ -243,7 +247,11 @@ typedef struct { CARD16 elemType B16; CARD16 elemLength B16; BOOL notify; +#if defined(__cplusplus) || defined(c_plusplus) + xieTypDataClass c_class; +#else xieTypDataClass class; +#endif CARD16 pad B16; CARD32 width0 B32; CARD32 width1 B32; @@ -324,7 +332,11 @@ typedef struct { INT32 domainOffsetX B32; INT32 domainOffsetY B32; xieTypPhototag domainPhototag B16; +#if defined(__cplusplus) || defined(c_plusplus) + xieTypArithmeticOp c_operator; +#else xieTypArithmeticOp operator; +#endif CARD8 bandMask; xieTypFloat constant0 B32; xieTypFloat constant1 B32; @@ -386,7 +398,11 @@ typedef struct { INT32 domainOffsetX B32; INT32 domainOffsetY B32; xieTypPhototag domainPhototag B16; +#if defined(__cplusplus) || defined(c_plusplus) + xieTypCompareOp c_operator; +#else xieTypCompareOp operator; +#endif BOOL combine; xieTypFloat constant0 B32; xieTypFloat constant1 B32; @@ -412,7 +428,11 @@ typedef struct { CARD16 elemType B16; CARD16 elemLength B16; xieTypPhototag src B16; +#if defined(__cplusplus) || defined(c_plusplus) + xieTypDataClass c_class; +#else xieTypDataClass class; +#endif CARD8 precision; Colormap colormap B32; } xieFloConvertFromIndex; @@ -510,7 +530,11 @@ typedef struct { INT32 domainOffsetX B32; INT32 domainOffsetY B32; xieTypPhototag domainPhototag B16; +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_operator; +#else CARD8 operator; +#endif CARD8 bandMask; xieTypFloat constant0 B32; xieTypFloat constant1 B32; @@ -539,7 +563,11 @@ typedef struct { INT32 domainOffsetX B32; INT32 domainOffsetY B32; xieTypPhototag domainPhototag B16; +#if defined(__cplusplus) || defined(c_plusplus) + xieTypMathOp c_operator; +#else xieTypMathOp operator; +#endif CARD8 bandMask; } xieFloMath; diff --git a/xc/include/extensions/XInput.h b/xc/include/extensions/XInput.h index 93b1fbbb1..b0b98ebbd 100644 --- a/xc/include/extensions/XInput.h +++ b/xc/include/extensions/XInput.h @@ -1,4 +1,4 @@ -/* $TOG: XInput.h /main/24 1998/04/30 15:56:44 kaleb $ */ +/* $Xorg: XInput.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /************************************************************ diff --git a/xc/include/extensions/XIproto.h b/xc/include/extensions/XIproto.h index b781a225a..437bb0e69 100644 --- a/xc/include/extensions/XIproto.h +++ b/xc/include/extensions/XIproto.h @@ -1,4 +1,4 @@ -/* $TOG: XIproto.h /main/27 1998/02/09 11:20:33 kaleb $ */ +/* $Xorg: XIproto.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */ /************************************************************ @@ -41,7 +41,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XIproto.h,v 1.3 1998/12/06 13:30:38 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XIproto.h,v 1.4 2001/01/17 17:53:17 dawes Exp $ */ #ifndef _XIPROTO_H #define _XIPROTO_H @@ -214,7 +214,11 @@ typedef struct _xDeviceInfo *xDeviceInfoPtr; typedef struct _xAnyClassinfo *xAnyClassPtr; typedef struct _xAnyClassinfo { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; +#else CARD8 class; +#endif CARD8 length; } xAnyClassInfo; @@ -229,7 +233,11 @@ typedef struct _xDeviceInfo { typedef struct _xKeyInfo *xKeyInfoPtr; typedef struct _xKeyInfo { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; +#else CARD8 class; +#endif CARD8 length; KeyCode min_keycode; KeyCode max_keycode; @@ -240,7 +248,11 @@ typedef struct _xKeyInfo { typedef struct _xButtonInfo *xButtonInfoPtr; typedef struct _xButtonInfo { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; +#else CARD8 class; +#endif CARD8 length; CARD16 num_buttons B16; } xButtonInfo; @@ -248,7 +260,11 @@ typedef struct _xButtonInfo { typedef struct _xValuatorInfo *xValuatorInfoPtr; typedef struct _xValuatorInfo { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; +#else CARD8 class; +#endif CARD8 length; CARD8 num_axes; CARD8 mode; @@ -292,7 +308,11 @@ typedef struct { } xOpenDeviceReply; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; +#else CARD8 class; +#endif CARD8 event_type_base; } xInputClassInfo; @@ -732,13 +752,21 @@ typedef struct { } xGetFeedbackControlReply; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; /* feedback class */ +#else CARD8 class; /* feedback class */ +#endif CARD8 id; /* feedback id */ CARD16 length B16; /* feedback length */ } xFeedbackState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; +#else CARD8 class; +#endif CARD8 id; CARD16 length B16; CARD16 pitch B16; @@ -753,7 +781,11 @@ typedef struct { } xKbdFeedbackState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; +#else CARD8 class; +#endif CARD8 id; CARD16 length B16; CARD8 pad1,pad2; @@ -763,7 +795,11 @@ typedef struct { } xPtrFeedbackState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; /* feedback class id */ +#else CARD8 class; /* feedback class id */ +#endif CARD8 id; CARD16 length B16; /* feedback length */ CARD32 resolution B32; @@ -772,7 +808,11 @@ typedef struct { } xIntegerFeedbackState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; /* feedback class id */ +#else CARD8 class; /* feedback class id */ +#endif CARD8 id; CARD16 length B16; /* feedback length */ CARD16 max_symbols B16; @@ -780,7 +820,11 @@ typedef struct { } xStringFeedbackState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; /* feedback class id */ +#else CARD8 class; /* feedback class id */ +#endif CARD8 id; CARD16 length B16; /* feedback length */ CARD8 percent; @@ -790,7 +834,11 @@ typedef struct { } xBellFeedbackState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; /* feedback class id */ +#else CARD8 class; /* feedback class id */ +#endif CARD8 id; CARD16 length B16; /* feedback length */ CARD32 led_mask B32; @@ -814,13 +862,21 @@ typedef struct { } xChangeFeedbackControlReq; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; /* feedback class id */ +#else CARD8 class; /* feedback class id */ +#endif CARD8 id; /* feedback id */ CARD16 length B16; /* feedback length */ } xFeedbackCtl; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; /* feedback class id */ +#else CARD8 class; /* feedback class id */ +#endif CARD8 id; /* feedback length */ CARD16 length B16; /* feedback length */ KeyCode key; @@ -834,7 +890,11 @@ typedef struct { } xKbdFeedbackCtl; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; /* feedback class id */ +#else CARD8 class; /* feedback class id */ +#endif CARD8 id; /* feedback id */ CARD16 length B16; /* feedback length */ CARD8 pad1,pad2; @@ -844,14 +904,22 @@ typedef struct { } xPtrFeedbackCtl; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; /* feedback class id */ +#else CARD8 class; /* feedback class id */ +#endif CARD8 id; /* feedback id */ CARD16 length B16; /* feedback length */ INT32 int_to_display B32; } xIntegerFeedbackCtl; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; /* feedback class id */ +#else CARD8 class; /* feedback class id */ +#endif CARD8 id; /* feedback id */ CARD16 length B16; /* feedback length */ CARD8 pad1,pad2; @@ -859,7 +927,11 @@ typedef struct { } xStringFeedbackCtl; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; /* feedback class id */ +#else CARD8 class; /* feedback class id */ +#endif CARD8 id; /* feedback id */ CARD16 length B16; /* feedback length */ INT8 percent; @@ -869,7 +941,11 @@ typedef struct { } xBellFeedbackCtl; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; /* feedback class id */ +#else CARD8 class; /* feedback class id */ +#endif CARD8 id; /* feedback id */ CARD16 length B16; /* feedback length */ CARD32 led_mask B32; @@ -1070,7 +1146,11 @@ typedef struct { } xQueryDeviceStateReply; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; +#else CARD8 class; +#endif CARD8 length; CARD8 num_keys; BYTE pad1; @@ -1078,7 +1158,11 @@ typedef struct { } xKeyState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; +#else CARD8 class; +#endif CARD8 length; CARD8 num_buttons; BYTE pad1; @@ -1086,7 +1170,11 @@ typedef struct { } xButtonState; typedef struct { +#if defined(__cplusplus) || defined(c_plusplus) + CARD8 c_class; +#else CARD8 class; +#endif CARD8 length; CARD8 num_valuators; CARD8 mode; diff --git a/xc/include/extensions/XKB.h b/xc/include/extensions/XKB.h index e89d9e6cc..1b427e3e3 100644 --- a/xc/include/extensions/XKB.h +++ b/xc/include/extensions/XKB.h @@ -1,4 +1,4 @@ -/* $XConsortium: XKB.h /main/14 1996/02/05 10:19:11 kaleb $ */ +/* $Xorg: XKB.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XKB.h,v 1.3 2000/10/24 22:45:01 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XKB.h,v 1.4 2001/01/17 17:53:17 dawes Exp $ */ #ifndef _XKB_H_ #define _XKB_H_ diff --git a/xc/include/extensions/XKBgeom.h b/xc/include/extensions/XKBgeom.h index 217d60edf..a07c7b238 100644 --- a/xc/include/extensions/XKBgeom.h +++ b/xc/include/extensions/XKBgeom.h @@ -1,4 +1,4 @@ -/* $XConsortium: XKBgeom.h /main/7 1996/03/06 21:40:11 kaleb $ */ +/* $Xorg: XKBgeom.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.6 1999/03/14 03:20:35 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XKBgeom.h,v 3.7 2001/01/17 17:53:17 dawes Exp $ */ #ifndef _XKBGEOM_H_ #define _XKBGEOM_H_ diff --git a/xc/include/extensions/XKBproto.h b/xc/include/extensions/XKBproto.h index 82742bd11..97dd4d262 100644 --- a/xc/include/extensions/XKBproto.h +++ b/xc/include/extensions/XKBproto.h @@ -1,4 +1,4 @@ -/* $XConsortium: XKBproto.h /main/22 1996/09/28 16:18:24 rws $ */ +/* $Xorg: XKBproto.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. diff --git a/xc/include/extensions/XKBsrv.h b/xc/include/extensions/XKBsrv.h index 64b026df8..eb8cfcc0e 100644 --- a/xc/include/extensions/XKBsrv.h +++ b/xc/include/extensions/XKBsrv.h @@ -1,4 +1,4 @@ -/* $XConsortium: XKBsrv.h /main/25 1996/09/28 16:32:19 rws $ */ +/* $Xorg: XKBsrv.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.17 2000/08/26 15:11:23 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XKBsrv.h,v 3.18 2001/01/17 17:53:18 dawes Exp $ */ #ifndef _XKBSRV_H_ #define _XKBSRV_H_ diff --git a/xc/include/extensions/XKBstr.h b/xc/include/extensions/XKBstr.h index 29fde0a0e..bc63f4923 100644 --- a/xc/include/extensions/XKBstr.h +++ b/xc/include/extensions/XKBstr.h @@ -1,4 +1,4 @@ -/* $TOG: XKBstr.h /main/16 1997/06/10 06:53:12 kaleb $ */ +/* $Xorg: XKBstr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. diff --git a/xc/include/extensions/XLbx.h b/xc/include/extensions/XLbx.h index 15147212a..45ed1e9c5 100644 --- a/xc/include/extensions/XLbx.h +++ b/xc/include/extensions/XLbx.h @@ -1,4 +1,4 @@ -/* $XConsortium: XLbx.h /main/21 1996/12/15 21:23:54 rws $ */ +/* $Xorg: XLbx.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /* * Copyright 1992 Network Computing Devices * diff --git a/xc/include/extensions/XShm.h b/xc/include/extensions/XShm.h index 2e8d26050..2cea37154 100644 --- a/xc/include/extensions/XShm.h +++ b/xc/include/extensions/XShm.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/XShm.h,v 1.4 1999/04/29 09:13:26 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XShm.h,v 1.5 2001/01/17 17:53:19 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group. /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ -/* $TOG: XShm.h /main/9 1998/02/09 11:21:08 kaleb $ */ +/* $Xorg: XShm.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ #ifndef _XSHM_H_ #define _XSHM_H_ diff --git a/xc/include/extensions/XTest.h b/xc/include/extensions/XTest.h index b878cccbb..70049e9e6 100644 --- a/xc/include/extensions/XTest.h +++ b/xc/include/extensions/XTest.h @@ -1,4 +1,4 @@ -/* $TOG: XTest.h /main/10 1998/02/09 11:21:12 kaleb $ */ +/* $Xorg: XTest.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */ /* Copyright 1992, 1998 The Open Group @@ -20,7 +20,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. */ -/* $XFree86: xc/include/extensions/XTest.h,v 3.1 1998/10/02 07:39:15 dawes Exp $ */ +/* $XFree86: xc/include/extensions/XTest.h,v 3.2 2001/01/17 17:53:19 dawes Exp $ */ #ifndef _XTEST_H_ #define _XTEST_H_ diff --git a/xc/include/extensions/Xag.h b/xc/include/extensions/Xag.h index fdad35f49..43f73140e 100644 --- a/xc/include/extensions/Xag.h +++ b/xc/include/extensions/Xag.h @@ -19,7 +19,7 @@ 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. */ -/* $TOG: Xag.h /main/3 1998/02/09 11:21:17 kaleb $ */ +/* $Xorg: Xag.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ #ifndef _XAG_H_ #define _XAG_H_ diff --git a/xc/include/extensions/Xagsrv.h b/xc/include/extensions/Xagsrv.h index ca1be1b26..807685a16 100644 --- a/xc/include/extensions/Xagsrv.h +++ b/xc/include/extensions/Xagsrv.h @@ -19,7 +19,7 @@ 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. */ -/* $TOG: Xagsrv.h /main/8 1998/02/09 11:21:22 kaleb $ */ +/* $Xorg: Xagsrv.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ #ifndef _XAGSRV_H_ #define _XAGSRV_H_ diff --git a/xc/include/extensions/Xagstr.h b/xc/include/extensions/Xagstr.h index 03d56a894..50f6cf841 100644 --- a/xc/include/extensions/Xagstr.h +++ b/xc/include/extensions/Xagstr.h @@ -19,7 +19,7 @@ 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. */ -/* $TOG: Xagstr.h /main/4 1998/02/09 11:21:26 kaleb $ */ +/* $Xorg: Xagstr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ #ifndef _XAGSTR_H_ /* { */ #define _XAGSTR_H_ diff --git a/xc/include/extensions/Xcup.h b/xc/include/extensions/Xcup.h index 642f3e58d..c5912f91c 100644 --- a/xc/include/extensions/Xcup.h +++ b/xc/include/extensions/Xcup.h @@ -1,4 +1,4 @@ -/* $TOG: Xcup.h /main/3 1998/02/09 11:21:30 kaleb $ */ +/* $Xorg: Xcup.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /* Copyright 1987, 1988, 1998 The Open Group diff --git a/xc/include/extensions/Xcupstr.h b/xc/include/extensions/Xcupstr.h index 1c47cb26a..b6f370481 100644 --- a/xc/include/extensions/Xcupstr.h +++ b/xc/include/extensions/Xcupstr.h @@ -1,4 +1,4 @@ -/* $TOG: Xcupstr.h /main/3 1998/02/09 11:21:34 kaleb $ */ +/* $Xorg: Xcupstr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /* diff --git a/xc/include/extensions/Xdbe.h b/xc/include/extensions/Xdbe.h index ef38fd389..8de47dbe3 100644 --- a/xc/include/extensions/Xdbe.h +++ b/xc/include/extensions/Xdbe.h @@ -1,4 +1,4 @@ -/* $XConsortium: Xdbe.h /main/3 1995/09/22 10:20:01 dpw $ */ +/* $Xorg: Xdbe.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /****************************************************************************** * * Copyright (c) 1994, 1995 Hewlett-Packard Company diff --git a/xc/include/extensions/Xdbeproto.h b/xc/include/extensions/Xdbeproto.h index e347373b0..8a8c55522 100644 --- a/xc/include/extensions/Xdbeproto.h +++ b/xc/include/extensions/Xdbeproto.h @@ -1,4 +1,4 @@ -/* $XConsortium: Xdbeproto.h /main/3 1995/09/22 10:20:16 dpw $ */ +/* $Xorg: Xdbeproto.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /****************************************************************************** * * Copyright (c) 1994, 1995 Hewlett-Packard Company diff --git a/xc/include/extensions/Xext.h b/xc/include/extensions/Xext.h index 2aedf17b4..e7dc8faf1 100644 --- a/xc/include/extensions/Xext.h +++ b/xc/include/extensions/Xext.h @@ -1,5 +1,5 @@ /* - * $TOG: Xext.h /main/5 1998/02/09 11:21:47 kaleb $ + * $Xorg: Xext.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ * Copyright 1989, 1998 The Open Group diff --git a/xc/include/extensions/bigreqstr.h b/xc/include/extensions/bigreqstr.h index db9f64103..4bb2d3172 100644 --- a/xc/include/extensions/bigreqstr.h +++ b/xc/include/extensions/bigreqstr.h @@ -1,4 +1,4 @@ -/* $TOG: bigreqstr.h /main/6 1998/02/09 11:21:51 kaleb $ */ +/* $Xorg: bigreqstr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /* Copyright 1992, 1998 The Open Group diff --git a/xc/include/extensions/dpms.h b/xc/include/extensions/dpms.h index 7fe645b06..0e5901c15 100644 --- a/xc/include/extensions/dpms.h +++ b/xc/include/extensions/dpms.h @@ -1,4 +1,4 @@ -/* $TOG: dpms.h /main/1 1997/11/12 14:36:52 kaleb $ */ +/* $Xorg: dpms.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /***************************************************************** Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts. @@ -26,7 +26,7 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/include/extensions/dpms.h,v 3.4 2000/03/15 16:51:51 tsi Exp $ */ +/* $XFree86: xc/include/extensions/dpms.h,v 3.5 2001/01/17 17:53:20 dawes Exp $ */ /* * HISTORY diff --git a/xc/include/extensions/dpmsstr.h b/xc/include/extensions/dpmsstr.h index f77b65b26..0ec015706 100644 --- a/xc/include/extensions/dpmsstr.h +++ b/xc/include/extensions/dpmsstr.h @@ -1,4 +1,4 @@ -/* $TOG: dpmsstr.h /main/1 1997/11/12 14:36:58 kaleb $ */ +/* $Xorg: dpmsstr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /***************************************************************** Copyright (c) 1996 Digital Equipment Corporation, Maynard, Massachusetts. diff --git a/xc/include/extensions/extutil.h b/xc/include/extensions/extutil.h index 0107c2d36..0dff75638 100644 --- a/xc/include/extensions/extutil.h +++ b/xc/include/extensions/extutil.h @@ -1,5 +1,5 @@ /* - * $TOG: extutil.h /main/16 1998/02/09 11:22:04 kaleb $ + * $Xorg: extutil.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ * Copyright 1989, 1998 The Open Group @@ -27,7 +27,7 @@ in this Software without prior written authorization from The Open Group. * protocol extensions. THESE INTERFACES ARE NOT PART OF THE X STANDARD AND * ARE SUBJECT TO CHANGE! */ -/* $XFree86: xc/include/extensions/extutil.h,v 1.4 2000/09/26 15:56:45 tsi Exp $ */ +/* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */ #ifndef _EXTUTIL_H_ #define _EXTUTIL_H_ diff --git a/xc/include/extensions/lbxbuf.h b/xc/include/extensions/lbxbuf.h index 3405962de..2391c1b85 100644 --- a/xc/include/extensions/lbxbuf.h +++ b/xc/include/extensions/lbxbuf.h @@ -1,4 +1,4 @@ -/* $XConsortium: lbxbuf.h /main/7 1996/11/15 21:33:12 rws $ */ +/* $Xorg: lbxbuf.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /* * Copyright 1988, 1989, 1990, 1994 Network Computing Devices, Inc. * diff --git a/xc/include/extensions/lbxbufstr.h b/xc/include/extensions/lbxbufstr.h index 97f07a6aa..8eefa267c 100644 --- a/xc/include/extensions/lbxbufstr.h +++ b/xc/include/extensions/lbxbufstr.h @@ -1,4 +1,4 @@ -/* $XConsortium: lbxbufstr.h /main/8 1996/11/15 21:33:20 rws $ */ +/* $Xorg: lbxbufstr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /* * Copyright 1988, 1989, 1990, 1994 Network Computing Devices, Inc. * diff --git a/xc/include/extensions/lbxdeltastr.h b/xc/include/extensions/lbxdeltastr.h index ec50f2f08..a8e4cb3b0 100644 --- a/xc/include/extensions/lbxdeltastr.h +++ b/xc/include/extensions/lbxdeltastr.h @@ -1,4 +1,4 @@ -/* $XConsortium: lbxdeltastr.h /main/7 1996/12/15 21:24:04 rws $ */ +/* $Xorg: lbxdeltastr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /* * Copyright 1993 Network Computing Devices * diff --git a/xc/include/extensions/lbximage.h b/xc/include/extensions/lbximage.h index 37e25f77c..61f5f247e 100644 --- a/xc/include/extensions/lbximage.h +++ b/xc/include/extensions/lbximage.h @@ -1,4 +1,4 @@ -/* $TOG: lbximage.h /main/7 1998/02/09 11:22:21 kaleb $ */ +/* $Xorg: lbximage.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /****************************************************************************** diff --git a/xc/include/extensions/lbxopts.h b/xc/include/extensions/lbxopts.h index d96e3c6db..f46f4efdc 100644 --- a/xc/include/extensions/lbxopts.h +++ b/xc/include/extensions/lbxopts.h @@ -1,4 +1,4 @@ -/* $XConsortium: lbxopts.h /main/9 1996/11/15 21:33:35 rws $ */ +/* $Xorg: lbxopts.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /* * Copyright 1994 Network Computing Devices, Inc. * @@ -21,7 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/include/extensions/lbxopts.h,v 1.4 2000/05/18 23:46:11 dawes Exp $ */ +/* $XFree86: xc/include/extensions/lbxopts.h,v 1.5 2001/01/17 17:53:21 dawes Exp $ */ #ifndef _LBX_OPTS_H_ #define _LBX_OPTS_H_ diff --git a/xc/include/extensions/lbxstr.h b/xc/include/extensions/lbxstr.h index b5858ad42..f1b344370 100644 --- a/xc/include/extensions/lbxstr.h +++ b/xc/include/extensions/lbxstr.h @@ -1,4 +1,4 @@ -/* $XConsortium: lbxstr.h /main/27 1996/12/15 21:24:11 rws $ */ +/* $Xorg: lbxstr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /* * Copyright 1992 Network Computing Devices * diff --git a/xc/include/extensions/lbxzlib.h b/xc/include/extensions/lbxzlib.h index e5913f0a8..dc21837a1 100644 --- a/xc/include/extensions/lbxzlib.h +++ b/xc/include/extensions/lbxzlib.h @@ -1,4 +1,4 @@ -/* $XConsortium: lbxzlib.h /main/2 1996/10/27 15:39:45 rws $ */ +/* $Xorg: lbxzlib.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ /* * Copyright 1993 Network Computing Devices * diff --git a/xc/include/extensions/mitmiscstr.h b/xc/include/extensions/mitmiscstr.h index 6b6090273..613772b70 100644 --- a/xc/include/extensions/mitmiscstr.h +++ b/xc/include/extensions/mitmiscstr.h @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. /* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */ -/* $TOG: mitmiscstr.h /main/5 1998/02/09 11:22:38 kaleb $ */ +/* $Xorg: mitmiscstr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */ #include "MITMisc.h" diff --git a/xc/include/extensions/multibuf.h b/xc/include/extensions/multibuf.h index 1250edfb0..45719d55e 100644 --- a/xc/include/extensions/multibuf.h +++ b/xc/include/extensions/multibuf.h @@ -1,5 +1,5 @@ /* - * $TOG: multibuf.h /main/19 1998/02/09 11:22:42 kaleb $ + * $Xorg: multibuf.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ * Copyright 1989, 1998 The Open Group @@ -20,7 +20,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. */ -/* $XFree86: xc/include/extensions/multibuf.h,v 3.2 1999/01/31 12:21:17 dawes Exp $ */ +/* $XFree86: xc/include/extensions/multibuf.h,v 3.3 2001/01/17 17:53:21 dawes Exp $ */ #ifndef _MULTIBUF_H_ #define _MULTIBUF_H_ diff --git a/xc/include/extensions/multibufst.h b/xc/include/extensions/multibufst.h index 6ac50f42c..8cbc99929 100644 --- a/xc/include/extensions/multibufst.h +++ b/xc/include/extensions/multibufst.h @@ -1,5 +1,5 @@ /* - * $TOG: multibufst.h /main/17 1998/02/09 11:22:47 kaleb $ + * $Xorg: multibufst.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ * Copyright 1989, 1998 The Open Group @@ -20,7 +20,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. */ -/* $XFree86: xc/include/extensions/multibufst.h,v 3.4 1999/01/31 12:21:17 dawes Exp $ */ +/* $XFree86: xc/include/extensions/multibufst.h,v 3.5 2001/01/17 17:53:22 dawes Exp $ */ #ifndef _MULTIBUFST_H_ #define _MULTIBUFST_H_ diff --git a/xc/include/extensions/panoramiXext.h b/xc/include/extensions/panoramiXext.h index 10444b822..29f157b48 100644 --- a/xc/include/extensions/panoramiXext.h +++ b/xc/include/extensions/panoramiXext.h @@ -1,28 +1,32 @@ -/* $TOG: panoramiXext.h /main/3 1998/02/13 13:08:51 kaleb $ */ -/**************************************************************** -* * -* Copyright (c) Digital Equipment Corporation, 1991, 1997 * -* * -* All Rights Reserved. Unpublished rights reserved under * -* the copyright laws of the United States. * -* * -* The software contained on this media is proprietary to * -* and embodies the confidential technology of Digital * -* Equipment Corporation. Possession, use, duplication or * -* dissemination of the software and media is authorized only * -* pursuant to a valid written license from Digital Equipment * -* Corporation. * -* * -* RESTRICTED RIGHTS LEGEND Use, duplication, or disclosure * -* by the U.S. Government is subject to restrictions as set * -* forth in Subparagraph (c)(1)(ii) of DFARS 252.227-7013, * -* or in FAR 52.227-19, as applicable. * -* * -*****************************************************************/ +/* $Xorg: panoramiXext.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */ +/***************************************************************** +Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software. + +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 +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 +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 +Equipment Corporation. +******************************************************************/ /* * PanoramiX definitions */ -/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */ +/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/xc/include/extensions/panoramiXproto.h b/xc/include/extensions/panoramiXproto.h index 577c9fa50..fe3826eb3 100644 --- a/xc/include/extensions/panoramiXproto.h +++ b/xc/include/extensions/panoramiXproto.h @@ -1,25 +1,29 @@ -/* $TOG: panoramiXproto.h /main/4 1998/02/13 13:08:58 kaleb $ */ -/**************************************************************** -* * -* Copyright (c) Digital Equipment Corporation, 1991, 1997 * -* * -* All Rights Reserved. Unpublished rights reserved under * -* the copyright laws of the United States. * -* * -* The software contained on this media is proprietary to * -* and embodies the confidential technology of Digital * -* Equipment Corporation. Possession, use, duplication or * -* dissemination of the software and media is authorized only * -* pursuant to a valid written license from Digital Equipment * -* Corporation. * -* * -* RESTRICTED RIGHTS LEGEND Use, duplication, or disclosure * -* by the U.S. Government is subject to restrictions as set * -* forth in Subparagraph (c)(1)(ii) of DFARS 252.227-7013, * -* or in FAR 52.227-19, as applicable. * -* * -*****************************************************************/ -/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */ +/* $Xorg: panoramiXproto.h,v 1.4 2000/08/18 04:05:45 coskrey Exp $ */ +/***************************************************************** +Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software. + +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 +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 +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 +Equipment Corporation. +******************************************************************/ +/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */ /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */ diff --git a/xc/include/extensions/record.h b/xc/include/extensions/record.h index 05c7d6e67..9234404c6 100644 --- a/xc/include/extensions/record.h +++ b/xc/include/extensions/record.h @@ -1,5 +1,5 @@ /* -$XConsortium: record.h /main/4 1996/01/31 20:28:22 dpw $ +$Xorg: record.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ /*************************************************************************** diff --git a/xc/include/extensions/recordstr.h b/xc/include/extensions/recordstr.h index fe1dd1982..bfd30286e 100644 --- a/xc/include/extensions/recordstr.h +++ b/xc/include/extensions/recordstr.h @@ -1,6 +1,6 @@ /* #ifndef lint -$XConsortium: recordstr.h /main/2 1996/01/09 18:15:19 gildea $ +$Xorg: recordstr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44"; #endif */ diff --git a/xc/include/extensions/renderproto.h b/xc/include/extensions/renderproto.h index 9b7433115..f8cbafb89 100644 --- a/xc/include/extensions/renderproto.h +++ b/xc/include/extensions/renderproto.h @@ -1,5 +1,5 @@ /* - * $XFree86: xc/include/extensions/renderproto.h,v 1.5 2000/11/20 07:13:09 keithp Exp $ + * $XFree86: xc/include/extensions/renderproto.h,v 1.6 2001/01/21 21:19:08 tsi Exp $ * * Copyright © 2000 SuSE, Inc. * @@ -26,6 +26,7 @@ #ifndef _XRENDERP_H_ #define _XRENDERP_H_ +#include <X11/Xmd.h> #include "render.h" #define Window CARD32 diff --git a/xc/include/extensions/security.h b/xc/include/extensions/security.h index 79d7fc2b3..5fb9c6598 100644 --- a/xc/include/extensions/security.h +++ b/xc/include/extensions/security.h @@ -1,4 +1,4 @@ -/* $TOG: security.h /main/7 1998/02/09 11:23:13 kaleb $ */ +/* $Xorg: security.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/xc/include/extensions/securstr.h b/xc/include/extensions/securstr.h index 4901aa4a5..a3ae07ed6 100644 --- a/xc/include/extensions/securstr.h +++ b/xc/include/extensions/securstr.h @@ -1,4 +1,4 @@ -/* $TOG: securstr.h /main/5 1998/02/09 11:23:18 kaleb $ */ +/* $Xorg: securstr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/xc/include/extensions/shape.h b/xc/include/extensions/shape.h index c0d2446be..699712a57 100644 --- a/xc/include/extensions/shape.h +++ b/xc/include/extensions/shape.h @@ -20,7 +20,7 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $TOG: shape.h /main/18 1998/02/09 11:23:22 kaleb $ */ +/* $Xorg: shape.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ #ifndef _SHAPE_H_ #define _SHAPE_H_ diff --git a/xc/include/extensions/shapestr.h b/xc/include/extensions/shapestr.h index e8df32311..d952d98af 100644 --- a/xc/include/extensions/shapestr.h +++ b/xc/include/extensions/shapestr.h @@ -20,7 +20,7 @@ in this Software without prior written authorization from The Open Group. ********************************************************/ -/* $TOG: shapestr.h /main/14 1998/02/09 11:23:26 kaleb $ */ +/* $Xorg: shapestr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ #ifndef _SHAPESTR_H_ #define _SHAPESTR_H_ diff --git a/xc/include/extensions/shmstr.h b/xc/include/extensions/shmstr.h index 3feba51dd..687961001 100644 --- a/xc/include/extensions/shmstr.h +++ b/xc/include/extensions/shmstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/shmstr.h,v 3.1 1998/10/02 07:39:18 dawes Exp $ */ +/* $XFree86: xc/include/extensions/shmstr.h,v 3.2 2001/01/17 17:53:22 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _SHMSTR_H_ #define _SHMSTR_H_ -/* $TOG: shmstr.h /main/11 1998/02/09 11:23:31 kaleb $ */ +/* $Xorg: shmstr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ #include "XShm.h" diff --git a/xc/include/extensions/sync.h b/xc/include/extensions/sync.h index c52cd175e..d807c3bc4 100644 --- a/xc/include/extensions/sync.h +++ b/xc/include/extensions/sync.h @@ -1,4 +1,4 @@ -/* $TOG: sync.h /main/7 1998/02/09 11:23:35 kaleb $ */ +/* $Xorg: sync.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ /* Copyright 1991, 1993, 1994, 1998 The Open Group diff --git a/xc/include/extensions/syncstr.h b/xc/include/extensions/syncstr.h index 20d7f19b0..a0f43b637 100644 --- a/xc/include/extensions/syncstr.h +++ b/xc/include/extensions/syncstr.h @@ -1,4 +1,4 @@ -/* $TOG: syncstr.h /main/5 1998/02/09 11:23:39 kaleb $ */ +/* $Xorg: syncstr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ /* Copyright 1991, 1993, 1994, 1998 The Open Group diff --git a/xc/include/extensions/xcmiscstr.h b/xc/include/extensions/xcmiscstr.h index 7602147bc..cd15f384c 100644 --- a/xc/include/extensions/xcmiscstr.h +++ b/xc/include/extensions/xcmiscstr.h @@ -1,4 +1,4 @@ -/* $TOG: xcmiscstr.h /main/5 1998/02/09 11:23:44 kaleb $ */ +/* $Xorg: xcmiscstr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ /* Copyright 1993, 1994, 1998 The Open Group diff --git a/xc/include/extensions/xf86dgastr.h b/xc/include/extensions/xf86dgastr.h index e5ef683f4..f66588d2b 100644 --- a/xc/include/extensions/xf86dgastr.h +++ b/xc/include/extensions/xf86dgastr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86dgastr.h,v 3.12 1999/08/22 05:57:23 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86dgastr.h,v 3.13 2000/12/20 00:19:41 mvojkovi Exp $ */ /* Copyright (c) 1995 Jon Tombs @@ -308,7 +308,7 @@ typedef struct _XDGACreateColormap { CARD8 dgaReqType; CARD16 length B16; CARD32 screen B32; - Colormap id B32; + CARD32 id B32; CARD32 mode B32; CARD8 alloc; CARD8 pad1; @@ -326,11 +326,11 @@ typedef struct { } u; struct { CARD32 pad0 B32; - Time time B32; + CARD32 time B32; INT16 dx B16; INT16 dy B16; INT16 screen B16; - KeyButMask state B16; + CARD16 state B16; CARD32 pad1 B32; CARD32 pad2 B32; CARD32 pad3 B32; diff --git a/xc/include/extensions/xf86vmode.h b/xc/include/extensions/xf86vmode.h index 34e4fa8fb..adc0b319a 100644 --- a/xc/include/extensions/xf86vmode.h +++ b/xc/include/extensions/xf86vmode.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.27 1999/03/14 11:17:37 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.28 2001/01/17 17:53:23 dawes Exp $ */ /* Copyright 1995 Kaleb S. KEITHLEY @@ -28,7 +28,7 @@ or other dealings in this Software without prior written authorization from Kaleb S. KEITHLEY */ -/* $TOG: xf86vmode.h /main/11 1998/02/09 11:23:48 kaleb $ */ +/* $Xorg: xf86vmode.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ diff --git a/xc/include/extensions/xf86vmstr.h b/xc/include/extensions/xf86vmstr.h index 6a5cb3d8c..462c441fa 100644 --- a/xc/include/extensions/xf86vmstr.h +++ b/xc/include/extensions/xf86vmstr.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.23 1999/03/14 11:17:38 dawes Exp $ */ +/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.24 2001/01/17 17:53:23 dawes Exp $ */ /* Copyright 1995 Kaleb S. KEITHLEY @@ -28,7 +28,7 @@ or other dealings in this Software without prior written authorization from Kaleb S. KEITHLEY */ -/* $TOG: xf86vmstr.h /main/11 1998/02/09 11:23:53 kaleb $ */ +/* $Xorg: xf86vmstr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ diff --git a/xc/include/extensions/xtestext1.h b/xc/include/extensions/xtestext1.h index 8f7a994e1..1b98b3824 100644 --- a/xc/include/extensions/xtestext1.h +++ b/xc/include/extensions/xtestext1.h @@ -1,4 +1,4 @@ -/* $TOG: xtestext1.h /main/7 1998/02/15 16:20:42 kaleb $ */ +/* $Xorg: xtestext1.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ /* * xtestext1.h * diff --git a/xc/include/extensions/xteststr.h b/xc/include/extensions/xteststr.h index 19e11fe9f..d83dfbcb2 100644 --- a/xc/include/extensions/xteststr.h +++ b/xc/include/extensions/xteststr.h @@ -1,4 +1,4 @@ -/* $TOG: xteststr.h /main/10 1998/02/09 11:24:01 kaleb $ */ +/* $Xorg: xteststr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */ /* Copyright 1992, 1998 The Open Group diff --git a/xc/include/fonts/FS.h b/xc/include/fonts/FS.h index c070e08fd..dc6546df3 100644 --- a/xc/include/fonts/FS.h +++ b/xc/include/fonts/FS.h @@ -1,4 +1,4 @@ -/* $TOG: FS.h /main/10 1998/02/09 11:24:06 kaleb $ */ +/* $Xorg: FS.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; @@ -46,7 +46,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. */ -/* $XFree86: xc/include/fonts/FS.h,v 1.5 1999/08/22 08:58:48 dawes Exp $ */ +/* $XFree86: xc/include/fonts/FS.h,v 1.6 2001/01/17 17:53:25 dawes Exp $ */ #ifndef _FS_H_ #define _FS_H_ diff --git a/xc/include/fonts/FSproto.h b/xc/include/fonts/FSproto.h index d04de14f3..11da5da60 100644 --- a/xc/include/fonts/FSproto.h +++ b/xc/include/fonts/FSproto.h @@ -1,4 +1,4 @@ -/* $TOG: FSproto.h /main/12 1998/02/09 11:24:10 kaleb $ */ +/* $Xorg: FSproto.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /* Copyright 1990, 1991, 1998 The Open Group diff --git a/xc/include/fonts/Imakefile b/xc/include/fonts/Imakefile index ebe0d70b9..ca2e04601 100644 --- a/xc/include/fonts/Imakefile +++ b/xc/include/fonts/Imakefile @@ -1,5 +1,9 @@ -XCOMM $XConsortium: Imakefile /main/6 1996/09/28 16:32:27 rws $ -XCOMM $XFree86: xc/include/fonts/Imakefile,v 3.6 1999/08/28 09:00:23 dawes Exp $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $ + + + + +XCOMM $XFree86: xc/include/fonts/Imakefile,v 3.7 2001/01/17 17:53:26 dawes Exp $ HEADERS = FS.h FSproto.h fsmasks.h diff --git a/xc/include/fonts/font.h b/xc/include/fonts/font.h index 45ee7e8f8..7dabdfbac 100644 --- a/xc/include/fonts/font.h +++ b/xc/include/fonts/font.h @@ -1,4 +1,4 @@ -/* $XConsortium: font.h /main/14 1996/09/28 16:32:33 rws $ */ +/* $Xorg: font.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -21,8 +21,8 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/fonts/font.h,v 3.4 2000/11/27 00:10:02 dawes Exp $ */ -/* $NCDId: @(#)font.h,v 1.7 1991/06/24 17:00:23 lemke Exp $ */ +/* $XFree86: xc/include/fonts/font.h,v 3.5 2001/01/17 17:53:26 dawes Exp $ */ +/* $NCDXorg: @(#)font.h,v 1.7 1991/06/24 17:00:23 lemke Exp $ */ #ifndef FONT_H #define FONT_H diff --git a/xc/include/fonts/fontstruct.h b/xc/include/fonts/fontstruct.h index ef9dc1d6f..7eb392500 100644 --- a/xc/include/fonts/fontstruct.h +++ b/xc/include/fonts/fontstruct.h @@ -1,5 +1,4 @@ -/* $XConsortium: fontstruct.h /main/17 1996/08/09 16:23:54 kaleb $ */ -/* $XFree86: xc/include/fonts/fontstruct.h,v 3.3 1999/08/21 13:47:34 dawes Exp $ */ +/* $Xorg: fontstruct.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /*********************************************************** Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. @@ -22,6 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/include/fonts/fontstruct.h,v 3.4 2001/01/17 17:53:26 dawes Exp $ */ #ifndef FONTSTR_H #define FONTSTR_H diff --git a/xc/include/fonts/fsmasks.h b/xc/include/fonts/fsmasks.h index 8e57c907d..cd0a66fbc 100644 --- a/xc/include/fonts/fsmasks.h +++ b/xc/include/fonts/fsmasks.h @@ -1,4 +1,4 @@ -/* $TOG: fsmasks.h /main/6 1998/02/09 11:24:23 kaleb $ */ +/* $Xorg: fsmasks.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation diff --git a/xc/include/keysym.h b/xc/include/keysym.h index fdb257f19..58c44e6d4 100644 --- a/xc/include/keysym.h +++ b/xc/include/keysym.h @@ -1,4 +1,4 @@ -/* $TOG: keysym.h /main/9 1998/05/22 16:17:55 kaleb $ */ +/* $Xorg: keysym.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /*********************************************************** @@ -42,7 +42,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/keysym.h,v 1.2 2000/10/27 18:30:46 dawes Exp $ */ +/* $XFree86: xc/include/keysym.h,v 1.3 2001/01/17 17:53:12 dawes Exp $ */ /* default keysyms */ #define XK_MISCELLANY diff --git a/xc/include/keysymdef.h b/xc/include/keysymdef.h index ec3bac238..cb96d2a09 100644 --- a/xc/include/keysymdef.h +++ b/xc/include/keysymdef.h @@ -1,4 +1,4 @@ -/* $TOG: keysymdef.h /main/28 1998/05/22 16:18:01 kaleb $ */ +/* $Xorg: keysymdef.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */ /*********************************************************** Copyright 1987, 1994, 1998 The Open Group @@ -43,7 +43,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/include/keysymdef.h,v 1.10 2000/10/27 18:30:46 dawes Exp $ */ +/* $XFree86: xc/include/keysymdef.h,v 1.11 2001/01/17 17:53:12 dawes Exp $ */ #define XK_VoidSymbol 0xFFFFFF /* void symbol */ |