diff options
author | José Fonseca <jfonseca@vmware.com> | 2010-01-16 23:21:06 +0000 |
---|---|---|
committer | José Fonseca <jfonseca@vmware.com> | 2010-01-16 23:21:06 +0000 |
commit | ba5d600c90f7075cf2c33a0c5c679ef822e8746e (patch) | |
tree | ec6794fba9f2fe563a8bbc03ca06e288b7f51c28 /src/gallium/drivers/llvmpipe/lp_bld_misc.cpp | |
parent | fdfe06ad804ea13e6e436d66c1bcafe0bde2f545 (diff) | |
parent | 164fd16cfbc09970676c2e6866e062a5c9b410db (diff) |
Merge remote branch 'origin/master' into lp-binning
Conflicts:
src/gallium/drivers/llvmpipe/lp_quad.h
src/gallium/drivers/llvmpipe/lp_setup.c
Diffstat (limited to 'src/gallium/drivers/llvmpipe/lp_bld_misc.cpp')
-rw-r--r-- | src/gallium/drivers/llvmpipe/lp_bld_misc.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_bld_misc.cpp b/src/gallium/drivers/llvmpipe/lp_bld_misc.cpp index d3f78c06d9..6e79438ead 100644 --- a/src/gallium/drivers/llvmpipe/lp_bld_misc.cpp +++ b/src/gallium/drivers/llvmpipe/lp_bld_misc.cpp @@ -59,3 +59,17 @@ LLVMInitializeNativeTarget(void) #endif + + +/* + * Hack to allow the linking of release LLVM static libraries on a debug build. + * + * See also: + * - http://social.msdn.microsoft.com/Forums/en-US/vclanguage/thread/7234ea2b-0042-42ed-b4e2-5d8644dfb57d + */ +#if defined(_MSC_VER) && defined(_DEBUG) +#include <crtdefs.h> +extern "C" { + _CRTIMP void __cdecl _invalid_parameter_noinfo(void) {} +} +#endif |