diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 20:34:44 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 20:34:44 +0000 |
| commit | 7a10db6531003055886e0e994c2ef8e46a010eb2 (patch) | |
| tree | e4d3f5ba0dc692537ea16c69cb951d5d7d6b9f46 | |
| parent | 871b8c33f2ab8c98b95aa3324bb70055f5207c61 (diff) | |
Import most of XFree86 4.4RC3. This import excludes files which have thexf86-4_3_99_903_special
new license. If we want to, later we can import 4.4RC3 again and pick
up the files that have the new license, but for now the vendor branch
is "pure."
| -rw-r--r-- | Xtranssock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Xtranssock.c b/Xtranssock.c index 23b3ae3..7c3ee8d 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization from the copyright holders. */ -/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.68 2004/01/07 04:28:02 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.69 2004/02/14 00:10:13 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * @@ -82,7 +82,7 @@ from the copyright holders. #include <sys/stat.h> #endif -#if defined(hpux) || defined(__UNIXOS2__) || (defined(MOTOROLA) && defined(SYSV)) +#if defined(hpux) || (defined(MOTOROLA) && defined(SYSV)) #define NO_TCP_H #endif |