diff options
Diffstat (limited to 'nx-X11/lib/X11/XKBlib.h')
| -rw-r--r-- | nx-X11/lib/X11/XKBlib.h | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/nx-X11/lib/X11/XKBlib.h b/nx-X11/lib/X11/XKBlib.h index 95b233e84..dd2841e9a 100644 --- a/nx-X11/lib/X11/XKBlib.h +++ b/nx-X11/lib/X11/XKBlib.h @@ -6,25 +6,26 @@ 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 supporting -documentation, and that the name of Silicon Graphics not be -used in advertising or publicity pertaining to distribution +documentation, and that the name of Silicon Graphics not be +used in advertising or publicity pertaining to distribution of the software without specific prior written permission. -Silicon Graphics makes no representation about the suitability +Silicon Graphics makes no representation about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. -SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS -SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON -GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL -DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -#ifndef _XKBLIB_H_ +#if !defined(_X11_XKBLIB_H_) && !defined(_XKBLIB_H_) +#define _X11_XKBLIB_H_ #define _XKBLIB_H_ #include <nx-X11/Xlib.h> @@ -76,7 +77,7 @@ typedef struct _XkbMapNotifyEvent { KeyCode first_key_act; KeyCode first_key_behavior; KeyCode first_key_explicit; - KeyCode first_modmap_key; + KeyCode first_modmap_key; KeyCode first_vmodmap_key; int num_key_syms; int num_key_acts; @@ -213,7 +214,7 @@ typedef struct _XkbActionMessage { Bool key_event_follows;/* true if key event also generated */ int group; /* effective group */ unsigned int mods; /* effective mods */ - char message[XkbActionMessageLength+1]; + char message[XkbActionMessageLength+1]; /* message -- leave space for NUL */ } XkbActionMessageEvent; @@ -239,8 +240,8 @@ typedef struct _XkbExtensionDeviceNotify { Time time; /* milliseconds */ int xkb_type; /* XkbExtensionDeviceNotify */ int device; /* device ID */ - unsigned int reason; /* reason for the event */ - unsigned int supported; /* mask of supported features */ + unsigned int reason; /* reason for the event */ + unsigned int supported; /* mask of supported features */ unsigned int unsupported; /* mask of unsupported features */ /* that some app tried to use */ int first_btn; /* first button that changed */ @@ -529,7 +530,7 @@ extern Bool XkbSetIndicatorMap( #define XkbNoteIndicatorStateChanges(o,n,w)\ ((o)->state_changes|=((n)->state_changes&(w))) #define XkbGetIndicatorMapChanges(d,x,c) \ - (XkbGetIndicatorMap((d),(c)->map_changes,x) + (XkbGetIndicatorMap((d),(c)->map_changes,x)) #define XkbChangeIndicatorMaps(d,x,c) \ (XkbSetIndicatorMap((d),(c)->map_changes,x)) @@ -1146,4 +1147,4 @@ extern void XkbUpdateKeyTypeVirtualMods( _XFUNCPROTOEND -#endif /* _XKBLIB_H_ */ +#endif /* !defined(_X11_XKBLIB_H_) && !defined(_XKBLIB_H_) */ |