diff options
| -rwxr-xr-x | boot/ocamlc | bin | 948084 -> 945588 bytes | |||
| -rwxr-xr-x | boot/ocamllex | bin | 147675 -> 144736 bytes | |||
| -rw-r--r-- | byterun/mlvalues.h | 6 | ||||
| -rw-r--r-- | byterun/sys.c | 2 | ||||
| -rw-r--r-- | stdlib/filename.ml | 2 | ||||
| -rw-r--r-- | stdlib/pervasives.ml | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/boot/ocamlc b/boot/ocamlc Binary files differindex 8b739e39d..a9f2d2f8a 100755 --- a/boot/ocamlc +++ b/boot/ocamlc diff --git a/boot/ocamllex b/boot/ocamllex Binary files differindex b62a2b463..0746d69d3 100755 --- a/boot/ocamllex +++ b/boot/ocamllex diff --git a/byterun/mlvalues.h b/byterun/mlvalues.h index bf52b53d4..40c83998a 100644 --- a/byterun/mlvalues.h +++ b/byterun/mlvalues.h @@ -13,8 +13,8 @@ /* $Id$ */ -#ifndef _mlvalues_ -#define _mlvalues_ +#ifndef CAML_MLVALUES_H +#define CAML_MLVALUES_H #include "config.h" @@ -296,4 +296,4 @@ CAMLextern char * static_data_start, * static_data_end; extern value global_data; -#endif /* _mlvalues_ */ +#endif /* CAML_MLVALUES_H */ diff --git a/byterun/sys.c b/byterun/sys.c index e6e05e317..fd748100a 100644 --- a/byterun/sys.c +++ b/byterun/sys.c @@ -148,7 +148,7 @@ static int sys_open_flags[] = { O_BINARY, O_TEXT, O_NONBLOCK }; -CAMLprim value sys_open(value path, value flags, value perm) +CAMLprim value caml_sys_open(value path, value flags, value perm) { CAMLparam3(path, flags, perm); int fd; diff --git a/stdlib/filename.ml b/stdlib/filename.ml index 10f8d27f6..96f5aafa0 100644 --- a/stdlib/filename.ml +++ b/stdlib/filename.ml @@ -212,7 +212,7 @@ let chop_extension name = with Not_found -> invalid_arg "Filename.chop_extension" -external open_desc: string -> open_flag list -> int -> int = "sys_open" +external open_desc: string -> open_flag list -> int -> int = "caml_sys_open" external close_desc: int -> unit = "sys_close" let prng = Random.State.make_self_init ();; diff --git a/stdlib/pervasives.ml b/stdlib/pervasives.ml index e74749939..93aac3344 100644 --- a/stdlib/pervasives.ml +++ b/stdlib/pervasives.ml @@ -226,7 +226,7 @@ type open_flag = | Open_creat | Open_trunc | Open_excl | Open_binary | Open_text | Open_nonblock -external open_desc: string -> open_flag list -> int -> int = "sys_open" +external open_desc: string -> open_flag list -> int -> int = "caml_sys_open" let open_out_gen mode perm name = open_descriptor_out(open_desc name mode perm) |