Merge branch 'smaneth-devel' of ssh://git.nguyen.vg/SXSI/xpathcomp into smaneth-devel

diff --combined src/lexindex_stub.cpp
index ab595ae,00694b7..315be7f
--- 1/src/lexindex_stub.cpp
--- 2/src/lexindex_stub.cpp
+++ b/src/lexindex_stub.cpp
@@@ -105,7 -105,7 +105,7 @@@ void printIndex(const char * label, vec
      }
  }
  
- extern "C" value caml_build_lex_index(value vtree, value vtag, value vtag2)
+ ML_BINDING value caml_build_lex_index(value vtree, value vtag, value vtag2)
  {
    CAMLparam2(vtree, vtag);
    CAMLlocal1(vindex);
@@@ -114,10 -114,12 +114,10 @@@
    tree = XMLTREE(vtree);
    tag = TAG(vtag);
    tag2 = TAG(vtag2);
 -  
    //Uncomment the following and comment the failwith line
    //LEXINDEX(vindex) = ... return a lex_index* ....
  
    if ((tag==-1) || (tag2==-1)) caml_failwith("<INVALID TAG>");
 -
    preorderTraverse(0, tree->first_child(tree->ROOT));
    sort(myvector.begin(), myvector.end(), myfunction); 
    sort(myvector2.begin(), myvector2.end(), myfunction); 
@@@ -126,12 -128,14 +126,12 @@@
    printIndex("Result" , mergeJoin(myvector, myvector2));
  }
  
- extern "C" value caml_print_lex_index(value vindex)
+ ML_BINDING value caml_print_lex_index(value vindex)
  {
    CAMLparam1(vindex);
    lex_index* index = LEXINDEX(vindex);
  
    //Print the index to the terminal
 -
    caml_failwith("print_lex_index not implemented");
 -
    CAMLreturn (Val_unit);
  }