xf86-video-intel: src/intel_options.c

Chris Wilson ickle at kemper.freedesktop.org
Wed May 30 00:30:38 PDT 2012


 src/intel_options.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 740368c4c6eb547adad247ff529d16e594d6459b
Author: Nick Bowler <nbowler at draconx.ca>
Date:   Mon May 28 18:28:28 2012 -0400

    Include config.h in intel_options.c
    
    Commit 8a9a585341e2 ("Only create a single instance of the intel_options
    array") moved the definition of intel_options into a separate .c file.
    Several of the defined options are #ifdef'd based on the configuration,
    but since config.h is never included, the macros being tested are never
    defined.  Therefore, none of the configuration-specific options will
    ever be available at runtime, even if they should be.
    
    Add an inclusion of config.h so that such configuration-specific options
    work again.
    
    Signed-off-by: Nick Bowler <nbowler at draconx.ca>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_options.c b/src/intel_options.c
index 56929be..5679e0e 100644
--- a/src/intel_options.c
+++ b/src/intel_options.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "intel_options.h"
 
 const OptionInfoRec intel_options[] = {


More information about the xorg-commit mailing list