svn merge ^/branches/released .

1 files changed, 84 insertions, 82 deletions

diff --git a/xorg-server/Xi/exglobals.h b/xorg-server/Xi/exglobals.h
index 2d2d25c0b..4f09e6ca3 100644
--- a/xorg-server/Xi/exglobals.h
+++ b/xorg-server/Xi/exglobals.h
@@ -1,82 +1,84 @@
-/************************************************************
-
-Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
-
-                        All Rights Reserved
-
-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
-supporting documentation, and that the name of the above listed
-copyright holder(s) not be used in advertising or publicity pertaining
-to distribution of the software without specific, written prior
-permission.
-
-THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD
-TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) 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.
-
-********************************************************/
-
-/*****************************************************************
- *
- * Globals referenced elsewhere in the server.
- *
- */
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-#include "privates.h"
-
-#ifndef EXGLOBALS_H
-#define EXGLOBALS_H 1
-
-extern int IReqCode;
-extern int IEventBase;
-extern int BadDevice;
-extern int BadMode;
-extern int DeviceBusy;
-extern int BadClass;
-
-/* Note: only the ones needed in files other than extinit.c are declared */
-extern const Mask DevicePointerMotionMask;
-extern const Mask DevicePointerMotionHintMask;
-extern const Mask DeviceFocusChangeMask;
-extern const Mask DeviceStateNotifyMask;
-extern const Mask DeviceMappingNotifyMask;
-extern const Mask DeviceOwnerGrabButtonMask;
-extern const Mask DeviceButtonGrabMask;
-extern const Mask DeviceButtonMotionMask;
-extern const Mask DevicePresenceNotifyMask;
-extern const Mask DevicePropertyNotifyMask;
-extern const Mask XIAllMasks;
-
-extern Mask PropagateMask[];
-
-extern int DeviceValuator;
-extern int DeviceKeyPress;
-extern int DeviceKeyRelease;
-extern int DeviceButtonPress;
-extern int DeviceButtonRelease;
-extern int DeviceMotionNotify;
-extern int DeviceFocusIn;
-extern int DeviceFocusOut;
-extern int ProximityIn;
-extern int ProximityOut;
-extern int DeviceStateNotify;
-extern int DeviceKeyStateNotify;
-extern int DeviceButtonStateNotify;
-extern int DeviceMappingNotify;
-extern int ChangeDeviceNotify;
-extern int DevicePresenceNotify;
-extern int DevicePropertyNotify;
-
-extern int RT_INPUTCLIENT;
-
-extern DevPrivateKey XIClientPrivateKey;
-#endif /* EXGLOBALS_H */
+/************************************************************

+

+Copyright 1996 by Thomas E. Dickey <dickey@clark.net>

+

+                        All Rights Reserved

+

+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

+supporting documentation, and that the name of the above listed

+copyright holder(s) not be used in advertising or publicity pertaining

+to distribution of the software without specific, written prior

+permission.

+

+THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM ALL WARRANTIES WITH REGARD

+TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY

+AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) 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.

+

+********************************************************/

+

+/*****************************************************************

+ *

+ * Globals referenced elsewhere in the server.

+ *

+ */

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+#include "privates.h"

+

+#ifndef EXGLOBALS_H

+#define EXGLOBALS_H 1

+

+extern int IReqCode;

+extern int IEventBase;

+extern int BadDevice;

+extern int BadMode;

+extern int DeviceBusy;

+extern int BadClass;

+

+/* Note: only the ones needed in files other than extinit.c are declared */

+extern const Mask DevicePointerMotionMask;

+extern const Mask DevicePointerMotionHintMask;

+extern const Mask DeviceFocusChangeMask;

+extern const Mask DeviceStateNotifyMask;

+extern const Mask DeviceMappingNotifyMask;

+extern const Mask DeviceOwnerGrabButtonMask;

+extern const Mask DeviceButtonGrabMask;

+extern const Mask DeviceButtonMotionMask;

+extern const Mask DevicePresenceNotifyMask;

+extern const Mask DevicePropertyNotifyMask;

+extern const Mask XIAllMasks;

+

+extern Mask PropagateMask[];

+

+extern int DeviceValuator;

+extern int DeviceKeyPress;

+extern int DeviceKeyRelease;

+extern int DeviceButtonPress;

+extern int DeviceButtonRelease;

+extern int DeviceMotionNotify;

+extern int DeviceFocusIn;

+extern int DeviceFocusOut;

+extern int ProximityIn;

+extern int ProximityOut;

+extern int DeviceStateNotify;

+extern int DeviceKeyStateNotify;

+extern int DeviceButtonStateNotify;

+extern int DeviceMappingNotify;

+extern int ChangeDeviceNotify;

+extern int DevicePresenceNotify;

+extern int DevicePropertyNotify;

+

+extern int RT_INPUTCLIENT;

+

+extern DevPrivateKeyRec XIClientPrivateKeyRec;

+#define XIClientPrivateKey (&XIClientPrivateKeyRec)

+

+#endif /* EXGLOBALS_H */