aboutsummaryrefslogtreecommitdiff
path: root/X11
diff options
context:
space:
mode:
Diffstat (limited to 'X11')
-rw-r--r--X11/Xauth.h17
-rw-r--r--X11/Xcms.h8
-rw-r--r--X11/Xregion.h18
-rw-r--r--X11/Xresource.h14
-rw-r--r--X11/Xutil.h28
5 files changed, 34 insertions, 51 deletions
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 <krb5/krb5.h>
-/* 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 <X11/Xlib.h>
#include <X11/keysym.h>
-/*
+/*
* 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(