merge XFree86 4.3.0.1 to -CURRENT

1 files changed, 56 insertions, 67 deletions

diff --git a/Xtrans.h b/Xtrans.h
index cdba474..f2d297f 100644
--- a/Xtrans.h
+++ b/Xtrans.h
@@ -26,6 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
+/* $XFree86: xc/lib/xtrans/Xtrans.h,v 3.18 2001/12/14 19:57:04 dawes Exp $ */
 
 /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA
  *
@@ -62,77 +63,104 @@ from The Open Group.
  */
 
 #ifdef X11_t
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
+#if !defined(UNIXCPP) || defined(ANSICPP)
 #define TRANS(func) _X11Trans##func
 #else
 #define TRANS(func) _X11Trans/**/func
 #endif
+#ifdef XTRANSDEBUG
+static char* __xtransname = "_X11Trans";
+#endif
 #endif /* X11_t */
 
 #ifdef XSERV_t
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
+#if !defined(UNIXCPP) || defined(ANSICPP)
 #define TRANS(func) _XSERVTrans##func
 #else
 #define TRANS(func) _XSERVTrans/**/func
 #endif
+#ifdef XTRANSDEBUG
+static char* __xtransname = "_XSERVTrans";
+#endif
 #define X11_t
 #endif /* X11_t */
 
 #ifdef XIM_t
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
+#if !defined(UNIXCPP) || defined(ANSICPP)
 #define TRANS(func) _XimXTrans##func
 #else
 #define TRANS(func) _XimXTrans/**/func
 #endif
+#ifdef XTRANSDEBUG
+static char* __xtransname = "_XimTrans";
+#endif
 #endif /* XIM_t */
 
 #ifdef FS_t
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
+#if !defined(UNIXCPP) || defined(ANSICPP)
 #define TRANS(func) _FSTrans##func
 #else
 #define TRANS(func) _FSTrans/**/func
 #endif
+#ifdef XTRANSDEBUG
+static char* __xtransname = "_FSTrans";
+#endif
 #endif /* FS_t */
 
 #ifdef FONT_t
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
+#if !defined(UNIXCPP) || defined(ANSICPP)
 #define TRANS(func) _FontTrans##func
 #else
 #define TRANS(func) _FontTrans/**/func
 #endif
+#ifdef XTRANSDEBUG
+static char* __xtransname = "_FontTrans";
+#endif
 #endif /* FONT_t */
 
 #ifdef ICE_t
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
+#if !defined(UNIXCPP) || defined(ANSICPP)
 #define TRANS(func) _IceTrans##func
 #else
 #define TRANS(func) _IceTrans/**/func
 #endif
+#ifdef XTRANSDEBUG
+static char* __xtransname = "_IceTrans";
+#endif
 #endif /* ICE_t */
 
 #ifdef TEST_t
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
+#if !defined(UNIXCPP) || defined(ANSICPP)
 #define TRANS(func) _TESTTrans##func
 #else
 #define TRANS(func) _TESTTrans/**/func
 #endif
+#ifdef XTRANSDEBUG
+static char* __xtransname = "_TESTTrans";
+#endif
 #endif /* TEST_t */
 
 #ifdef LBXPROXY_t
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
+#if !defined(UNIXCPP) || defined(ANSICPP)
 #define TRANS(func) _LBXPROXYTrans##func
 #else
 #define TRANS(func) _LBXPROXYTrans/**/func
 #endif
 #define X11_t		/* The server defines this - so should the LBX proxy */
+#ifdef XTRANSDEBUG
+static char* __xtransname = "_LBXPROXYTrans";
+#endif
 #endif /* LBXPROXY_t */
 
 #if !defined(TRANS)
-#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
+#if !defined(UNIXCPP) || defined(ANSICPP)
 #define TRANS(func) _XTrans##func
 #else
 #define TRANS(func) _XTrans/**/func
 #endif
+#ifdef XTRANSDEBUG
+static char* __xtransname = "_XTrans";
+#endif
 #endif /* !TRANS */
 
 
@@ -173,7 +201,11 @@ struct iovec {
 };
 
 #else
