On 31.07.2014 15:58, Keith Packard wrote: > Michel Dänzer <[email protected]> writes: > >> On 31.07.2014 02:16, Keith Packard wrote: >>> Michel Dänzer <[email protected]> writes: >>> >>>> -#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. >> >> Sounds good. > > How about you 'R-b' my patch and submit a patch to misc.h which I can > R-b and then we can get both merged to master and make it possible to > build drivers again?
You seem to have a better idea what needs to be done. I just pointed out that it's better to check for one of those headers having been included than to include them explicitly. -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer
signature.asc
Description: OpenPGP digital signature
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
