Michel Dänzer <[email protected]> writes: > On 29.07.2014 05:02, Keith Packard wrote: >> Use dix-config.h when present, otherwise use xorg-server.h
To clarify, we've got a pile of config files available: dix-config.h All server files need this kdrive-config.h All kdrive files need this xorg-config.h Xorg needs this xwin-config.h Xwin needs this xorg-server.h No server file can use this Anything under hw/xfree86 should include xorg-server.h Anything under hw/xwin should include xwin-config.h. Anything under hw/kdrive should include kdrive-config.h Everything else should include dix-config.h Nothing should include xorg-server.h > -#ifdef HAVE_DIX_CONFIG_H > -#include "dix-config.h" > -#else > -#include "xorg-server.h" > +#if !defined(_DIX_CONFIG_H_) && !defined(_XORG_SERVER_H_) > +#error Drivers must include xorg-server.h before any other xserver headers > +#error xserver code must include dix-config.h before any other headers > #endif Might be better to stick this check in os.h or misc.h as those are both included by most of the files in the server. But, this seems like a good safety measure. I ran through the entire server source code and verified that every single file depends on dix-config.h. Then, I went and looked for files including xorg-server.h and found a few. I've sent out a patch which fixes those and adds a check in xorg-server.h.in to make sure no-one ever does it again. -- [email protected]
pgpFBu1DzJpt5.pgp
Description: PGP signature
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