+#ifndef Lynx
 #include <sys/uio.h>
+#else
+#include <uio.h>
+#endif
 #endif
 
 typedef struct _XtransConnInfo *XtransConnInfo;
@@ -193,6 +225,7 @@ typedef struct _XtransConnInfo *XtransConnInfo;
 
 #define TRANS_CONNECT_FAILED 	-1
 #define TRANS_TRY_CONNECT_AGAIN -2
+#define TRANS_IN_PROGRESS	-3
 
 
 /*
@@ -225,12 +258,14 @@ typedef struct _XtransConnInfo *XtransConnInfo;
  * Function prototypes for the exposed interface
  */
 
+void TRANS(FreeConnInfo) (
+    XtransConnInfo 	/* ciptr */
+);
+
 #ifdef TRANS_CLIENT
 
 XtransConnInfo TRANS(OpenCOTSClient)(
-#if NeedFunctionPrototypes
     char *		/* address */
-#endif
 );
 
 #endif /* TRANS_CLIENT */
@@ -238,9 +273,7 @@ XtransConnInfo TRANS(OpenCOTSClient)(
 #ifdef TRANS_SERVER
 
 XtransConnInfo TRANS(OpenCOTSServer)(
-#if NeedFunctionPrototypes
     char *		/* address */
-#endif
 );
 
 #endif /* TRANS_SERVER */
@@ -248,9 +281,7 @@ XtransConnInfo TRANS(OpenCOTSServer)(
 #ifdef TRANS_CLIENT
 
 XtransConnInfo TRANS(OpenCLTSClient)(
-#if NeedFunctionPrototypes
     char *		/* address */
-#endif
 );
 
 #endif /* TRANS_CLIENT */
@@ -258,9 +289,7 @@ XtransConnInfo TRANS(OpenCLTSClient)(
 #ifdef TRANS_SERVER
 
 XtransConnInfo TRANS(OpenCLTSServer)(
-#if NeedFunctionPrototypes
     char *		/* address */
-#endif
 );
 
 #endif /* TRANS_SERVER */
@@ -268,61 +297,51 @@ XtransConnInfo TRANS(OpenCLTSServer)(
 #ifdef TRANS_REOPEN
 
 XtransConnInfo TRANS(ReopenCOTSServer)(
-#if NeedFunctionPrototypes
     int,		/* trans_id */
     int,		/* fd */
     char *		/* port */
-#endif
 );
 
 XtransConnInfo TRANS(ReopenCLTSServer)(
-#if NeedFunctionPrototypes
     int,		/* trans_id */
     int,		/* fd */
     char *		/* port */
-#endif
 );
 
 int TRANS(GetReopenInfo)(
-#if NeedFunctionPrototypes
     XtransConnInfo,	/* ciptr */
     int *,		/* trans_id */
     int *,		/* fd */
     char **		/* port */
-#endif
 );
 
 #endif /* TRANS_REOPEN */
 
 
 int TRANS(SetOption)(
-#if NeedFunctionPrototypes
     XtransConnInfo,	/* ciptr */
     int,		/* option */
     int			/* arg */
-#endif
 );
 
 #ifdef TRANS_SERVER
 
 int TRANS(CreateListener)(
-#if NeedFunctionPrototypes
     XtransConnInfo,	/* ciptr */
     char *		/* port */
-#endif
+);
+
+int TRANS(NoListen) (
+    char*               /* protocol*/
 );
 
 int TRANS(ResetListener)(
-#if NeedFunctionPrototypes
     XtransConnInfo	/* ciptr */
-#endif
 );
 
 XtransConnInfo TRANS(Accept)(
-#if NeedFunctionPrototypes
     XtransConnInfo,	/* ciptr */
     int *		/* status */
-#endif
 );
 
 #endif /* TRANS_SERVER */
@@ -330,119 +349,89 @@ XtransConnInfo TRANS(Accept)(
 #ifdef TRANS_CLIENT
 
 int TRANS(Connect)(
-#if NeedFunctionPrototypes
     XtransConnInfo,	/* ciptr */
     char *		/* address */
-#endif
 );
 
 #endif /* TRANS_CLIENT */
 
 int TRANS(BytesReadable)(
-#if NeedFunctionPrototypes
     XtransConnInfo,	/* ciptr */
     BytesReadable_t *	/* pend */
-#endif
 );
 
 int TRANS(Read)(
-#if NeedFunctionPrototypes
     XtransConnInfo,	/* ciptr */
     char *,		/* buf */
     int			/* size */
-#endif
 );
 
 int TRANS(Write)(
-#if NeedFunctionPrototypes
     XtransConnInfo,	/* ciptr */
     char *,		/* buf */
     int			/* size */
-#endif
 );
 
 int TRANS(Readv)(
-#if NeedFunctionPrototypes
     XtransConnInfo,	/* ciptr */
     struct iovec *,	/* buf */
     int			/* size */
-#endif
 );
 
 int TRANS(Writev)(
-#if NeedFunctionPrototypes
     XtransConnInfo,	/* ciptr */
     struct iovec *,	/* buf */
     int			/* size */
-#endif
 );
 
 int TRANS(Disconnect)(
-#if NeedFunctionPrototypes
     XtransConnInfo	/* ciptr */
-#endif
 );
 
 int TRANS(Close)(
-#if NeedFunctionPrototypes
     XtransConnInfo	/* ciptr */
-#endif
 );
 
 int TRANS(CloseForCloning)(
-#if NeedFunctionPrototypes
     XtransConnInfo	/* ciptr */
-#endif
 );
 
 int TRANS(IsLocal)(
-#if NeedFunctionPrototypes
     XtransConnInfo	/* ciptr */
-#endif
 );
 
 int TRANS(GetMyAddr)(
-#if NeedFunctionPrototypes
     XtransConnInfo,	/* ciptr */
     int *,		/* familyp */
     int *,		/* addrlenp */
     Xtransaddr **	/* addrp */
-#endif
 );
 
 int TRANS(GetPeerAddr)(
-#if NeedFunctionPrototypes
     XtransConnInfo,	/* ciptr */
     int *,		/* familyp */
     int *,		/* addrlenp */
     Xtransaddr **	/* addrp */
-#endif
 );
 
 int TRANS(GetConnectionNumber)(
-#if NeedFunctionPrototypes
     XtransConnInfo	/* ciptr */
-#endif
 );
 
 #ifdef TRANS_SERVER
 
 int TRANS(MakeAllCOTSServerListeners)(
-#if NeedFunctionPrototypes
     char *,		/* port */
     int *,		/* partial */
     int *,		/* count_ret */
     XtransConnInfo **	/* ciptrs_ret */
-#endif
 );
 
 int TRANS(MakeAllCLTSServerListeners)(
-#if NeedFunctionPrototypes
     char *,		/* port */
     int *,		/* partial */
     int *,		/* count_ret */
     XtransConnInfo **	/* ciptrs_ret */
-#endif
 );
 
 #endif /* TRANS_SERVER */
@@ -455,11 +444,9 @@ int TRANS(MakeAllCLTSServerListeners)(
 #ifdef X11_t
 
 int TRANS(ConvertAddress)(
-#if NeedFunctionPrototypes
     int *,		/* familyp */
     int *,		/* addrlenp */
     Xtransaddr **	/* addrp */
-#endif
 );
 
 #endif /* X11_t */
@@ -468,20 +455,22 @@ int TRANS(ConvertAddress)(
 
 char *
 TRANS(GetMyNetworkId)(
-#if NeedFunctionPrototypes
     XtransConnInfo	/* ciptr */
-#endif
 );
 
 char *
 TRANS(GetPeerNetworkId)(
-#if NeedFunctionPrototypes
     XtransConnInfo	/* ciptr */
-#endif
 );
 
 #endif /* ICE_t */
 
+int 
+TRANS(GetHostname) (
+    char *	/* buf */,
+    int 	/* maxlen */
+);
+
 #if defined(WIN32) && (defined(TCPCONN) || defined(DNETCONN))
 int TRANS(WSAStartup)();
 #endif