diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:16 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:16 +0000 |
| commit | f81d7ef72c9b4f13e33efa812bed9446657ed003 (patch) | |
| tree | 183442a515d232d4d88cb56d6de651c215731c3f /include/X11/Xtos.h | |
| parent | bdc0667ef29e24b1a2188b11546d843a7d3e5ef6 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16
Diffstat (limited to 'include/X11/Xtos.h')
| -rw-r--r-- | include/X11/Xtos.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/include/X11/Xtos.h b/include/X11/Xtos.h index 3b1b91d..f87fdb2 100644 --- a/include/X11/Xtos.h +++ b/include/X11/Xtos.h @@ -31,13 +31,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 @@ -48,7 +48,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ -/* $XFree86: xc/lib/Xt/Xtos.h,v 3.10 2002/04/04 14:05:35 eich Exp $ */ +/* $XFree86: xc/lib/Xt/Xtos.h,v 3.13 2003/10/24 15:47:35 tsi Exp $ */ #ifndef _Xtos_h #define _Xtos_h @@ -61,20 +61,16 @@ SOFTWARE. #define WORD64 #endif -#if defined(__alpha) || defined(__alpha__) || \ +#if defined (_LP64) || \ + defined(__alpha) || defined(__alpha__) || \ defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ defined(__s390x__) || \ (defined(__hppa__) && defined(__LP64__)) || \ - defined(__x86_64__) || defined(x86_64) + defined(__AMD64__) || defined(AMD64) || \ + (defined(sgi) && (_MIPS_SZLONG == 64)) #define LONG64 #endif -#ifdef __sgi -#if (_MIPS_SZLONG == 64) -#define LONG64 -#endif -#endif - #endif /* _Xtos_h */ /* DON'T ADD STUFF AFTER THIS #endif */ |