On 01/ 6/11 02:29 PM, Adam Jackson wrote: > Use _LP64 (verified on gcc and sun compilers) instead of _XSERVER64 in > internal header usage, and always define _XSERVER64 for modules if _LP64 > is defined. Prevents differing xorg-server.h between 32 and 64 bit > packages.
> diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in > index 76cab16..b10b994 100644 > --- a/include/xorg-server.h.in > +++ b/include/xorg-server.h.in > @@ -157,9 +157,6 @@ > /* Name of X server */ > #undef __XSERVERNAME__ > > -/* Define to 1 if unsigned long is 64 bits. */ > -#undef _XSERVER64 > - > /* Building vgahw module */ > #undef WITH_VGAHW > > @@ -187,4 +184,8 @@ > /* X Access Control Extension */ > #undef XACE > > +#ifdef _LP64 > +#define _XSERVER64 1 > +#endif > + > #endif /* _XORG_SERVER_H_ */ We've had an almost identical change in the Solaris packages of xorg-server.h since we started shipping 64-bit servers, so that definitely gets my vote. Reviewed-by: Alan Coopersmith <[email protected]> Would a similar change to dix-config.h make sense to get rid of the dix-config-apple-verbatim.h hack? -- -Alan Coopersmith- [email protected] Oracle Solaris Platform Engineering: X Window System _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
