[PATCH:xf86-video-geode] Properly hide config.h inclusion inside HAVE_CONFIG_H.

Thomas Klausner wiz at netbsd.org
Tue Jul 21 14:12:52 PDT 2015


On Mon, Jul 20, 2015 at 05:03:13PM +0100, Emil Velikov wrote:
> Hi Thomas,
> 
> On 20 July 2015 at 09:37, Thomas Klausner <wiz at netbsd.org> wrote:
> > From: Matthew Green <mrg at NetBSD.org>
> >
> > Signed-off-by: Thomas Klausner <wiz at NetBSD.org>
> > ---
> >  src/geode.h | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/src/geode.h b/src/geode.h
> > index ac69368..244cadf 100644
> > --- a/src/geode.h
> > +++ b/src/geode.h
> > @@ -28,7 +28,9 @@
> >  #define _GEODE_H_
> >
> >  #include "geode_pcirename.h"
> > +#ifdef HAVE_CONFIG_H
> >  #include "config.h"
> > +#endif
> >
> While you're here, can you move the config.h inclusion before the
> geode_pcirename.h one ?

Sure, attached.
 Thomas
-------------- next part --------------
>From 4968210734eca510133f035a7318a6f124d689a2 Mon Sep 17 00:00:00 2001
From: Matthew Green <mrg at NetBSD.org>
Date: Mon, 20 Jul 2015 10:37:16 +0200
Subject: [PATCH:xf86-video-geode] Properly hide config.h inclusion inside
 HAVE_CONFIG_H.

Signed-off-by: Thomas Klausner <wiz at NetBSD.org>
---
 src/geode.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/geode.h b/src/geode.h
index ac69368..815efc7 100644
--- a/src/geode.h
+++ b/src/geode.h
@@ -27,8 +27,10 @@
 #ifndef _GEODE_H_
 #define _GEODE_H_
 
-#include "geode_pcirename.h"
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+#include "geode_pcirename.h"
 
 #ifdef HAVE_XAA_H
 #include "xaa.h"
-- 
2.4.6



More information about the xorg-devel mailing list