svn merge ^/branches/released .

1 files changed, 45 insertions, 48 deletions

diff --git a/libXmu/src/FToCback.c b/libXmu/src/FToCback.c
index 6da4826f7..e001cc972 100644
--- a/libXmu/src/FToCback.c
+++ b/libXmu/src/FToCback.c
@@ -1,48 +1,45 @@
-/* $Xorg: FToCback.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
-/* 
- 
-Copyright 1988,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.
-
-*/
-/* $XFree86: xc/lib/Xmu/FToCback.c,v 1.6 2001/01/17 19:42:55 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include	<X11/Intrinsic.h>
-#include <X11/Xmu/Converters.h>
-
-/* ARGSUSED */
-void
-XmuCvtFunctionToCallback(XrmValue *args, Cardinal *num_args,
-			 XrmValuePtr fromVal, XrmValuePtr toVal)
-{
-    static XtCallbackRec callback[2]; /* K&R: initialized to NULL */
-    static XtCallbackList callback_list = callback;
-
-    callback[0].callback = *(XtCallbackProc *)fromVal->addr;
-
-    toVal->size = sizeof(XtCallbackList);
-    toVal->addr = (XPointer)&callback_list;
-}
+/* 

+ 

+Copyright 1988,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	<X11/Intrinsic.h>

+#include <X11/Xmu/Converters.h>

+

+/* ARGSUSED */

+void

+XmuCvtFunctionToCallback(XrmValue *args, Cardinal *num_args,

+			 XrmValuePtr fromVal, XrmValuePtr toVal)

+{

+    static XtCallbackRec callback[2]; /* K&R: initialized to NULL */

+    static XtCallbackList callback_list = callback;

+

+    callback[0].callback = *(XtCallbackProc *)fromVal->addr;

+

+    toVal->size = sizeof(XtCallbackList);

+    toVal->addr = (XPointer)&callback_list;

+}