[Mesa-dev] [PATCH] gallivm: fix build with LLVM 3.0svn

[Jose Fonseca]

The /* HAVE_LLVM .. */ comments were inverted. I fixed them and pushed. 

Thanks.  Also thanks to Johannes Obermayr which submited a similar patch later.

Jose

----- Original Message -----
> LLVM 3.0svn moved TargetRegistry.h and TargetSelect.h.
> See revision 138450 of LLVM.
> 
> Signed-off-by: Tobias Droste <tdroste at gmx.de>
> ---
>  src/gallium/auxiliary/gallivm/lp_bld_debug.cpp |   12 +++++++++---
>  1 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
> b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
> index e252607..4302301 100644
> --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
> +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
> @@ -27,17 +27,23 @@
>  
>  #include <llvm-c/Core.h>
>  #include <llvm/Target/TargetMachine.h>
> -#include <llvm/Target/TargetRegistry.h>
> -#include <llvm/Target/TargetSelect.h>
>  #include <llvm/Target/TargetInstrInfo.h>
>  #include <llvm/Support/raw_ostream.h>
>  #include <llvm/Support/MemoryObject.h>
>  
> +#if HAVE_LLVM >= 0x0300
> +#include <llvm/Support/TargetRegistry.h>
> +#include <llvm/Support/TargetSelect.h>
> +#else
> +#include <llvm/Target/TargetRegistry.h>
> +#include <llvm/Target/TargetSelect.h>
> +#endif /* HAVE_LLVM >= 0x0300 */
> +
>  #if HAVE_LLVM >= 0x0209
>  #include <llvm/Support/Host.h>
>  #else
>  #include <llvm/System/Host.h>
> -#endif
> +#endif /* HAVE_LLVM >= 0x0209 */
>  
>  #if HAVE_LLVM >= 0x0207
>  #include <llvm/MC/MCDisassembler.h>
> --
> 1.7.3.4
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>