Synchronised line endinge with release branch

1 files changed, 77 insertions, 77 deletions

diff --git a/X11/extensions/security.h b/X11/extensions/security.h
index 90abc07ee..f5541310b 100644
--- a/X11/extensions/security.h
+++ b/X11/extensions/security.h
@@ -1,77 +1,77 @@
-/*

-Copyright 1996, 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.

-*/

-

-#ifndef _SECURITY_H

-#define _SECURITY_H

-

-#define _XAUTH_STRUCT_ONLY

-#include <X11/Xauth.h>

-

-#include <X11/extensions/secur.h>

-

-_XFUNCPROTOBEGIN

-

-Status XSecurityQueryExtension (

-    Display *dpy,

-    int *major_version_return,

-    int *minor_version_return);

-

-Xauth *XSecurityAllocXauth(void);

-

-void XSecurityFreeXauth(Xauth *auth);

-

-/* type for returned auth ids */

-typedef unsigned long XSecurityAuthorization;

-

-typedef struct {

-    unsigned int timeout;

-    unsigned int trust_level;

-    XID          group;

-    long	 event_mask;

-} XSecurityAuthorizationAttributes;

-

-Xauth *XSecurityGenerateAuthorization(

-    Display *dpy,

-    Xauth *auth_in,

-    unsigned long valuemask,

-    XSecurityAuthorizationAttributes *attributes,

-    XSecurityAuthorization *auth_id_return);

-

-Status XSecurityRevokeAuthorization(

-    Display *dpy,

-    XSecurityAuthorization auth_id);

-

-_XFUNCPROTOEND

-

-typedef struct {

-    int type;		      /* event base + XSecurityAuthorizationRevoked */

-    unsigned long serial;     /* # of last request processed by server */

-    Bool send_event;	      /* true if this came from a SendEvent request */

-    Display *display;	      /* Display the event was read from */

-    XSecurityAuthorization auth_id; /* revoked authorization id */

-} XSecurityAuthorizationRevokedEvent;

-

-#endif /* _SECURITY_H */

+/*
+Copyright 1996, 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.
+*/
+
+#ifndef _SECURITY_H
+#define _SECURITY_H
+
+#define _XAUTH_STRUCT_ONLY
+#include <X11/Xauth.h>
+
+#include <X11/extensions/secur.h>
+
+_XFUNCPROTOBEGIN
+
+Status XSecurityQueryExtension (
+    Display *dpy,
+    int *major_version_return,
+    int *minor_version_return);
+
+Xauth *XSecurityAllocXauth(void);
+
+void XSecurityFreeXauth(Xauth *auth);
+
+/* type for returned auth ids */
+typedef unsigned long XSecurityAuthorization;
+
+typedef struct {
+    unsigned int timeout;
+    unsigned int trust_level;
+    XID          group;
+    long	 event_mask;
+} XSecurityAuthorizationAttributes;
+
+Xauth *XSecurityGenerateAuthorization(
+    Display *dpy,
+    Xauth *auth_in,
+    unsigned long valuemask,
+    XSecurityAuthorizationAttributes *attributes,
+    XSecurityAuthorization *auth_id_return);
+
+Status XSecurityRevokeAuthorization(
+    Display *dpy,
+    XSecurityAuthorization auth_id);
+
+_XFUNCPROTOEND
+
+typedef struct {
+    int type;		      /* event base + XSecurityAuthorizationRevoked */
+    unsigned long serial;     /* # of last request processed by server */
+    Bool send_event;	      /* true if this came from a SendEvent request */
+    Display *display;	      /* Display the event was read from */
+    XSecurityAuthorization auth_id; /* revoked authorization id */
+} XSecurityAuthorizationRevokedEvent;
+
+#endif /* _SECURITY_H */