Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make generated code use namespaced APIs #25

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions compiler/funct.ml
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ let emit_function oc fundecl ins outs locals emit_call =
(* Emit wrapper function for C function *)

let emit_standard_call oc fundecl =
if fundecl.fun_blocking then iprintf oc "enter_blocking_section();\n";
if fundecl.fun_blocking then iprintf oc "caml_enter_blocking_section();\n";
begin match fundecl.fun_call with
Some s ->
iprintf oc "/* begin user-supplied calling sequence */\n";
Expand All @@ -304,7 +304,7 @@ let emit_standard_call oc fundecl =
end;
fprintf oc ");\n"
end;
if fundecl.fun_blocking then iprintf oc "leave_blocking_section();\n"
if fundecl.fun_blocking then iprintf oc "caml_leave_blocking_section();\n"

let emit_wrapper oc fundecl =
current_function := fundecl.fun_name;
Expand All @@ -320,7 +320,7 @@ let emit_method_call intfname methname oc fundecl =
(* Reset the error mechanism *)
iprintf oc "SetErrorInfo(0L, NULL);\n";
(* Emit the call *)
if fundecl.fun_blocking then iprintf oc "enter_blocking_section();\n";
if fundecl.fun_blocking then iprintf oc "caml_enter_blocking_section();\n";
begin match fundecl.fun_call with
Some s ->
iprintf oc "/* begin user-supplied calling sequence */\n";
Expand All @@ -334,7 +334,7 @@ let emit_method_call intfname methname oc fundecl =
List.iter (fun (name, _, _) -> fprintf oc ", %s" name) fundecl.fun_params;
fprintf oc ");\n"
end;
if fundecl.fun_blocking then iprintf oc "leave_blocking_section();\n"
if fundecl.fun_blocking then iprintf oc "caml_leave_blocking_section();\n"

let emit_method_wrapper oc intf_name meth =
current_function := sprintf "%s %s" intf_name meth.fun_name;
Expand Down