diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
| commit | d93c194ca393697cd053d63ed7546d48735a6990 (patch) | |
| tree | 4b89b1daf6c5cde1f7f5c59939745d235583cfb3 /transport.c | |
| parent | 26781c4f009a4b448dca3ab4912cbf01182e3d92 (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'transport.c')
| -rw-r--r-- | transport.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/transport.c b/transport.c index be46eca..3cc7149 100644 --- a/transport.c +++ b/transport.c @@ -26,6 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/xtrans/transport.c,v 3.9 2002/05/31 18:45:51 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * @@ -50,6 +51,16 @@ from The Open Group. * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef XSERV_t +#include "os.h" +#else +#include <stdlib.h> +#define xalloc(_size) malloc(_size) +#define xcalloc(_num,_size) calloc(_num,_size) +#define xrealloc(_ptr,_size) realloc(_ptr,_size) +#define xfree(_ptr) free(_ptr) +#endif + #include "Xtransint.h" #ifdef DNETCONN @@ -64,8 +75,5 @@ from The Open Group. #ifdef STREAMSCONN #include "Xtranstli.c" #endif -#if defined(AMRPCCONN) || defined(AMTCPCONN) -#include "Xtransam.c" -#endif #include "Xtrans.c" #include "Xtransutil.c" |