svn merge ^/branches/released .

1 files changed, 173 insertions, 182 deletions

diff --git a/libXaw/src/sharedlib.c b/libXaw/src/sharedlib.c
index d107f9fcb..31903fc4b 100644
--- a/libXaw/src/sharedlib.c
+++ b/libXaw/src/sharedlib.c
@@ -1,182 +1,173 @@
-/* $Xorg: sharedlib.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */
-/*
-
-Copyright 1991, 1994, 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.
-
-*/
-
-#if defined(SUNSHLIB) && !defined(SHAREDCODE)
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/IntrinsicP.h>
-#include <X11/Xaw/AsciiSinkP.h>
-#include <X11/Xaw/AsciiSrcP.h>
-#include <X11/Xaw/AsciiTextP.h>
-#include <X11/Xaw/MultiSinkP.h>
-#include <X11/Xaw/MultiSrcP.h>
-#include <X11/Xaw/BoxP.h>
-#include <X11/Xaw/CommandP.h>
-#include <X11/Xaw/DialogP.h>
-#include <X11/Xaw/FormP.h>
-#include <X11/Xaw/GripP.h>
-#include <X11/Xaw/LabelP.h>
-#include <X11/Xaw/ListP.h>
-#include <X11/Xaw/MenuButtoP.h>
-#include <X11/Xaw/PanedP.h>
-#include <X11/Xaw/PannerP.h>
-#include <X11/Xaw/PortholeP.h>
-#include <X11/Xaw/RepeaterP.h>
-#include <X11/Xaw/ScrollbarP.h>
-#include <X11/Xaw/SimpleP.h>
-#include <X11/Xaw/SimpleMenP.h>
-#include <X11/Xaw/SmeP.h>
-#include <X11/Xaw/SmeBSBP.h>
-#include <X11/Xaw/SmeLineP.h>
-#include <X11/Xaw/StripCharP.h>
-#include <X11/Xaw/TextP.h>
-#include <X11/Xaw/TextSinkP.h>
-#include <X11/Xaw/TextSrcP.h>
-#include <X11/Xaw/ToggleP.h>
-#include <X11/Xaw/TreeP.h>
-#include <X11/VendorP.h>
-#include <X11/Xaw/ViewportP.h>
-#if !defined(OLDXAW) && !defined(XAW7)
-#include <X11/Xaw/PrintSP.h>
-#endif
-
-extern AsciiSinkClassRec asciiSinkClassRec;
-WidgetClass asciiSinkObjectClass = (WidgetClass)&asciiSinkClassRec;
-
-extern AsciiSrcClassRec asciiSrcClassRec;
-WidgetClass asciiSrcObjectClass = (WidgetClass)&asciiSrcClassRec;
-
-extern AsciiTextClassRec asciiTextClassRec;
-WidgetClass asciiTextWidgetClass = (WidgetClass)&asciiTextClassRec;
-
-#ifdef ASCII_STRING
-extern AsciiStringClassRec asciiStringClassRec;
-WidgetClass asciiStringWidgetClass = (WidgetClass)&asciiStringClassRec;
-#endif
-
-#ifdef ASCII_DISK
-extern AsciiDiskClassRec asciiDiskClassRec;
-WidgetClass asciiDiskWidgetClass = (WidgetClass)&asciiDiskClassRec;
-#endif
-
-extern MultiSinkClassRec multiSinkClassRec;
-WidgetClass multiSinkObjectClass = (WidgetClass)&multiSinkClassRec;
-
-extern MultiSrcClassRec multiSrcClassRec;
-WidgetClass multiSrcObjectClass = (WidgetClass)&multiSrcClassRec;
-
-extern BoxClassRec boxClassRec;
-WidgetClass boxWidgetClass = (WidgetClass)&boxClassRec;
-
-extern CommandClassRec commandClassRec;
-WidgetClass commandWidgetClass = (WidgetClass) &commandClassRec;
-
-extern DialogClassRec dialogClassRec;
-WidgetClass dialogWidgetClass = (WidgetClass)&dialogClassRec;
-
-extern FormClassRec formClassRec;
-WidgetClass formWidgetClass = (WidgetClass)&formClassRec;
-
-extern GripClassRec gripClassRec;
-WidgetClass gripWidgetClass = (WidgetClass) &gripClassRec;
-
-extern LabelClassRec labelClassRec;
-WidgetClass labelWidgetClass = (WidgetClass)&labelClassRec;
-
-extern ListClassRec listClassRec;
-WidgetClass listWidgetClass = (WidgetClass)&listClassRec;
-
-extern MenuButtonClassRec menuButtonClassRec;
-WidgetClass menuButtonWidgetClass = (WidgetClass) &menuButtonClassRec;
-
-extern PanedClassRec panedClassRec;
-WidgetClass panedWidgetClass = (WidgetClass) &panedClassRec;
-WidgetClass vPanedWidgetClass = (WidgetClass) &panedClassRec;
-
-extern PannerClassRec pannerClassRec;
-WidgetClass pannerWidgetClass = (WidgetClass) &pannerClassRec;
-
-extern PortholeClassRec portholeClassRec;
-WidgetClass portholeWidgetClass = (WidgetClass) &portholeClassRec;
-
-extern RepeaterClassRec repeaterClassRec;
-WidgetClass repeaterWidgetClass = (WidgetClass) &repeaterClassRec;
-
-extern ScrollbarClassRec scrollbarClassRec;
-WidgetClass scrollbarWidgetClass = (WidgetClass)&scrollbarClassRec;
-
-extern SimpleClassRec simpleClassRec;
-WidgetClass simpleWidgetClass = (WidgetClass)&simpleClassRec;
-
-extern SimpleMenuClassRec simpleMenuClassRec;
-WidgetClass simpleMenuWidgetClass = (WidgetClass)&simpleMenuClassRec;
-
-extern SmeClassRec smeClassRec;
-WidgetClass smeObjectClass = (WidgetClass) &smeClassRec;
-
-extern SmeBSBClassRec smeBSBClassRec;
-WidgetClass smeBSBObjectClass = (WidgetClass) &smeBSBClassRec;
-
-extern SmeLineClassRec smeLineClassRec;
-WidgetClass smeLineObjectClass = (WidgetClass) &smeLineClassRec;
-
-extern StripChartClassRec stripChartClassRec;
-WidgetClass stripChartWidgetClass = (WidgetClass) &stripChartClassRec;
-
-extern TextClassRec textClassRec;
-WidgetClass textWidgetClass = (WidgetClass)&textClassRec;
-
-unsigned long FMT8BIT = 0L;
-unsigned long XawFmt8Bit = 0L;
-unsigned long XawFmtWide = 0L;
-
-extern TextSinkClassRec textSinkClassRec;
-WidgetClass textSinkObjectClass = (WidgetClass)&textSinkClassRec;
-
-extern TextSrcClassRec textSrcClassRec;
-WidgetClass textSrcObjectClass = (WidgetClass)&textSrcClassRec;
-
-extern ToggleClassRec toggleClassRec;
-WidgetClass toggleWidgetClass = (WidgetClass) &toggleClassRec;
-
-extern TreeClassRec treeClassRec;
-WidgetClass treeWidgetClass = (WidgetClass) &treeClassRec;
-
-extern VendorShellClassRec vendorShellClassRec;
-WidgetClass vendorShellWidgetClass = (WidgetClass) &vendorShellClassRec;
-
-extern ViewportClassRec viewportClassRec;
-WidgetClass viewportWidgetClass = (WidgetClass)&viewportClassRec;
-
-#if !defined(OLDXAW) && !defined(XAW7)
-extern XawPrintShellClassRec xawPrintShellClassRec;
-WidgetClass xawPrintShellWidgetClass = (WidgetClass) &xawPrintShellClassRec;
-#endif
- 
-#endif /* SUNSHLIB */
+/*

+

+Copyright 1991, 1994, 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.

+

+*/

