diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:42 +0000 |
| commit | a6bdd56c5b098599942e4091ae7e2af2d4631b44 (patch) | |
| tree | e0a23167aca0fb1127f4cd78edf458b633b31eac /src/Resources.c | |
| parent | 6a13c9e08bb042c81ae904c44a38a50d785c824e (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/Resources.c')
| -rw-r--r-- | src/Resources.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/Resources.c b/src/Resources.c index 20a56c0..d8e5d40 100644 --- a/src/Resources.c +++ b/src/Resources.c @@ -59,6 +59,8 @@ in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/lib/Xt/Resources.c,v 1.9 2001/12/14 19:56:28 dawes Exp $ */ + /*LINTLIBRARY*/ #include "IntrinsicI.h" #include "VarargsI.h" @@ -370,12 +372,8 @@ void _XtCompileResourceList(resources, num_resources) xrmres->xrm_name = PSToQ(resources->resource_name); xrmres->xrm_class = PSToQ(resources->resource_class); xrmres->xrm_type = PSToQ(resources->resource_type); -#if defined(CRAY1) && !defined(__STDC__) - xrmres->xrm_offset = -(resources->resource_offset * sizeof(long) + 1); -#else xrmres->xrm_offset = (Cardinal) (-(int)resources->resource_offset - 1); -#endif xrmres->xrm_default_type = PSToQ(resources->default_type); } #undef PSToQ @@ -395,12 +393,8 @@ static void XrmCompileResourceListEphem(resources, num_resources) xrmres->xrm_name = StringToName(resources->resource_name); xrmres->xrm_class = StringToClass(resources->resource_class); xrmres->xrm_type = StringToQuark(resources->resource_type); -#if defined(CRAY1) && !defined(__STDC__) - xrmres->xrm_offset = -(resources->resource_offset * sizeof(long) + 1); -#else xrmres->xrm_offset = (Cardinal) (-(int)resources->resource_offset - 1); -#endif xrmres->xrm_default_type = StringToQuark(resources->default_type); } #undef xrmres @@ -413,7 +407,7 @@ static void BadSize(size, name) String params[2]; Cardinal num_params = 2; - params[0] = (String) size; + params[0] = (String)(long) size; params[1] = XrmQuarkToString(name); XtWarningMsg("invalidSizeOverride", "xtDependencies", XtCXtToolkitError, "Representation size %d must match superclass's to override %s", |