libx11 git update 4/9/2010

1 files changed, 136 insertions, 136 deletions

diff --git a/libX11/src/xlibi18n/XimTrans.h b/libX11/src/xlibi18n/XimTrans.h
index 987b5ee33..8de1465aa 100644
--- a/libX11/src/xlibi18n/XimTrans.h
+++ b/libX11/src/xlibi18n/XimTrans.h
@@ -1,136 +1,136 @@
-/*
- * Copyright 1992 Sun Microsystems, Inc.  All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
- */
-/******************************************************************
-
-           Copyright 1992, 1993, 1994 by FUJITSU LIMITED
-
-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
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-FUJITSU LIMITED makes no representations about the suitability of
-this software for any purpose.
-It is provided "as is" without express or implied warranty.
-
-FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL FUJITSU LIMITED 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: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.
-          Takashi Fujiwara     FUJITSU LIMITED
-                               fujiwara@a80.tech.yk.fujitsu.co.jp
-
-******************************************************************/
-
-#ifndef _XIMTRANS_H
-#define _XIMTRANS_H
-
-typedef struct _TransIntrCallbackRec	*TransIntrCallbackPtr;
-
-typedef struct _TransIntrCallbackRec {
-    Bool			(*func)(
-					Xim, INT16, XPointer, XPointer
-					);
-    XPointer			 call_data;
-    TransIntrCallbackPtr	 next;
-} TransIntrCallbackRec ;
-
-typedef struct {
-    TransIntrCallbackPtr	 intr_cb;
-    struct _XtransConnInfo 	*trans_conn; /* transport connection object */
-    int				 fd;
-    char			*address;
-    Window			 window;
-    Bool			 is_putback;
-} TransSpecRec;
-
-
-/*
- * Prototypes
- */
-
-extern Bool _XimTransRegisterDispatcher(
-    Xim		 im,
-    Bool	 (*callback)(
-			     Xim, INT16, XPointer, XPointer
-			     ),
-    XPointer	 call_data
-);
-
-
-extern Bool _XimTransIntrCallback(
-    Xim		 im,
-    Bool	 (*callback)(
-			     Xim, INT16, XPointer, XPointer
-			     ),
-    XPointer	 call_data
-);
-
-extern Bool _XimTransCallDispatcher(
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data
-);
-
-extern void _XimFreeTransIntrCallback(
-    Xim		 im
-);
-
-extern Bool _XimTransFilterWaitEvent(
-    Display	*d,
-    Window	 w,
-    XEvent	*ev,
-    XPointer	 arg
-);
-
-extern void _XimTransInternalConnection(
-    Display	*d,
-    int		 fd,
-    XPointer	 arg
-);
-
-extern Bool _XimTransWrite(
-    Xim		 im,
-    INT16	 len,
-    XPointer	 data
-);
-
-extern Bool _XimTransRead(
-    Xim		 im,
-    XPointer	 recv_buf,
-    int		 buf_len,
-    int		*ret_len
-);
-
-extern void _XimTransFlush(
-    Xim		 im
-);
-
-#endif /* _XIMTRANS__H */
+/*

+ * Copyright 1992 Oracle and/or its affiliates. All rights reserved.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.

+ */

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

+

+           Copyright 1992, 1993, 1994 by FUJITSU LIMITED

+

+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

+not be used in advertising or publicity pertaining to distribution

+of the software without specific, written prior permission.

+FUJITSU LIMITED makes no representations about the suitability of

+this software for any purpose.

+It is provided "as is" without express or implied warranty.

+

+FUJITSU LIMITED DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+EVENT SHALL FUJITSU LIMITED 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: Hideki Hiura (hhiura@Sun.COM) Sun Microsystems, Inc.

+          Takashi Fujiwara     FUJITSU LIMITED

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

+

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

+

+#ifndef _XIMTRANS_H

+#define _XIMTRANS_H

+

+typedef struct _TransIntrCallbackRec	*TransIntrCallbackPtr;

+

+typedef struct _TransIntrCallbackRec {

+    Bool			(*func)(

+					Xim, INT16, XPointer, XPointer

+					);

+    XPointer			 call_data;

+    TransIntrCallbackPtr	 next;

+} TransIntrCallbackRec ;

+

+typedef struct {

+    TransIntrCallbackPtr	 intr_cb;

+    struct _XtransConnInfo 	*trans_conn; /* transport connection object */

+    int				 fd;

+    char			*address;

+    Window			 window;

+    Bool			 is_putback;

+} TransSpecRec;

+

+

+/*

+ * Prototypes

+ */

+

+extern Bool _XimTransRegisterDispatcher(

+    Xim		 im,

+    Bool	 (*callback)(

+			     Xim, INT16, XPointer, XPointer

+			     ),

+    XPointer	 call_data

+);

+

+

+extern Bool _XimTransIntrCallback(

+    Xim		 im,

+    Bool	 (*callback)(

+			     Xim, INT16, XPointer, XPointer

+			     ),

+    XPointer	 call_data

+);

+

+extern Bool _XimTransCallDispatcher(

+    Xim		 im,

+    INT16	 len,

+    XPointer	 data

+);

+

+extern void _XimFreeTransIntrCallback(

+    Xim		 im

+);

+

+extern Bool _XimTransFilterWaitEvent(

+    Display	*d,

+    Window	 w,

+    XEvent	*ev,

+    XPointer	 arg

+);

+

+extern void _XimTransInternalConnection(

+    Display	*d,

+    int		 fd,

+    XPointer	 arg

+);

+

+extern Bool _XimTransWrite(

+    Xim		 im,

+    INT16	 len,

+    XPointer	 data

+);

+

+extern Bool _XimTransRead(

+    Xim		 im,

+    XPointer	 recv_buf,

+    int		 buf_len,

+    int		*ret_len

+);

+

+extern void _XimTransFlush(

+    Xim		 im

+);

+

+#endif /* _XIMTRANS__H */