+

+#if defined(SUNSHLIB) && !defined(SHAREDCODE)

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <X11/IntrinsicP.h>

+#include <X11/Xaw/AsciiSinkP.h>

+#include <X11/Xaw/AsciiSrcP.h>

+#include <X11/Xaw/AsciiTextP.h>

+#include <X11/Xaw/MultiSinkP.h>

+#include <X11/Xaw/MultiSrcP.h>

+#include <X11/Xaw/BoxP.h>

+#include <X11/Xaw/CommandP.h>

+#include <X11/Xaw/DialogP.h>

+#include <X11/Xaw/FormP.h>

+#include <X11/Xaw/GripP.h>

+#include <X11/Xaw/LabelP.h>

+#include <X11/Xaw/ListP.h>

+#include <X11/Xaw/MenuButtoP.h>

+#include <X11/Xaw/PanedP.h>

+#include <X11/Xaw/PannerP.h>

+#include <X11/Xaw/PortholeP.h>

+#include <X11/Xaw/RepeaterP.h>

+#include <X11/Xaw/ScrollbarP.h>

+#include <X11/Xaw/SimpleP.h>

+#include <X11/Xaw/SimpleMenP.h>

+#include <X11/Xaw/SmeP.h>

+#include <X11/Xaw/SmeBSBP.h>

+#include <X11/Xaw/SmeLineP.h>

+#include <X11/Xaw/StripCharP.h>

+#include <X11/Xaw/TextP.h>

+#include <X11/Xaw/TextSinkP.h>

+#include <X11/Xaw/TextSrcP.h>

+#include <X11/Xaw/ToggleP.h>

+#include <X11/Xaw/TreeP.h>

+#include <X11/VendorP.h>

+#include <X11/Xaw/ViewportP.h>

+

+extern AsciiSinkClassRec asciiSinkClassRec;

+WidgetClass asciiSinkObjectClass = (WidgetClass)&asciiSinkClassRec;

+

+extern AsciiSrcClassRec asciiSrcClassRec;

