On Wed, Feb 05, 2003 at 03:53:04PM -0700, Bdale Garbee wrote: > This seems to work. Only light testing so far, though. I called it > > 454_ia64_XlcDL.c_hack.diff > > Bdale Thanks, Bdale! Content-Description: patch for X to build on ia64 again > >From Bdale Garbee, a quick hack to get ia64 compiling again since none of us > really understand what the point of this bit is, and it doesn't seem relevant > on ia64 which is also an LP64 architecture. > > --- xc/lib/X11/XlcDL.c.orig 2003-02-05 10:42:56.000000000 -0700 > +++ xc/lib/X11/XlcDL.c 2003-02-05 10:45:04.000000000 -0700 > @@ -55,14 +55,14 @@ > #include "XlcPublic.h" > #include "XlcPubI.h" > > -#ifdef _LP64 > +#if defined(_LP64) && !defined(__ia64__) > #if defined(__sparcv9) > #define _MACH64_NAME "sparcv9" > #define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1) > #else /* !defined(__sparcv9) */ > #error "Unknown architecture" > #endif /* defined(__sparcv9) */ > -#endif /* _LP64 */ > +#endif /* _LP64 && !__ia64__ */ > > #define XI18N_DLREL 2 > > @@ -244,7 +244,7 @@ > if (strstr (dl_name, "../")) > return NULL; > > -#ifdef _LP64 > +#if defined(_LP64) && !defined(__ia64__) > len = (lc_dir ? strlen(lc_dir) : 0 ) + > (dl_name ? strlen(dl_name) : 0) + _MACH64_NAME_LEN + 10; > path = Xmalloc(len + 1); -- G. Branden Robinson | The only way to get rid of a Debian GNU/Linux | temptation is to yield to it. branden@debian.org | -- Oscar Wilde http://people.debian.org/~branden/ |
Attachment:
pgpoqc9mIM35n.pgp
Description: PGP signature