From a10f507ac4aa4e12e9e8cf6e745aafd69648ad91 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 17 Sep 2009 06:23:51 +0000 Subject: Made files the same that should be the same. Added batch fiesl for checking that these files are the same. --- X11/Xauth.h | 17 ------------ X11/Xcms.h | 8 +++--- X11/Xregion.h | 18 ++++++------- X11/Xresource.h | 14 +++++----- X11/Xutil.h | 28 ++++++++++---------- filesthatshouldbethesame.bat | 22 ++++++++++++++++ gl/internal/glcore.h | 61 ++++++++++++++++++++------------------------ 7 files changed, 84 insertions(+), 84 deletions(-) create mode 100644 filesthatshouldbethesame.bat diff --git a/X11/Xauth.h b/X11/Xauth.h index 181618ac2..ace975d84 100644 --- a/X11/Xauth.h +++ b/X11/Xauth.h @@ -128,23 +128,6 @@ void XauDisposeAuth( Xauth* /* auth */ ); -#ifdef K5AUTH -#include -/* 9/93: krb5.h leaks some symbols */ -#undef BITS32 -#undef xfree - -int XauKrb5Encode( - krb5_principal /* princ */, - krb5_data * /* outbuf */ -); - -int XauKrb5Decode( - krb5_data /* inbuf */, - krb5_principal * /* princ */ -); -#endif /* K5AUTH */ - _XFUNCPROTOEND /* Return values from XauLockAuth */ diff --git a/X11/Xcms.h b/X11/Xcms.h index 779bc52ff..265719636 100644 --- a/X11/Xcms.h +++ b/X11/Xcms.h @@ -3,7 +3,7 @@ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. * All Rights Reserved - * + * * This file is a component of an X Window System-specific implementation * of Xcms based on the TekColor Color Management System. Permission is * hereby granted to use, copy, modify, sell, and otherwise distribute this @@ -11,10 +11,10 @@ * that this copyright, permission, and disclaimer notice is reproduced in * all copies of this software and in supporting documentation. TekColor * is a trademark of Tektronix, Inc. - * + * * Tektronix makes no representation about the suitability of this software * for any purpose. It is provided "as is" and with all faults. - * + * * TEKTRONIX DISCLAIMS ALL WARRANTIES APPLICABLE TO THIS SOFTWARE, * INCLUDING THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A * PARTICULAR PURPOSE. IN NO EVENT SHALL TEKTRONIX BE LIABLE FOR ANY @@ -252,7 +252,7 @@ typedef void (*XcmsScreenFreeProc)( * XXX: The use of the XcmsConversionProc type is broken. The * device-independent colour conversion code uses it as: -typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, XcmsColor *, +typedef Status (*XcmsConversionProc)(XcmsCCC, XcmsColor *, XcmsColor *, unsigned int); * while the device-dependent code uses it as: diff --git a/X11/Xregion.h b/X11/Xregion.h index 2ddf12cac..aca9e7a51 100644 --- a/X11/Xregion.h +++ b/X11/Xregion.h @@ -28,13 +28,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. 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 name of Digital 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 DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -69,7 +69,7 @@ typedef struct { #endif -/* +/* * clip region */ @@ -80,13 +80,13 @@ typedef struct _XRegion { BOX extents; } REGION; -/* Xutil.h contains the declaration: - * typedef struct _XRegion *Region; - */ +/* Xutil.h contains the declaration: + * typedef struct _XRegion *Region; + */ /* 1 if two BOXs overlap. * 0 if two BOXs do not overlap. - * Remember, x2 and y2 are not in the region + * Remember, x2 and y2 are not in the region */ #define EXTENTCHECK(r1, r2) \ ((r1)->x2 > (r2)->x1 && \ diff --git a/X11/Xresource.h b/X11/Xresource.h index ce1213748..56cc5adb4 100644 --- a/X11/Xresource.h +++ b/X11/Xresource.h @@ -29,13 +29,13 @@ Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. 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 name of Digital 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 DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -178,7 +178,7 @@ typedef struct _XrmHashBucketRec *XrmDatabase; extern void XrmDestroyDatabase( - XrmDatabase /* database */ + XrmDatabase /* database */ ); extern void XrmQPutResource( @@ -333,7 +333,7 @@ typedef enum { XrmoptionResArg, /* Resource and value in next argument in argv */ XrmoptionSkipArg, /* Ignore this option and the next argument in argv */ XrmoptionSkipLine, /* Ignore this option and the rest of argv */ - XrmoptionSkipNArgs /* Ignore this option and the next + XrmoptionSkipNArgs /* Ignore this option and the next OptionDescRes.value arguments in argv */ } XrmOptionKind; @@ -351,7 +351,7 @@ extern void XrmParseCommand( int /* table_count */, _Xconst char* /* name */, int* /* argc_in_out */, - char** /* argv_in_out */ + char** /* argv_in_out */ ); _XFUNCPROTOEND diff --git a/X11/Xutil.h b/X11/Xutil.h index 9f2ef6304..9e37c35c6 100644 --- a/X11/Xutil.h +++ b/X11/Xutil.h @@ -29,13 +29,13 @@ Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. 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 name of Digital 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 DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL @@ -55,7 +55,7 @@ SOFTWARE. #include #include -/* +/* * Bitmask returned by XParseGeometry(). Each bit tells if the corresponding * value (x, y, width, height) was found in the parsed string. */ @@ -151,7 +151,7 @@ IconPositionHint|IconMaskHint|WindowGroupHint) /* - * new structure for manipulating TEXT properties; used with WM_NAME, + * new structure for manipulating TEXT properties; used with WM_NAME, * WM_ICON_NAME, WM_CLIENT_MACHINE, and WM_COMMAND. */ typedef struct { @@ -262,16 +262,16 @@ typedef struct _XComposeStatus { || ((KeySym)(keysym) == XK_Num_Lock)) #endif /* - * opaque reference to Region data type + * opaque reference to Region data type */ -typedef struct _XRegion *Region; +typedef struct _XRegion *Region; /* Return values from XRectInRegion() */ - + #define RectangleOut 0 #define RectangleIn 1 #define RectanglePart 2 - + /* * Information used by the visual utility routines to find desired visual @@ -452,7 +452,7 @@ extern Status XGetStandardColormap( Display* /* display */, Window /* w */, XStandardColormap* /* colormap_return */, - Atom /* property */ + Atom /* property */ ); extern Status XGetTextProperty( @@ -477,7 +477,7 @@ extern Status XGetWMClientMachine( extern XWMHints *XGetWMHints( Display* /* display */, - Window /* w */ + Window /* w */ ); extern Status XGetWMIconName( @@ -496,7 +496,7 @@ extern Status XGetWMNormalHints( Display* /* display */, Window /* w */, XSizeHints* /* hints_return */, - long* /* supplied_return */ + long* /* supplied_return */ ); extern Status XGetWMSizeHints( @@ -584,7 +584,7 @@ extern int XSetIconSizes( Display* /* display */, Window /* w */, XIconSize* /* size_list */, - int /* count */ + int /* count */ ); extern int XSetNormalHints( diff --git a/filesthatshouldbethesame.bat b/filesthatshouldbethesame.bat new file mode 100644 index 000000000..6eafd5825 --- /dev/null +++ b/filesthatshouldbethesame.bat @@ -0,0 +1,22 @@ +fcg .\libX11\include\X11\cursorfont.h .\X11 +fcg .\include\xcb\xcbext.h .\libxcb\src +fcg .\include\xcb\render.h .\libxcb\src +fcg .\libX11\include\X11\Xlocale.h .\X11 +fcg .\libXau\include\X11\Xauth.h .\X11 +fcg .\libX11\include\X11\XKBlib.h .\X11 +fcg .\libXinerama\include\X11\extensions\panoramiXext.h .\X11\extensions +fcg .\libXdmcp\include\X11\Xdmcp.h .\X11 +fcg .\libXinerama\include\X11\extensions\Xinerama.h .\X11\extensions +fcg .\include\xcb\xcb.h .\libxcb\src +fcg .\libX11\include\X11\Xlibint.h .\X11 +fcg .\include\xcb\xproto.h .\libxcb\src +fcg .\libX11\include\X11\Xutil.h .\X11 +fcg .\gl\glcore.h .\gl\internal +fcg .\include\xcb\xc_misc.h .\libxcb\src +fcg .\libX11\include\X11\Xlib.h .\X11 +fcg .\libX11\include\X11\Xresource.h .\X11 +fcg .\libX11\include\X11\Xlib-xcb.h .\X11 +fcg .\include\xcb\bigreq.h .\libxcb\src +fcg .\libX11\include\X11\Xcms.h .\X11 +fcg .\libX11\include\X11\Xregion.h .\X11 +fcg .\libX11\include\X11\ImUtil.h .\X11 diff --git a/gl/internal/glcore.h b/gl/internal/glcore.h index 9626dc698..8c720e90b 100644 --- a/gl/internal/glcore.h +++ b/gl/internal/glcore.h @@ -3,39 +3,34 @@ #define __gl_core_h_ /* -** 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: The application programming interfaces -** established by SGI in conjunction with the Original Code are The -** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -** Window System(R) (Version 1.3), released October 19, 1998. 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. -** -*/ + * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) + * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. + * + * 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, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice including the dates of first publication and + * either this permission notice or a reference to + * http://oss.sgi.com/projects/FreeB/ + * 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 + * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc. + * shall not be used in advertising or otherwise to promote the sale, use or + * other dealings in this Software without prior written authorization from + * Silicon Graphics, Inc. + */ #ifndef XFree86LOADER #include -- cgit v1.2.3