Merge branch 'handle-stdout'

[SXSI/xpathcomp.git] / src / common_stub.hpp

diff --git a/src/common_stub.hpp b/src/common_stub.hpp
index 3e874b7..ae672da 100644 (file)
--- a/src/common_stub.hpp
+++ b/src/common_stub.hpp
@@ -14,9 +14,17 @@ extern "C" {
 }
 #include <typeinfo>
 #include <cstdio>
+#include <cassert>
 
 #define NoAlloc
 
+//Must be used in front of every function that is called from OCaml.
+#if _M_IX86 || __i386
+#define ML_BINDING extern "C" __attribute__ ((force_align_arg_pointer))
+#else
+#define ML_BINDING extern "C"
+#endif
+
 
 void register_custom_(char* name,
                      size_t size,
@@ -26,6 +34,7 @@ value alloc_custom_(char* name);
 
 template <class X> X& Obj_val(value v)
 {
+  assert(Tag_val(v) == Custom_tag);
   return * (X*) Data_custom_val(v);
 }
 
@@ -56,8 +65,7 @@ sxsi_alloc_custom(void (*finalize)(value) = sxsi_finalize_custom<X>)
 
 void sxsi_raise_msg(const char * msg);
 
-extern "C" value sxsi_cpp_init(value unit);
-
+ML_BINDING value sxsi_cpp_init(value unit);
 
 
 #endif