summaryrefslogtreecommitdiff
path: root/include/X11
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:09 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:28:09 +0000
commitbca26a7b7c4c4f58d65462ffd3f1b0eaef2d5d4c (patch)
treedac6cafb3be04511d07dfc10bf56d944236580b4 /include/X11
parent1be3101aeab9b6136c32a91c23799724a7fe7797 (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_903_specialxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16xf86-012804-2330
Diffstat (limited to 'include/X11')
-rw-r--r--include/X11/Xauth.h22
1 files changed, 1 insertions, 21 deletions
diff --git a/include/X11/Xauth.h b/include/X11/Xauth.h
index e4efc2d..7340687 100644
--- a/include/X11/Xauth.h
+++ b/include/X11/Xauth.h
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xau/Xauth.h,v 1.5 2001/12/14 19:54:36 dawes Exp $ */
+/* $XFree86: xc/lib/Xau/Xauth.h,v 1.6 2003/11/17 22:20:21 dawes Exp $ */
#ifndef _Xauth_h
#define _Xauth_h
@@ -62,41 +62,30 @@ _XFUNCPROTOBEGIN
char *XauFileName(void);
Xauth *XauReadAuth(
-#if NeedFunctionPrototypes
FILE* /* auth_file */
-#endif
);
int XauLockAuth(
-#if NeedFunctionPrototypes
_Xconst char* /* file_name */,
int /* retries */,
int /* timeout */,
long /* dead */
-#endif
);
int XauUnlockAuth(
-#if NeedFunctionPrototypes
_Xconst char* /* file_name */
-#endif
);
int XauWriteAuth(
-#if NeedFunctionPrototypes
FILE* /* auth_file */,
Xauth* /* auth */
-#endif
);
Xauth *XauGetAuthByName(
-#if NeedFunctionPrototypes
_Xconst char* /* display_name */
-#endif
);
Xauth *XauGetAuthByAddr(
-#if NeedFunctionPrototypes
#if NeedWidePrototypes
unsigned int /* family */,
unsigned int /* address_length */,
@@ -117,11 +106,9 @@ unsigned int /* name_length */,
unsigned short /* name_length */,
#endif
_Xconst char* /* name */
-#endif
);
Xauth *XauGetBestAuthByAddr(
-#if NeedFunctionPrototypes
#if NeedWidePrototypes
unsigned int /* family */,
unsigned int /* address_length */,
@@ -139,13 +126,10 @@ _Xconst char* /* number */,
int /* types_length */,
char** /* type_names */,
_Xconst int* /* type_lengths */
-#endif
);
void XauDisposeAuth(
-#if NeedFunctionPrototypes
Xauth* /* auth */
-#endif
);
#ifdef K5AUTH
@@ -155,17 +139,13 @@ Xauth* /* auth */
#undef xfree
int XauKrb5Encode(
-#if NeedFunctionPrototypes
krb5_principal /* princ */,
krb5_data * /* outbuf */
-#endif
);
int XauKrb5Decode(
-#if NeedFunctionPrototypes
krb5_data /* inbuf */,
krb5_principal * /* princ */
-#endif
);
#endif /* K5AUTH */