Series is Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu>
Thanks for splitting them up! On Fri, Mar 6, 2015 at 4:36 PM, Mark Janes <mark.a.ja...@intel.com> wrote: > A previous patch to fix header inclusion within extern "C" neglected > to fix the occurences of this pattern in nouveau files. > > When the helper to detect this issue was pushed to master, it broke > the build for the nouveau driver. This patch fixes the nouveau build. > > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89477 > --- > src/gallium/auxiliary/tgsi/tgsi_scan.h | 7 +++++++ > src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 2 -- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.h > b/src/gallium/auxiliary/tgsi/tgsi_scan.h > index 5dc9267..0ea0e88 100644 > --- a/src/gallium/auxiliary/tgsi/tgsi_scan.h > +++ b/src/gallium/auxiliary/tgsi/tgsi_scan.h > @@ -33,6 +33,10 @@ > #include "pipe/p_state.h" > #include "pipe/p_shader_tokens.h" > > +#ifdef __cplusplus > +extern "C" { > +#endif > + > /** > * Shader summary info > */ > @@ -114,5 +118,8 @@ tgsi_scan_shader(const struct tgsi_token *tokens, > extern boolean > tgsi_is_passthrough_shader(const struct tgsi_token *tokens); > > +#ifdef __cplusplus > +} // extern "C" > +#endif > > #endif /* TGSI_SCAN_H */ > diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp > b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp > index 6e75730..1e0a695 100644 > --- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp > +++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp > @@ -20,11 +20,9 @@ > * OTHER DEALINGS IN THE SOFTWARE. > */ > > -extern "C" { > #include "tgsi/tgsi_dump.h" > #include "tgsi/tgsi_scan.h" > #include "tgsi/tgsi_util.h" > -} > > #include <set> > > -- > 2.1.4 > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev