Merge branch 'blender2.7'
[blender.git] / source / creator / blender.map
index dc7bc3151e886719a05ca467609e1395a5a1d0e0..9c900a62705e4062664ce68e53810e6c9c339199 100644 (file)
@@ -1,11 +1,24 @@
 
-/* on Linux we exclude LLVM symbols, they conflict with Mesa llvmpipe */
+/* on Linux we exclude LLVM symbols, they conflict with Mesa llvmpipe
+ * we also keep boost's symbols local, since some python modules could
+ * be using boost as well (mainly that's for lux render)
+ */
 
 {
 global:
        *;
+       *_boost*;
 local:
+       *default_error_condition*;
        *llvm*;
        *LLVM*;
+       decodeInstruction;
+       ForceStackAlign;
+       _Jv_RegisterClasses;
+       Name;
+       NumNamedVarArgParams;
+       X86CompilationCallback*;
+       *boost*;
+       *SDL*;
 };