summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Event.c5
-rw-r--r--src/Initialize.c22
-rw-r--r--src/Makefile.am3
-rw-r--r--src/VarCreate.c8
-rw-r--r--src/Vendor.c2
-rw-r--r--src/sharedlib.c227
6 files changed, 2 insertions, 265 deletions
diff --git a/src/Event.c b/src/Event.c
index df04bea..8bd6a92 100644
--- a/src/Event.c
+++ b/src/Event.c
@@ -1319,10 +1319,7 @@ DispatchEvent(XEvent *event, Widget widget)
typedef enum _GrabType { pass, ignore, remap } GrabType;
-#if !defined(AIXSHLIB)
-static /* AIX shared libraries are broken */
-#endif
-Boolean
+static Boolean
_XtDefaultDispatcher(XEvent *event)
{
register Widget widget;
diff --git a/src/Initialize.c b/src/Initialize.c
index 1380e06..ca0453a 100644
--- a/src/Initialize.c
+++ b/src/Initialize.c
@@ -90,17 +90,6 @@ in this Software without prior written authorization from The Open Group.
#include <stdlib.h>
-#if (defined(SUNSHLIB) || defined(AIXSHLIB)) && defined(SHAREDCODE)
-/*
- * If used as a shared library, generate code under a different name so that
- * the stub routines in sharedlib.c get loaded into the application binary.
- */
-#define XtToolkitInitialize _XtToolkitInitialize
-#define XtOpenApplication _XtOpenApplication
-#define XtAppInitialize _XtAppInitialize
-#define XtInitialize _XtInitialize
-#endif /* (SUNSHLIB || AIXSHLIB) && SHAREDCODE */
-
/* some unspecified magic number of expected search levels for Xrm */
#define SEARCH_LIST_SIZE 1000
@@ -156,17 +145,6 @@ GetHostname(char *buf, int maxlen)
buf[maxlen - 1] = '\0';
}
-#ifdef SUNSHLIB
-void
-_XtInherit(void)
-{
- extern void __XtInherit();
-
- __XtInherit();
-}
-
-#define _XtInherit __XtInherit
-#endif
#if defined (WIN32) || defined(__CYGWIN__)
/*
diff --git a/src/Makefile.am b/src/Makefile.am
index a26e10d..cb39829 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -67,8 +67,7 @@ libXt_la_SOURCES = \
VarCreate.c \
VarGet.c \
Varargs.c \
- Vendor.c \
- sharedlib.c
+ Vendor.c
DISTCLEANFILES = StringDefs.c
diff --git a/src/VarCreate.c b/src/VarCreate.c
index 70cd32b..cf57beb 100644
--- a/src/VarCreate.c
+++ b/src/VarCreate.c
@@ -58,10 +58,6 @@ in this Software without prior written authorization from The Open Group.
#include "VarargsI.h"
#include "CreateI.h"
-#if (defined(SUNSHLIB) || defined(AIXSHLIB)) && defined(SHAREDCODE)
-#define XtToolkitInitialize _XtToolkitInitialize
-#endif /* (SUNSHLIB || AIXSHLIB) && SHAREDCODE */
-
static Widget
_XtVaCreateWidget(String name,
WidgetClass widget_class,
@@ -334,8 +330,6 @@ _XtVaAppInitialize(XtAppContext *app_context_return,
applicationShellWidgetClass, var_args);
}
-#if !((defined(SUNSHLIB) || defined(AIXSHLIB)) && defined(SHAREDCODE))
-
/*
* If not used as a shared library, we still need a front end to
* _XtVaOpenApplication and to _XtVaAppInitialize.
@@ -384,5 +378,3 @@ XtVaAppInitialize(XtAppContext *app_context_return,
va_end(var);
return code;
}
-
-#endif /* !((SUNSHLIB || AIXSHLIB) && SHAREDCODE) */
diff --git a/src/Vendor.c b/src/Vendor.c
index 2a211b2..5c977de 100644
--- a/src/Vendor.c
+++ b/src/Vendor.c
@@ -137,7 +137,5 @@ VendorShellClassRec vendorShellClassRec = {
};
/* *INDENT-ON* */
-#if !defined(AIXSHLIB) || !defined(SHAREDCODE)
externaldef(vendorshellwidgetclass)
WidgetClass vendorShellWidgetClass = (WidgetClass) (&vendorShellClassRec);
-#endif
diff --git a/src/sharedlib.c b/src/sharedlib.c
deleted file mode 100644
index 8ddb05f..0000000
--- a/src/sharedlib.c
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
-
-Copyright 1989, 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(AIXSHLIB)) && !defined(SHAREDCODE)
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include "IntrinsicI.h"
-#include "VarargsI.h"
-#include "ShellP.h"
-#include "VendorP.h"
-#include "CreateI.h"
-
-#if defined(AIXSHLIB)
-WidgetClass vendorShellWidgetClass = (WidgetClass) &vendorShellClassRec;
-
-static void
-_XtVendorInitialize()
-{
- transientShellWidgetClass->core_class.superclass =
- (WidgetClass) &vendorShellClassRec;
- topLevelShellWidgetClass->core_class.superclass =
- (WidgetClass) &vendorShellClassRec;
-}
-
-#define VENDORINIT _XtVendorInitialize();
-
-#else
-
-#define VENDORINIT /* as nothing */
-
-#endif
-
-#ifdef SUNSHLIB
-/*
- * _XtInherit needs to be statically linked since it is compared against as
- * well as called.
- */
-void
-_XtInherit()
-{
- extern void __XtInherit();
-
- __XtInherit();
-}
-#endif
-
-/*
- * The following routine will be called by every toolkit
- * application, forcing this file to be statically linked.
- *
- * Note: XtInitialize, XtAppInitialize, and XtOpenApplication
- * call XtToolkitInitialize.
- */
-
-void
-XtToolkitInitialize()
-{
- extern void _XtToolkitInitialize();
-
- VENDORINIT _XtToolkitInitialize();
-}
-
-Widget
-XtInitialize(_Xconst char *name,
- _Xconst char *classname,
- XrmOptionDescRec *options,
- Cardinal num_options, int *argc, String *argv)
-{
- extern Widget _XtInitialize();
-
- VENDORINIT
- return _XtInitialize(name, classname, options, num_options, argc, argv);
-}
-
-Widget
-XtAppInitialize(XtAppContext *app_context_return,
- _Xconst char *application_class,
- XrmOptionDescRec *options,
- Cardinal num_options,
- int *argc_in_out,
- String *argv_in_out,
- String *fallback_resources,
- ArgList args_in, Cardinal num_args_in)
-{
- extern Widget _XtAppInitialize();
-
- VENDORINIT
- return _XtAppInitialize(app_context_return, application_class, options,
- num_options, argc_in_out, argv_in_out,
- fallback_resources, args_in, num_args_in);
-}
-
-Widget
-XtVaAppInitialize(XtAppContext *app_context_return,
- _Xconst char *application_class,
- XrmOptionDescList options,
- Cardinal num_options,
- int *argc_in_out,
- String *argv_in_out, String *fallback_resources, ...)
-{
- va_list var;
- extern Widget _XtVaAppInitialize();
-
- VENDORINIT va_start(var, fallback_resources);
-
- return _XtVaAppInitialize(app_context_return, application_class, options,
- num_options, argc_in_out, argv_in_out,
- fallback_resources, var);
-}
-
-Widget
-XtOpenApplication(XtAppContext *app_context_return,
- _Xconst char *application_class,
- XrmOptionDescRec *options,
- Cardinal num_options,
- int *argc_in_out,
- String *argv_in_out,
- String *fallback_resources,
- WidgetClass widget_class,
- ArgList args_in, Cardinal num_args_in)
-{
- extern Widget _XtOpenApplication();
-
- VENDORINIT
- return _XtOpenApplication(app_context_return, application_class,
- options, num_options, argc_in_out,
- argv_in_out, fallback_resources, widget_class,
- args_in, num_args_in);
-}
-
-Widget
-XtVaOpenApplication(XtAppContext *app_context_return,
- _Xconst char *application_class,
- XrmOptionDescList options,
- Cardinal num_options,
- int *argc_in_out,
- String *argv_in_out,
- String *fallback_resources, WidgetClass widget_class, ...)
-{
- va_list var;
- extern Widget _XtVaOpenApplication();
-
- VENDORINIT va_start(var, widget_class);
-
- return _XtVaOpenApplication(app_context_return, application_class, options,
- num_options, argc_in_out, argv_in_out,
- fallback_resources, widget_class, var);
-}
-
-#else
-
-#ifndef lint
-static int dummy; /* avoid warning from ranlib */
-#endif
-
-#endif /* SUNSHLIB or AIXSHLIB */
-
-#if defined(SUNSHLIB) && !defined(SHAREDCODE)
-
-int _XtInheritTranslations = 0;
-
-extern CompositeClassRec compositeClassRec;
-WidgetClass compositeWidgetClass = (WidgetClass) &compositeClassRec;
-
-extern ConstraintClassRec constraintClassRec;
-WidgetClass constraintWidgetClass = (WidgetClass) &constraintClassRec;
-
-extern WidgetClassRec widgetClassRec;
-WidgetClass widgetClass = &widgetClassRec;
-WidgetClass coreWidgetClass = &widgetClassRec;
-
-extern ObjectClassRec objectClassRec;
-WidgetClass objectClass = (WidgetClass) &objectClassRec;
-
-extern RectObjClassRec rectObjClassRec;
-WidgetClass rectObjClass = (WidgetClass) &rectObjClassRec;
-
-extern ShellClassRec shellClassRec;
-WidgetClass shellWidgetClass = (WidgetClass) &shellClassRec;
-
-extern OverrideShellClassRec overrideShellClassRec;
-WidgetClass overrideShellWidgetClass = (WidgetClass) &overrideShellClassRec;
-
-extern WMShellClassRec wmShellClassRec;
-WidgetClass wmShellWidgetClass = (WidgetClass) &wmShellClassRec;
-
-extern TransientShellClassRec transientShellClassRec;
-WidgetClass transientShellWidgetClass = (WidgetClass) &transientShellClassRec;
-
-extern TopLevelShellClassRec topLevelShellClassRec;
-WidgetClass topLevelShellWidgetClass = (WidgetClass) &topLevelShellClassRec;
-
-extern ApplicationShellClassRec applicationShellClassRec;
-WidgetClass applicationShellWidgetClass =
- (WidgetClass) &applicationShellClassRec;
-
-extern SessionShellClassRec sessionShellClassRec;
-WidgetClass sessionShellWidgetClass = (WidgetClass) &sessionShellClassRec;
-
-extern HookObjClassRec hookObjClassRec;
-WidgetClass hookObjectClass = (WidgetClass) &hookObjClassRec;
-
-#endif /* SUNSHLIB */