+WidgetClass asciiSrcObjectClass = (WidgetClass)&asciiSrcClassRec;

+

+extern AsciiTextClassRec asciiTextClassRec;

+WidgetClass asciiTextWidgetClass = (WidgetClass)&asciiTextClassRec;

+

+#ifdef ASCII_STRING

+extern AsciiStringClassRec asciiStringClassRec;

+WidgetClass asciiStringWidgetClass = (WidgetClass)&asciiStringClassRec;

+#endif

+

+#ifdef ASCII_DISK

+extern AsciiDiskClassRec asciiDiskClassRec;

+WidgetClass asciiDiskWidgetClass = (WidgetClass)&asciiDiskClassRec;

+#endif

+

+extern MultiSinkClassRec multiSinkClassRec;

+WidgetClass multiSinkObjectClass = (WidgetClass)&multiSinkClassRec;

+

+extern MultiSrcClassRec multiSrcClassRec;

+WidgetClass multiSrcObjectClass = (WidgetClass)&multiSrcClassRec;

+

+extern BoxClassRec boxClassRec;

+WidgetClass boxWidgetClass = (WidgetClass)&boxClassRec;

+

+extern CommandClassRec commandClassRec;

+WidgetClass commandWidgetClass = (WidgetClass) &commandClassRec;

+

+extern DialogClassRec dialogClassRec;

+WidgetClass dialogWidgetClass = (WidgetClass)&dialogClassRec;

+

+extern FormClassRec formClassRec;

+WidgetClass formWidgetClass = (WidgetClass)&formClassRec;

+

+extern GripClassRec gripClassRec;

+WidgetClass gripWidgetClass = (WidgetClass) &gripClassRec;

+

+extern LabelClassRec labelClassRec;

+WidgetClass labelWidgetClass = (WidgetClass)&labelClassRec;

+

+extern ListClassRec listClassRec;

+WidgetClass listWidgetClass = (WidgetClass)&listClassRec;

+

+extern MenuButtonClassRec menuButtonClassRec;

+WidgetClass menuButtonWidgetClass = (WidgetClass) &menuButtonClassRec;

+

+extern PanedClassRec panedClassRec;

+WidgetClass panedWidgetClass = (WidgetClass) &panedClassRec;

+WidgetClass vPanedWidgetClass = (WidgetClass) &panedClassRec;

+

+extern PannerClassRec pannerClassRec;

+WidgetClass pannerWidgetClass = (WidgetClass) &pannerClassRec;

+

+extern PortholeClassRec portholeClassRec;

+WidgetClass portholeWidgetClass = (WidgetClass) &portholeClassRec;

+

+extern RepeaterClassRec repeaterClassRec;

+WidgetClass repeaterWidgetClass = (WidgetClass) &repeaterClassRec;

+

+extern ScrollbarClassRec scrollbarClassRec;

+WidgetClass scrollbarWidgetClass = (WidgetClass)&scrollbarClassRec;

+

+extern SimpleClassRec simpleClassRec;

+WidgetClass simpleWidgetClass = (WidgetClass)&simpleClassRec;

+

+extern SimpleMenuClassRec simpleMenuClassRec;

+WidgetClass simpleMenuWidgetClass = (WidgetClass)&simpleMenuClassRec;

+

+extern SmeClassRec smeClassRec;

+WidgetClass smeObjectClass = (WidgetClass) &smeClassRec;

+

+extern SmeBSBClassRec smeBSBClassRec;

+WidgetClass smeBSBObjectClass = (WidgetClass) &smeBSBClassRec;

+

+extern SmeLineClassRec smeLineClassRec;

+WidgetClass smeLineObjectClass = (WidgetClass) &smeLineClassRec;

+

+extern StripChartClassRec stripChartClassRec;

+WidgetClass stripChartWidgetClass = (WidgetClass) &stripChartClassRec;

+

+extern TextClassRec textClassRec;

+WidgetClass textWidgetClass = (WidgetClass)&textClassRec;

+

+unsigned long FMT8BIT = 0L;

+unsigned long XawFmt8Bit = 0L;

+unsigned long XawFmtWide = 0L;

+

+extern TextSinkClassRec textSinkClassRec;

+WidgetClass textSinkObjectClass = (WidgetClass)&textSinkClassRec;

+

+extern TextSrcClassRec textSrcClassRec;

+WidgetClass textSrcObjectClass = (WidgetClass)&textSrcClassRec;

+

+extern ToggleClassRec toggleClassRec;

+WidgetClass toggleWidgetClass = (WidgetClass) &toggleClassRec;

+

+extern TreeClassRec treeClassRec;

+WidgetClass treeWidgetClass = (WidgetClass) &treeClassRec;

+

+extern VendorShellClassRec vendorShellClassRec;

+WidgetClass vendorShellWidgetClass = (WidgetClass) &vendorShellClassRec;

+

+extern ViewportClassRec viewportClassRec;

+WidgetClass viewportWidgetClass = (WidgetClass)&viewportClassRec;

+

+#endif /* SUNSHLIB */