diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2015-02-14 14:10:21 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2015-02-14 14:10:21 -0800 |
| commit | e7094ceaf95a15eae73819d0ffdb9b982075e0d2 (patch) | |
| tree | 8a55b23a9cb33aebafc10ba354159cd6ab91b8df /src | |
| parent | 33a6d9dc30188c02a3ec703153728b31d458ec1e (diff) | |
unifdef -UCRAY -UCRAY2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Resources.c | 21 | ||||
| -rw-r--r-- | src/Shell.c | 15 |
2 files changed, 0 insertions, 36 deletions
diff --git a/src/Resources.c b/src/Resources.c index 1d2871c..9e0f065 100644 --- a/src/Resources.c +++ b/src/Resources.c @@ -86,11 +86,6 @@ static XrmName Qtranslations, QbaseTranslations; static XrmName Qscreen; static XrmClass QScreen; -#ifdef CRAY -void Cjump(); -char *Cjumpp = (char *) Cjump; -void Cjump() {} -#endif void _XtCopyFromParent( Widget widget, @@ -781,13 +776,6 @@ static XtCacheRef *GetResources( /* Convert default value to proper type */ xrm_default_type = rx->xrm_default_type; if (xrm_default_type == QCallProc) { -#ifdef CRAY - if ( (int) Cjumpp != (int) Cjump) - (*(XtResourceDefaultProc) - (((int)(rx->xrm_default_addr))<<2))( - widget,-(rx->xrm_offset+1), &value); - else -#endif (*(XtResourceDefaultProc)(rx->xrm_default_addr))( widget,-(rx->xrm_offset+1), &value); @@ -1123,15 +1111,6 @@ void _XtGetApplicationResources ( XtNumber(quark_cache), &quark_args); /* Compile resource list if needed */ if (((int) resources->resource_offset) >= 0) { -#ifdef CRAY2 - if (base == 0) { /* this client is non-portable, but... */ - int count; - XtResourceList res = resources; - for (count = 0; count < num_resources; res++, count++) { - res->resource_offset *= sizeof(long); - } - } -#endif /* CRAY2 */ XrmCompileResourceListEphem(resources, num_resources); } table = _XtCreateIndirectionTable(resources,num_resources); diff --git a/src/Shell.c b/src/Shell.c index 8a44651..2a627cc 100644 --- a/src/Shell.c +++ b/src/Shell.c @@ -108,17 +108,10 @@ in this Software without prior written authorization from The Open Group. * ***************************************************************************/ -#ifdef CRAY -void _XtShellDepth(Widget, int, XrmValue *); -void _XtShellColormap(Widget, int, XrmValue *); -void _XtShellAncestorSensitive(Widget, int, XrmValue *); -void _XtTitleEncoding(Widget, int, XrmValue *); -#else static void _XtShellDepth(Widget, int, XrmValue *); static void _XtShellColormap(Widget, int, XrmValue *); static void _XtShellAncestorSensitive(Widget, int, XrmValue *); static void _XtTitleEncoding(Widget, int, XrmValue *); -#endif /*************************************************************************** * @@ -931,9 +924,7 @@ static void XtCopyDefaultDepth( value->addr = (XPointer)(&DefaultDepthOfScreen(XtScreenOfObject(widget))); } -#ifndef CRAY static -#endif void _XtShellDepth( Widget widget, int closure, @@ -952,9 +943,7 @@ static void XtCopyDefaultColormap( value->addr = (XPointer)(&DefaultColormapOfScreen(XtScreenOfObject(widget))); } -#ifndef CRAY static -#endif void _XtShellColormap( Widget widget, int closure, @@ -965,9 +954,7 @@ void _XtShellColormap( else _XtCopyFromParent (widget,closure,value); } -#ifndef CRAY static -#endif void _XtShellAncestorSensitive( Widget widget, int closure, @@ -979,9 +966,7 @@ void _XtShellAncestorSensitive( } /*ARGSUSED*/ -#ifndef CRAY static -#endif void _XtTitleEncoding( Widget widget, int offset, |