Remove compatibility definitions

Add ocaml includes after user includes

Author: bobot

lib/generate.ml

@@ -5,6 +5,7 @@ let print_h cout =
   output_string cout "#include <inttypes.h>\n"
 
 let print_c cout =
+  output_string cout "#define CAML_NAME_SPACE\n";
   output_string cout "#include <caml/mlvalues.h>\n";
   output_string cout "#include <caml/memory.h>\n";
   output_string cout "#include <caml/alloc.h>\n";
@@ -32,13 +33,13 @@ let to_file ?(in_header = false) ?(prefix = "camlid_") ?(headers = [])
       (Printf.sprintf "#ifndef %s\n#define %s\n" basename basename);
     output_string cout_c (Printf.sprintf "#include \"%s\"\n" filename_h));
   print_h cout_h;
-  print_c cout_c;
   List.iter
     (fun header -> Printf.fprintf cout_h "#include \"%s\"\n" header)
     headers;
   List.iter
     (fun header -> Printf.fprintf cout_c "#include \"%s\"\n" header)
     definitions;
+  print_c cout_c;
   let cout_ml = open_out (basename ^ ".ml") in
   header_ml cout_ml;
   final_print ~prefix ~ml:cout_ml ~c:cout_c ~h:cout_h ML

tests/abstract/mylib_stub.c

@@ -1,13 +1,14 @@
 // generated using generator.exe and camlid
 #include <stddef.h>
 #include <inttypes.h>
+#include "lib.h"
+#define CAML_NAME_SPACE
 #include <caml/mlvalues.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>
 #include <caml/custom.h>
 #include <stdio.h>
 #include <string.h>
-#include "lib.h"
 typedef int * camlid_abstract;
 static void camlid_c2ml(value * v, camlid_abstract * c){
   *v = caml_alloc((sizeof(camlid_abstract) + sizeof(value) - 1) / sizeof(value), Abstract_tag);

tests/array/mylib_stub.c

@@ -1,13 +1,14 @@
 // generated using generator.exe and camlid
 #include <stddef.h>
 #include <inttypes.h>
+#include "lib.h"
+#define CAML_NAME_SPACE
 #include <caml/mlvalues.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>
 #include <caml/custom.h>
 #include <stdio.h>
 #include <string.h>
-#include "lib.h"
 struct camlid_array_s { intptr_t* t; size_t len; };
 typedef struct camlid_array_s camlid_array;
 static void camlid_ml2c(value * v, camlid_array * c){

tests/convert/mylib_stub.c

@@ -1,12 +1,13 @@
 // generated using generator.exe and camlid
 #include "mylib_stub.h"
+#include "defs.h"
+#define CAML_NAME_SPACE
 #include <caml/mlvalues.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>
 #include <caml/custom.h>
 #include <stdio.h>
 #include <string.h>
-#include "defs.h"
 static void camlid_c2ml1(value * v, camlid_result * c){
   CAMLparam0();
   CAMLlocal1(tmp);

tests/cudd/defs.h

@@ -1,4 +1,5 @@
 #include "mylib_stub.h"
+#include <stdio.h>
 
 static DdManager* cudd_init(void){
     return Cudd_Init(0, 0, CUDD_UNIQUE_SLOTS, CUDD_CACHE_SLOTS, 0);

tests/cudd/mylib_stub.c

@@ -1,12 +1,13 @@
 // generated using generator.exe and camlid
 #include "mylib_stub.h"
+#include "./defs.h"
+#define CAML_NAME_SPACE
 #include <caml/mlvalues.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>
 #include <caml/custom.h>
 #include <stdio.h>
 #include <string.h>
-#include "./defs.h"
 static void caml_cudd_init(DdManager* * i){ Cudd_Quit(*i); free(*i); }
 static void caml_cudd_finalize_op(value v){
   caml_cudd_init(((DdManager* *) Data_custom_val(v)));

tests/custom/mylib_stub.c

@@ -1,13 +1,14 @@
 // generated using generator.exe and camlid
 #include <stddef.h>
 #include <inttypes.h>
+#include "lib.h"
+#define CAML_NAME_SPACE
 #include <caml/mlvalues.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>
 #include <caml/custom.h>
 #include <stdio.h>
 #include <string.h>
-#include "lib.h"
 static void camlid_finalize_op(value v){
   finalize_ptr(((int * *) Data_custom_val(v)));
   }

tests/inout/mylib_stub.c

@@ -1,13 +1,14 @@
 // generated using generator.exe and camlid
 #include <stddef.h>
 #include <inttypes.h>
+#include "lib.h"
+#define CAML_NAME_SPACE
 #include <caml/mlvalues.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>
 #include <caml/custom.h>
 #include <stdio.h>
 #include <string.h>
-#include "lib.h"
 typedef intptr_t * camlid_ref;
 extern intptr_t camlid_stub_f_nat(intptr_t p){
   CAMLparam0();

tests/input/mylib_stub.c

@@ -1,13 +1,14 @@
 // generated using generator.exe and camlid
 #include <stddef.h>
 #include <inttypes.h>
+#include "./lib.h"
+#define CAML_NAME_SPACE
 #include <caml/mlvalues.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>
 #include <caml/custom.h>
 #include <stdio.h>
 #include <string.h>
-#include "./lib.h"
 extern value camlid_stub_f(intptr_t p){
   CAMLparam0();
   int p1 = ((int) { 0 });

tests/no_arg_no_value/mylib_stub.c

@@ -1,12 +1,13 @@
 // generated using generator.exe and camlid
 #include <stddef.h>
 #include <inttypes.h>
+#include "lib.h"
+#define CAML_NAME_SPACE
 #include <caml/mlvalues.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>
 #include <caml/custom.h>
 #include <stdio.h>
 #include <string.h>
-#include "lib.h"
 extern value camlid_stub_f(void){CAMLparam0();f();CAMLreturn(Val_unit);}