On Solaris, #include <sys/isa_defs.h> to be sure _LP64 is defined in 64-bit

builds.
Fix some comment typos.
This commit is contained in:
Alan Coopersmith 2006-04-20 01:24:25 +00:00
parent 5e7d5cbf21
commit 33cea53961
6 changed files with 28 additions and 10 deletions

View file

@ -1,3 +1,16 @@
2006-04-19 Alan Coopersmith <alan.coopersmith@sun.com>
* Xmd.h:
On Solaris, #include <sys/isa_defs.h> to be sure _LP64 is defined
in 64-bit builds.
* Xmd.h:
* Xos.h:
* Xos_r.h:
* Xproto.h:
* keysymdef.h:
Fix some comment typos.
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:

9
Xmd.h
View file

@ -1,3 +1,4 @@
/* $XdotOrg: $ */
/* $XFree86: xc/include/Xmd.h,v 3.18tsi Exp $ */
/***********************************************************
@ -55,6 +56,10 @@ SOFTWARE.
/*
* Special per-machine configuration flags.
*/
#if defined(sun) && defined(__SVR4)
# include <sys/isa_defs.h> /* Solaris: defines _LP64 if necessary */
#endif
#ifdef CRAY
#define WORD64 /* 64-bit architecture */
#endif
@ -72,7 +77,7 @@ SOFTWARE.
/*
* Stuff to handle large architecture machines; the constants were generated
* on a 32-bit machine and must coorespond to the protocol.
* on a 32-bit machine and must correspond to the protocol.
*/
#ifdef WORD64
#define MUSTCOPY
@ -102,7 +107,7 @@ SOFTWARE.
/*
* Bitfield suffixes for the protocol structure elements, if you
* need them. Note that bitfields are not guarranteed to be signed
* need them. Note that bitfields are not guaranteed to be signed
* (or even unsigned) according to ANSI C.
*/
#ifdef WORD64

4
Xos.h
View file

@ -1,5 +1,5 @@
/*
* $XdotOrg: xc/include/Xos.h,v 1.4 2005/01/03 18:03:49 eich Exp $
* $XdotOrg: proto/X11/Xos.h,v 1.8 2005/11/08 06:33:25 jkj Exp $
* $Xorg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $
*
*
@ -31,7 +31,7 @@ in this Software without prior written authorization from The Open Group.
/* $XFree86: xc/include/Xos.h,v 3.41tsi Exp $ */
/* This is a collection of things to try and minimize system dependencies
* in a "signficant" number of source files.
* in a "significant" number of source files.
*/
#ifndef _XOS_H_

View file

@ -1,5 +1,5 @@
/* $Xorg: Xos_r.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
/* $XdotOrg: xc/include/Xos_r.h,v 1.4 2005/03/02 19:29:31 alanc Exp $ */
/* $XdotOrg: proto/X11/Xos_r.h,v 1.5 2005/07/13 07:23:56 keithp Exp $ */
/*
Copyright 1996, 1998 The Open Group
@ -42,13 +42,13 @@ in this Software without prior written authorization from The Open Group.
* MT-safe system API (e.g. UnixWare) you must define _Xos_processLock
* and _Xos_processUnlock macros before including this header. If
* you are on OSF/1 V3.2 and plan to use readdir(), you must also define
* _Xos_isThreadsInitialized. For convenience XOS_USE_XLIB_LOCKING or
* _Xos_isThreadInitialized. For convenience XOS_USE_XLIB_LOCKING or
* XOS_USE_XT_LOCKING may be defined to obtain either Xlib-only or
* Xt-based versions of these macros. These macros won't result in
* truly thread-safe calls, but they are better than nothing. If you
* do not want locking in this situation define XOS_USE_NO_LOCKING.
*
* NOTE: On systems lacking approriate _r functions Gethostbyname(),
* NOTE: On systems lacking appropriate _r functions Gethostbyname(),
* Gethostbyaddr(), and Getservbyname() do NOT copy the host or
* protocol lists!
*

View file

@ -1126,7 +1126,7 @@ typedef struct _xEvent {
} resizeRequest;
struct {
/* The event field in the circulate record is really the parent when this
is used as a CirculateRequest insteaad of a CircluateNotify */
is used as a CirculateRequest instead of a CirculateNotify */
CARD32 pad00 B32;
Window event B32, window B32, parent B32;
BYTE place; /* Top or Bottom */

View file

@ -229,8 +229,8 @@ SOFTWARE.
/*
* Auxilliary functions; note the duplicate definitions for left and right
* function keys; Sun keyboards and a few other manufactures have such
* Auxiliary functions; note the duplicate definitions for left and right
* function keys; Sun keyboards and a few other manufacturers have such
* function key groups on the left and/or right sides of the keyboard.
* We've not found a keyboard with more than 35 function keys total.
*/