xserver mesa xkbcomp git update 7 nov 2012

xserver: 011f8458805e443ac9130865d2840a929a00cabf
xkbcomp: bd1103ef3cfef9cfed645566f944a69e7ca568b4
mesa: f42518962a08ce927e4ddd233d19d2661e135834

1 files changed, 55 insertions, 55 deletions

diff --git a/libX11/modules/im/ximcp/imImSw.c b/libX11/modules/im/ximcp/imImSw.c
index dfa6d6699..28b1725a6 100644
--- a/libX11/modules/im/ximcp/imImSw.c
+++ b/libX11/modules/im/ximcp/imImSw.c
@@ -1,55 +1,55 @@
-/******************************************************************

-

-          Copyright 1992, 1993 by FUJITSU LIMITED

-          Copyright 1993 by Digital Equipment Corporation

-

-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, and that the name of FUJITSU LIMITED and

-Digital Equipment Corporation not be used in advertising or publicity

-pertaining to distribution of the software without specific, written

-prior permission.  FUJITSU LIMITED and Digital Equipment Corporation

-makes no representations about the suitability of this software for

-any purpose.  It is provided "as is" without express or implied

-warranty.

-

-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION DISCLAIM ALL

-WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED

-WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION 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.

-

-  Author:    Takashi Fujiwara     FUJITSU LIMITED

-                               	  fujiwara@a80.tech.yk.fujitsu.co.jp

-  Modifier:  Franky Ling          Digital Equipment Corporation

-	                          frankyling@hgrd01.enet.dec.com

-

-******************************************************************/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include "Xlibint.h"

-#include "Xlcint.h"

-#include "Ximint.h"

-#include "XimImSw.h"

-

-Private Bool

-_XimCheckIfDefault(

-    Xim		im)

-{

-    return(True);

-}

-

-XimImsportSW _XimImSportRec[] = {

-    { _XimCheckIfLocalProcessing, _XimLocalOpenIM, _XimLocalIMFree },

-    { _XimCheckIfThaiProcessing,	_XimThaiOpenIM,	 _XimThaiIMFree },

-    { _XimCheckIfDefault,         _XimProtoOpenIM, _XimProtoIMFree },

-    { NULL,                       NULL,		 NULL },

-};

+/******************************************************************
+
+          Copyright 1992, 1993 by FUJITSU LIMITED
+          Copyright 1993 by Digital Equipment Corporation
+
+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, and that the name of FUJITSU LIMITED and
+Digital Equipment Corporation not be used in advertising or publicity
+pertaining to distribution of the software without specific, written
+prior permission.  FUJITSU LIMITED and Digital Equipment Corporation
+makes no representations about the suitability of this software for
+any purpose.  It is provided "as is" without express or implied
+warranty.
+
+FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION DISCLAIM ALL
+WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+FUJITSU LIMITED AND DIGITAL EQUIPMENT CORPORATION 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.
+
+  Author:    Takashi Fujiwara     FUJITSU LIMITED
+                               	  fujiwara@a80.tech.yk.fujitsu.co.jp
+  Modifier:  Franky Ling          Digital Equipment Corporation
+	                          frankyling@hgrd01.enet.dec.com
+
+******************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+#include "Xlcint.h"
+#include "Ximint.h"
+#include "XimImSw.h"
+
+static Bool
+_XimCheckIfDefault(
+    Xim		im)
+{
+    return(True);
+}
+
+XimImsportSW _XimImSportRec[] = {
+    { _XimCheckIfLocalProcessing, _XimLocalOpenIM, _XimLocalIMFree },
+    { _XimCheckIfThaiProcessing,	_XimThaiOpenIM,	 _XimThaiIMFree },
+    { _XimCheckIfDefault,         _XimProtoOpenIM, _XimProtoIMFree },
+    { NULL,                       NULL,		 NULL },
+};