decontamination (PR#1914, PR#1956)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6022 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

8 files changed, 56 insertions, 6 deletions

diff --git a/boot/ocamlc b/boot/ocamlc
index a9f2d2f8a..fd4e9f7f1 100755
--- a/boot/ocamlc
+++ b/boot/ocamlc
diff --git a/boot/ocamllex b/boot/ocamllex
index 0746d69d3..a77d1c946 100755
--- a/boot/ocamllex
+++ b/boot/ocamllex
diff --git a/byterun/compatibility.h b/byterun/compatibility.h
index a5340b9fb..de5f987c1 100644
--- a/byterun/compatibility.h
+++ b/byterun/compatibility.h
@@ -20,9 +20,59 @@
 
 #ifndef CAML_NAME_SPACE
 
+/* **** alloc.c */
+/* **** array.c */
+/* **** backtrace.c */
+/* **** callback.c */
+/* **** compact.c */
+/* **** compare.c */
+/* **** custom.c */
+/* **** debugger.c */
+/* **** dynlink.c */
+/* **** extern.c */
+/* **** fail.c */
+/* **** finalise.c */
+/* **** fix_code.c */
+/* **** floats.c */
+/* **** freelist.c */
+/* **** gc_ctrl.c */
+/* **** globroots.c */
+/* **** hash.c */
+/* **** instrtrace.c */
+/* **** intern.c */
+/* **** interp.c */
+/* **** ints.c */
+/* **** io.c */
+/* **** lexing.c */
+/* **** macintosh.c */
+/* **** main.c */
+/* **** major_gc.c */
+/* **** md5.c */
+/* **** memory.c */
+/* **** meta.c */
+/* **** minor_gc.c */
+/* **** misc.c */
+/* **** mpwtool.c */
+/* **** obj.c */
+/* **** parsing.c */
+/* **** prims.c */
+/* **** printexc.c */
+/* **** roots.c */
+/* **** rotatecursor.c */
+/* **** signals.c */
+/* **** stacks.c */
+/* **** startup.c */
+/* **** str.c */
+
 /* **** sys.c */
-/*prim  sys_open -> caml_sys_open */
+/*      sys_open -> caml_sys_open */
 #define sys_error caml_sys_error
+#define sys_exit caml_sys_exit
+
+/* **** terminfo.c */
+/* **** unix.c */
+/* **** weak.c */
+/* **** win32.c */
 
 
 #endif /* CAML_NAME_SPACE */
diff --git a/byterun/main.c b/byterun/main.c
index 4c7a19159..441eb30ec 100644
--- a/byterun/main.c
+++ b/byterun/main.c
@@ -41,6 +41,6 @@ int main(int argc, char **argv)
   rotatecursor_options (&something_to_do, 0, NULL);
 #endif /* macintosh */
   caml_main(argv);
-  sys_exit(Val_int(0));
+  caml_sys_exit(Val_int(0));
   return 0; /* not reached */
 }
diff --git a/byterun/sys.c b/byterun/sys.c
index 6c844c23e..561b07a78 100644
--- a/byterun/sys.c
+++ b/byterun/sys.c
@@ -116,7 +116,7 @@ CAMLexport void caml_sys_error(value arg)
   }
 }
 
-CAMLprim value sys_exit(value retcode)
+CAMLprim value caml_sys_exit(value retcode)
 {
 #ifndef NATIVE_CODE
   debugger(PROGRAM_EXIT);
diff --git a/byterun/sys.h b/byterun/sys.h
index f0e2582e5..86daa7b7b 100644
--- a/byterun/sys.h
+++ b/byterun/sys.h
@@ -22,7 +22,7 @@
 
 CAMLextern void caml_sys_error (value);
 extern void sys_init (char * exe_name, char ** argv);
-CAMLextern value sys_exit (value);
+CAMLextern value caml_sys_exit (value);
 
 extern char * caml_exe_name;
 
diff --git a/byterun/win32.c b/byterun/win32.c
index ab08b3af0..095c40d2d 100644
--- a/byterun/win32.c
+++ b/byterun/win32.c
@@ -376,7 +376,7 @@ void caml_signal_thread(void * lpParam)
     char iobuf[2];
     /* This shall always return a single character */
     ret = ReadFile(h, iobuf, 1, &numread, NULL);
-    if (!ret || numread != 1) sys_exit(Val_int(2));
+    if (!ret || numread != 1) caml_sys_exit(Val_int(2));
     switch (iobuf[0]) {
     case 'C':
       pending_signal = SIGINT;
diff --git a/stdlib/pervasives.ml b/stdlib/pervasives.ml
index 93aac3344..1aa3c439a 100644
--- a/stdlib/pervasives.ml
+++ b/stdlib/pervasives.ml
@@ -414,7 +414,7 @@ let (( ^^ ) : ('a, 'b, 'c, 'd) format4 -> ('d, 'b, 'c, 'e) format4 ->
 
 (* Miscellaneous *)
 
-external sys_exit : int -> 'a = "sys_exit"
+external sys_exit : int -> 'a = "caml_sys_exit"
 
 let exit_function = ref flush_all