git update 8/7/2010

1 files changed, 55 insertions, 56 deletions

diff --git a/libX11/src/GetKCnt.c b/libX11/src/GetKCnt.c
index 4ac69d16c..94c82af83 100644
--- a/libX11/src/GetKCnt.c
+++ b/libX11/src/GetKCnt.c
@@ -1,56 +1,55 @@
-/*
-
-Copyright 1986, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-#define NEED_REPLIES
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "Xlibint.h"
-
-int
-XGetKeyboardControl (
-    register Display *dpy,
-    register XKeyboardState *state)
-{
-    xGetKeyboardControlReply rep;
-    register xReq *req;
-    LockDisplay(dpy);
-    GetEmptyReq (GetKeyboardControl, req);
-    (void) _XReply (dpy, (xReply *) &rep,
-	(SIZEOF(xGetKeyboardControlReply) - SIZEOF(xReply)) >> 2, xTrue);
-
-    state->key_click_percent = rep.keyClickPercent;
-    state->bell_percent = rep.bellPercent;
-    state->bell_pitch = rep.bellPitch;
-    state->bell_duration = rep.bellDuration;
-    state->led_mask = rep.ledMask;
-    state->global_auto_repeat = rep.globalAutoRepeat;
-    memcpy (state->auto_repeats, rep.map, sizeof state->auto_repeats);
-    UnlockDisplay(dpy);
-    SyncHandle();
-    return 1;
-    }
-
+/*

+

+Copyright 1986, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include "Xlibint.h"

+

+int

+XGetKeyboardControl (

+    register Display *dpy,

+    register XKeyboardState *state)

+{

+    xGetKeyboardControlReply rep;

+    register xReq *req;

+    LockDisplay(dpy);

+    GetEmptyReq (GetKeyboardControl, req);

+    (void) _XReply (dpy, (xReply *) &rep,

+	(SIZEOF(xGetKeyboardControlReply) - SIZEOF(xReply)) >> 2, xTrue);

+

+    state->key_click_percent = rep.keyClickPercent;

+    state->bell_percent = rep.bellPercent;

+    state->bell_pitch = rep.bellPitch;

+    state->bell_duration = rep.bellDuration;

+    state->led_mask = rep.ledMask;

+    state->global_auto_repeat = rep.globalAutoRepeat;

+    memcpy (state->auto_repeats, rep.map, sizeof state->auto_repeats);

+    UnlockDisplay(dpy);

+    SyncHandle();

+    return 1;

+    }

+