diff options
| author | Kevin E Martin <kem@kem.org> | 2004-09-02 01:10:29 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2004-09-02 01:10:29 +0000 |
| commit | c7f720ae3f0dea94bc6e9eb9bdbbf00e6bb16b24 (patch) | |
| tree | 696c1870ecd8f7889124f093204aea6641d525f1 | |
| parent | 93df4ff66635ea936d57723d317d0a0cdaa55e62 (diff) | |
Bump major version number of libXaw (Bug #1273).rel-0-6-1lg3d-rel-0-7-0lg3d-baseXORG-6_8_1XORG-6_8_0XORG-6_7_99_904
| -rw-r--r-- | src/AllWidgets.c | 8 | ||||
| -rw-r--r-- | src/sharedlib.c | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/AllWidgets.c b/src/AllWidgets.c index 115ea9e..635d952 100644 --- a/src/AllWidgets.c +++ b/src/AllWidgets.c @@ -67,11 +67,9 @@ extern WidgetClass treeWidgetClass; extern WidgetClass vendorShellWidgetClass; extern WidgetClass viewportWidgetClass; extern WidgetClass wmShellWidgetClass; -#ifndef OLDXAW -#ifdef XPRINT_IN_XAW +#if !defined(OLDXAW) && !defined(XAW7) extern WidgetClass xawPrintShellWidgetClass; #endif -#endif XmuWidgetNode XawWidgetArray[] = { { "applicationShell", &applicationShellWidgetClass }, @@ -116,11 +114,9 @@ XmuWidgetNode XawWidgetArray[] = { { "vendorShell", &vendorShellWidgetClass }, { "viewport", &viewportWidgetClass }, { "wmShell", &wmShellWidgetClass }, -#ifndef OLDXAW -#ifdef XPRINT_IN_XAW +#if !defined(OLDXAW) && !defined(XAW7) { "printShell", &xawPrintShellWidgetClass }, #endif -#endif }; int XawWidgetCount = XtNumber(XawWidgetArray); diff --git a/src/sharedlib.c b/src/sharedlib.c index eafed79..6739dd7 100644 --- a/src/sharedlib.c +++ b/src/sharedlib.c @@ -59,7 +59,9 @@ in this Software without prior written authorization from The Open Group. #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; @@ -169,7 +171,7 @@ WidgetClass vendorShellWidgetClass = (WidgetClass) &vendorShellClassRec; extern ViewportClassRec viewportClassRec; WidgetClass viewportWidgetClass = (WidgetClass)&viewportClassRec; -#ifndef OLDXAW +#if !defined(OLDXAW) && !defined(XAW7) extern XawPrintShellClassRec xawPrintShellClassRec; WidgetClass xawPrintShellWidgetClass = (WidgetClass) &xawPrintShellClassRec; #endif |