From 799f36d3e6f98d8fa207fd6610038d0a42b8a9e3 Mon Sep 17 00:00:00 2001
From: Nicolas Ojeda Bar <n.oje.bar@gmail.com>
Date: Thu, 21 Sep 2017 12:29:03 +0200
Subject: [PATCH] Rename: use _os suffix

---
 asmrun/natdynlink.c               |   8 +-
 asmrun/startup.c                  |  14 +--
 bytecomp/bytelink.ml              |   8 +-
 byterun/backtrace_prim.c          |   4 +-
 byterun/caml/backtrace.h          |   2 +-
 byterun/caml/callback.h           |  10 +--
 byterun/caml/dynlink.h            |   4 +-
 byterun/caml/misc.h               | 136 +++++++++++++++---------------
 byterun/caml/osdeps.h             |  16 ++--
 byterun/caml/startup.h            |   8 +-
 byterun/caml/sys.h                |   4 +-
 byterun/debugger.c                |   4 +-
 byterun/dynlink.c                 |  40 ++++-----
 byterun/main.c                    |   2 +-
 byterun/startup.c                 |  42 ++++-----
 byterun/startup_aux.c             |  10 +--
 byterun/sys.c                     |  78 ++++++++---------
 byterun/win32.c                   |   2 +-
 ocamltest/run.h                   |  10 +--
 ocamltest/run_common.h            |   2 +-
 ocamltest/run_stubs.c             |  14 +--
 otherlibs/unix/chdir.c            |   6 +-
 otherlibs/unix/chmod.c            |   6 +-
 otherlibs/unix/cstringv.c         |  10 +--
 otherlibs/unix/execv.c            |   8 +-
 otherlibs/unix/execve.c           |  10 +--
 otherlibs/unix/execvp.c           |  18 ++--
 otherlibs/unix/getcwd.c           |   8 +-
 otherlibs/unix/putenv.c           |   6 +-
 otherlibs/unix/rmdir.c            |   6 +-
 otherlibs/unix/unlink.c           |   6 +-
 otherlibs/unix/utimes.c           |   6 +-
 otherlibs/win32unix/unixsupport.h |   2 +-
 33 files changed, 255 insertions(+), 255 deletions(-)

diff --git a/asmrun/natdynlink.c b/asmrun/natdynlink.c
index 19ab7082c..95626109e 100644
--- a/asmrun/natdynlink.c
+++ b/asmrun/natdynlink.c
@@ -69,11 +69,11 @@ CAMLprim value caml_natdynlink_open(value filename, value global)
   CAMLlocal3 (res, handle, header);
   void *sym;
   void *dlhandle;
-  charnat *p;
+  char_os *p;
 
   /* TODO: dlclose in case of error... */
 
-  p = caml_stat_strdup_to_utf16(String_val(filename));
+  p = caml_stat_strdup_to_os(String_val(filename));
   caml_enter_blocking_section();
   dlhandle = caml_dlopen(p, 1, Int_val(global));
   caml_leave_blocking_section();
@@ -151,11 +151,11 @@ CAMLprim value caml_natdynlink_run_toplevel(value filename, value symbol)
   CAMLparam2 (filename, symbol);
   CAMLlocal3 (res, v, handle_v);
   void *handle;
-  charnat *p;
+  char_os *p;
 
   /* TODO: dlclose in case of error... */
 
-  p = caml_stat_strdup_to_utf16(String_val(filename));
+  p = caml_stat_strdup_to_os(String_val(filename));
   caml_enter_blocking_section();
   handle = caml_dlopen(p, 1, 1);
   caml_leave_blocking_section();
diff --git a/asmrun/startup.c b/asmrun/startup.c
index 2953c793f..60dca0138 100644
--- a/asmrun/startup.c
+++ b/asmrun/startup.c
@@ -103,9 +103,9 @@ extern void caml_install_invalid_parameter_handler();
 
 #endif
 
-value caml_startup_common(charnat **argv, int pooling)
+value caml_startup_common(char_os **argv, int pooling)
 {
-  charnat * exe_name, * proc_self_exe;
+  char_os * exe_name, * proc_self_exe;
   char tos;
 
   /* Determine options */
@@ -156,29 +156,29 @@ value caml_startup_common(charnat **argv, int pooling)
   return caml_start_program();
 }
 
-value caml_startup_exn(charnat **argv)
+value caml_startup_exn(char_os **argv)
 {
   return caml_startup_common(argv, /* pooling */ 0);
 }
 
-void caml_startup(charnat **argv)
+void caml_startup(char_os **argv)
 {
   value res = caml_startup_exn(argv);
   if (Is_exception_result(res))
     caml_fatal_uncaught_exception(Extract_exception(res));
 }
 
-void caml_main(charnat **argv)
+void caml_main(char_os **argv)
 {
   caml_startup(argv);
 }
 
-value caml_startup_pooled_exn(charnat **argv)
+value caml_startup_pooled_exn(char_os **argv)
 {
   return caml_startup_common(argv, /* pooling */ 1);
 }
 
-void caml_startup_pooled(charnat **argv)
+void caml_startup_pooled(char_os **argv)
 {
   value res = caml_startup_pooled_exn(argv);
   if (Is_exception_result(res))
diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
index 7a5d83002..3ed3e68c7 100644
--- a/bytecomp/bytelink.ml
+++ b/bytecomp/bytelink.ml
@@ -487,7 +487,7 @@ let link_bytecode_as_c ppf tolink outfile =
     Symtable.output_primitive_table outchan;
     (* The entry point *)
     output_string outchan "\
-\nvoid caml_startup(charnat ** argv)\
+\nvoid caml_startup(char_os ** argv)\
 \n{\
 \n  caml_startup_code(caml_code, sizeof(caml_code),\
 \n                    caml_data, sizeof(caml_data),\
@@ -496,7 +496,7 @@ let link_bytecode_as_c ppf tolink outfile =
 \n                    argv);\
 \n}\
 \n\
-\nvalue caml_startup_exn(charnat ** argv)\
+\nvalue caml_startup_exn(char_os ** argv)\
 \n{\
 \n  return caml_startup_code_exn(caml_code, sizeof(caml_code),\
 \n                               caml_data, sizeof(caml_data),\
@@ -505,7 +505,7 @@ let link_bytecode_as_c ppf tolink outfile =
 \n                               argv);\
 \n}\
 \n\
-\nvoid caml_startup_pooled(charnat ** argv)\
+\nvoid caml_startup_pooled(char_os ** argv)\
 \n{\
 \n  caml_startup_code(caml_code, sizeof(caml_code),\
 \n                    caml_data, sizeof(caml_data),\
@@ -514,7 +514,7 @@ let link_bytecode_as_c ppf tolink outfile =
 \n                    argv);\
 \n}\
 \n\
-\nvalue caml_startup_pooled_exn(charnat ** argv)\
+\nvalue caml_startup_pooled_exn(char_os ** argv)\
 \n{\
 \n  return caml_startup_code_exn(caml_code, sizeof(caml_code),\
 \n                               caml_data, sizeof(caml_data),\
diff --git a/byterun/backtrace_prim.c b/byterun/backtrace_prim.c
index f9dd11a8a..e69b2568e 100644
--- a/byterun/backtrace_prim.c
+++ b/byterun/backtrace_prim.c
@@ -46,7 +46,7 @@
 /* The table of debug information fragments */
 struct ext_table caml_debug_info;
 
-CAMLexport charnat * caml_cds_file = NULL;
+CAMLexport char_os * caml_cds_file = NULL;
 
 /* Location of fields in the Instruct.debug_event record */
 enum {
@@ -329,7 +329,7 @@ static void read_main_debug_info(struct debug_info *di)
 {
   CAMLparam0();
   CAMLlocal3(events, evl, l);
-  charnat *exec_name;
+  char_os *exec_name;
   int fd, num_events, orig, i;
   struct channel *chan;
   struct exec_trailer trail;
diff --git a/byterun/caml/backtrace.h b/byterun/caml/backtrace.h
index d385da239..fc0baf2df 100644
--- a/byterun/caml/backtrace.h
+++ b/byterun/caml/backtrace.h
@@ -109,7 +109,7 @@ CAMLprim value caml_record_backtrace(value vflag);
 #ifndef NATIVE_CODE
 
 /* Path to the file containing debug information, if any, or NULL. */
-CAMLextern charnat * caml_cds_file;
+CAMLextern char_os * caml_cds_file;
 
 /* Primitive called _only_ by runtime to record unwinded frames to
  * backtrace.  A similar primitive exists for native code, but with a
diff --git a/byterun/caml/callback.h b/byterun/caml/callback.h
index 1cb396847..93208b7a1 100644
--- a/byterun/caml/callback.h
+++ b/byterun/caml/callback.h
@@ -47,11 +47,11 @@ CAMLextern value * caml_named_value (char const * name);
 typedef void (*caml_named_action) (value*, char *);
 CAMLextern void caml_iterate_named_values(caml_named_action f);
 
-CAMLextern void caml_main (charnat ** argv);
-CAMLextern void caml_startup (charnat ** argv);
-CAMLextern value caml_startup_exn (charnat ** argv);
-CAMLextern void caml_startup_pooled (charnat ** argv);
-CAMLextern value caml_startup_pooled_exn (charnat ** argv);
+CAMLextern void caml_main (char_os ** argv);
+CAMLextern void caml_startup (char_os ** argv);
+CAMLextern value caml_startup_exn (char_os ** argv);
+CAMLextern void caml_startup_pooled (char_os ** argv);
+CAMLextern value caml_startup_pooled_exn (char_os ** argv);
 CAMLextern void caml_shutdown (void);
 
 CAMLextern int caml_callback_depth;
diff --git a/byterun/caml/dynlink.h b/byterun/caml/dynlink.h
index d19967288..92f4e235d 100644
--- a/byterun/caml/dynlink.h
+++ b/byterun/caml/dynlink.h
@@ -27,8 +27,8 @@
    (all three 0-separated in char arrays).
    Abort the runtime system on error.
    Calling this frees caml_shared_libs_path (not touching its contents). */
-extern void caml_build_primitive_table(charnat * lib_path,
-                                       charnat * libs,
+extern void caml_build_primitive_table(char_os * lib_path,
+                                       char_os * libs,
                                        char * req_prims);
 
 /* The search path for shared libraries */
diff --git a/byterun/caml/misc.h b/byterun/caml/misc.h
index 04e9bc04d..5666f9334 100644
--- a/byterun/caml/misc.h
+++ b/byterun/caml/misc.h
@@ -169,67 +169,67 @@ extern int caml_umul_overflow(uintnat a, uintnat b, uintnat * res);
 
 #ifdef _WIN32
 
-typedef wchar_t charnat;
+typedef wchar_t char_os;
 
 #define _T(x) L ## x
 
-#define _topen _wopen
-#define _tstat _wstati64
-#define _tunlink _wunlink
-#define _trename caml_win32_rename
-#define _tchdir _wchdir
-#define _tgetcwd _wgetcwd
-#define _tgetenv _wgetenv
-#define _tsystem _wsystem
-#define _trmdir _wrmdir
-#define _tutime _wutime
-#define _tputenv _wputenv
-#define _tchmod _wchmod
-#define _texecv _wexecv
-#define _texecve _wexecve
-#define _texecvp _wexecvp
-#define _tcscmp wcscmp
-#define _tcslen wcslen
-#define _stscanf swscanf
+#define open_os _wopen
+#define stat_os _wstati64
+#define unlink_os _wunlink
+#define rename_os caml_win32_rename
+#define chdir_os _wchdir
+#define getcwd_os _wgetcwd
+#define getenv_os _wgetenv
+#define system_os _wsystem
+#define rmdir_os _wrmdir
+#define utime_os _wutime
+#define putenv_os _wputenv
+#define chmod_os _wchmod
+#define execv_os _wexecv
+#define execve_os _wexecve
+#define execvp_os _wexecvp
+#define strcmp_os wcscmp
+#define strlen_os wcslen
+#define sscanf_os swscanf
 
-#define caml_stat_tcsdup caml_stat_wcsdup
-#define caml_stat_tcsconcat caml_stat_wcsconcat
+#define caml_stat_strdup_os caml_stat_wcsdup
+#define caml_stat_strconcat_os caml_stat_wcsconcat
 
-#define caml_stat_strdup_to_utf16 caml_stat_strdup_to_utf16
-#define caml_stat_strdup_of_utf16 caml_stat_strdup_of_utf16
-#define caml_copy_string_of_utf16 caml_copy_string_of_utf16
+#define caml_stat_strdup_to_os caml_stat_strdup_to_utf16
+#define caml_stat_strdup_of_os caml_stat_strdup_of_utf16
+#define caml_copy_string_of_os caml_copy_string_of_utf16
 
 #else /* _WIN32 */
 
-typedef char charnat;
+typedef char char_os;
 
 #define _T(x) x
 
-#define _topen open
-#define _tstat stat
-#define _tunlink unlink
-#define _trename rename
-#define _tchdir chdir
-#define _tgetcwd getcwd
-#define _tgetenv getenv
-#define _tsystem system
-#define _trmdir rmdir
-#define _tutime utime
-#define _tputenv putenv
-#define _tchmod chmod
-#define _texecv execv
-#define _texecve execve
-#define _texecvp execvp
-#define _tcscmp strcmp
-#define _tcslen strlen
-#define _stscanf sscanf
+#define open_os open
+#define stat_os stat
+#define unlink_os unlink
+#define rename_os rename
+#define chdir_os chdir
+#define getcwd_os getcwd
+#define getenv_os getenv
+#define system_os system
+#define rmdir_os rmdir
+#define utime_os utime
+#define putenv_os putenv
+#define chmod_os chmod
+#define execv_os execv
+#define execve_os execve
+#define execvp_os execvp
+#define strcmp_os strcmp
+#define strlen_os strlen
+#define sscanf_os sscanf
 
-#define caml_stat_tcsdup caml_stat_strdup
-#define caml_stat_tcsconcat caml_stat_strconcat
+#define caml_stat_strdup_os caml_stat_strdup
+#define caml_stat_strconcat_os caml_stat_strconcat
 
-#define caml_stat_strdup_to_utf16 caml_stat_strdup
-#define caml_stat_strdup_of_utf16 caml_stat_strdup
-#define caml_copy_string_of_utf16 caml_copy_string
+#define caml_stat_strdup_to_os caml_stat_strdup
+#define caml_stat_strdup_of_os caml_stat_strdup
+#define caml_copy_string_of_os caml_copy_string
 
 #endif /* _WIN32 */
 
@@ -242,14 +242,14 @@ typedef char charnat;
 #ifndef CAML_WITH_CPLUGINS
 
 #define CAML_SYS_EXIT(retcode) exit(retcode)
-#define CAML_SYS_OPEN(filename,flags,perm) _topen(filename,flags,perm)
+#define CAML_SYS_OPEN(filename,flags,perm) open_os(filename,flags,perm)
 #define CAML_SYS_CLOSE(fd) close(fd)
-#define CAML_SYS_STAT(filename,st) _tstat(filename,st)
-#define CAML_SYS_UNLINK(filename) _tunlink(filename)
-#define CAML_SYS_RENAME(old_name,new_name) _trename(old_name, new_name)
-#define CAML_SYS_CHDIR(dirname) _tchdir(dirname)
-#define CAML_SYS_GETENV(varname) _tgetenv(varname)
-#define CAML_SYS_SYSTEM(command) _tsystem(command)
+#define CAML_SYS_STAT(filename,st) stat_os(filename,st)
+#define CAML_SYS_UNLINK(filename) unlink_os(filename)
+#define CAML_SYS_RENAME(old_name,new_name) rename_os(old_name, new_name)
+#define CAML_SYS_CHDIR(dirname) chdir_os(dirname)
+#define CAML_SYS_GETENV(varname) getenv_os(varname)
+#define CAML_SYS_SYSTEM(command) system_os(command)
 #define CAML_SYS_READ_DIRECTORY(dirname,tbl) caml_read_directory(dirname,tbl)
 
 #else
@@ -276,7 +276,7 @@ extern intnat (*caml_cplugins_prim)(int,intnat,intnat,intnat);
   caml_cplugins_prim(code,(intnat) (arg1),0,0)
 #define CAML_SYS_STRING_PRIM_1(code,prim,arg1)               \
   (caml_cplugins_prim == NULL) ? prim(arg1) :    \
-  (charnat*)caml_cplugins_prim(code,(intnat) (arg1),0,0)
+  (char_os*)caml_cplugins_prim(code,(intnat) (arg1),0,0)
 #define CAML_SYS_VOID_PRIM_1(code,prim,arg1)               \
   (caml_cplugins_prim == NULL) ? prim(arg1) :    \
   (void)caml_cplugins_prim(code,(intnat) (arg1),0,0)
@@ -290,21 +290,21 @@ extern intnat (*caml_cplugins_prim)(int,intnat,intnat,intnat);
 #define CAML_SYS_EXIT(retcode) \
   CAML_SYS_VOID_PRIM_1(CAML_CPLUGINS_EXIT,exit,retcode)
 #define CAML_SYS_OPEN(filename,flags,perm)                      \
-  CAML_SYS_PRIM_3(CAML_CPLUGINS_OPEN,_topen,filename,flags,perm)
+  CAML_SYS_PRIM_3(CAML_CPLUGINS_OPEN,open_os,filename,flags,perm)
 #define CAML_SYS_CLOSE(fd)                      \
   CAML_SYS_PRIM_1(CAML_CPLUGINS_CLOSE,close,fd)
 #define CAML_SYS_STAT(filename,st)                      \
-  CAML_SYS_PRIM_2(CAML_CPLUGINS_STAT,_tstat,filename,st)
+  CAML_SYS_PRIM_2(CAML_CPLUGINS_STAT,stat_os,filename,st)
 #define CAML_SYS_UNLINK(filename)                       \
-  CAML_SYS_PRIM_1(CAML_CPLUGINS_UNLINK,_tunlink,filename)
+  CAML_SYS_PRIM_1(CAML_CPLUGINS_UNLINK,unlink_os,filename)
 #define CAML_SYS_RENAME(old_name,new_name)                              \
-  CAML_SYS_PRIM_2(CAML_CPLUGINS_RENAME,_trename,old_name,new_name)
+  CAML_SYS_PRIM_2(CAML_CPLUGINS_RENAME,rename_os,old_name,new_name)
 #define CAML_SYS_CHDIR(dirname)                         \
-  CAML_SYS_PRIM_1(CAML_CPLUGINS_CHDIR,_tchdir,dirname)
+  CAML_SYS_PRIM_1(CAML_CPLUGINS_CHDIR,chdir_os,dirname)
 #define CAML_SYS_GETENV(varname)                        \
-  CAML_SYS_STRING_PRIM_1(CAML_CPLUGINS_GETENV,_tgetenv,varname)
+  CAML_SYS_STRING_PRIM_1(CAML_CPLUGINS_GETENV,getenv_os,varname)
 #define CAML_SYS_SYSTEM(command)                        \
-  CAML_SYS_PRIM_1(CAML_CPLUGINS_SYSTEM,_tsystem,command)
+  CAML_SYS_PRIM_1(CAML_CPLUGINS_SYSTEM,system_os,command)
 #define CAML_SYS_READ_DIRECTORY(dirname,tbl)                            \
   CAML_SYS_PRIM_2(CAML_CPLUGINS_READ_DIRECTORY,caml_read_directory,     \
                   dirname,tbl)
@@ -314,14 +314,14 @@ extern intnat (*caml_cplugins_prim)(int,intnat,intnat,intnat);
 struct cplugin_context {
   int api_version;
   int prims_bitmap;
-  charnat *exe_name;
-  charnat** argv;
-  charnat *plugin; /* absolute filename of plugin, do a copy if you need it ! */
+  char_os *exe_name;
+  char_os** argv;
+  char_os *plugin; /* absolute filename of plugin, do a copy if you need it ! */
   char *ocaml_version;
 /* end of CAML_CPLUGIN_CONTEXT_API version 0 */
 };
 
-extern void caml_cplugins_init(charnat * exe_name, charnat **argv);
+extern void caml_cplugins_init(char_os * exe_name, char_os **argv);
 
 /* A plugin MUST define a symbol "caml_cplugin_init" with the prototype:
 
@@ -347,7 +347,7 @@ extern void caml_ext_table_remove(struct ext_table * tbl, void * data);
 extern void caml_ext_table_free(struct ext_table * tbl, int free_entries);
 extern void caml_ext_table_clear(struct ext_table * tbl, int free_entries);
 
-CAMLextern int caml_read_directory(charnat * dirname, struct ext_table * contents);
+CAMLextern int caml_read_directory(char_os * dirname, struct ext_table * contents);
 
 
 #ifdef CAML_INTERNALS
diff --git a/byterun/caml/osdeps.h b/byterun/caml/osdeps.h
index e4e41cc5e..1ccdaf89c 100644
--- a/byterun/caml/osdeps.h
+++ b/byterun/caml/osdeps.h
@@ -41,17 +41,17 @@ extern int caml_write_fd(int fd, int flags, void * buf, int n);
 
 /* Decompose the given path into a list of directories, and add them
    to the given table. */
-extern charnat * caml_decompose_path(struct ext_table * tbl, charnat * path);
+extern char_os * caml_decompose_path(struct ext_table * tbl, char_os * path);
 
 /* Search the given file in the given list of directories.
    If not found, return a copy of [name]. */
-extern charnat * caml_search_in_path(struct ext_table * path, const charnat * name);
+extern char_os * caml_search_in_path(struct ext_table * path, const char_os * name);
 
 /* Same, but search an executable name in the system path for executables. */
-CAMLextern charnat * caml_search_exe_in_path(const charnat * name);
+CAMLextern char_os * caml_search_exe_in_path(const char_os * name);
 
 /* Same, but search a shared library in the given path. */
-extern charnat * caml_search_dll_in_path(struct ext_table * path, const charnat * name);
+extern char_os * caml_search_dll_in_path(struct ext_table * path, const char_os * name);
 
 /* Open a shared library and return a handle on it.
    If [for_execution] is true, perform full symbol resolution and
@@ -62,7 +62,7 @@ extern charnat * caml_search_dll_in_path(struct ext_table * path, const charnat
    If [global] is true, symbols from the shared library can be used
    to resolve for other libraries to be opened later on.
    Return [NULL] on error. */
-extern void * caml_dlopen(charnat * libname, int for_execution, int global);
+extern void * caml_dlopen(char_os * libname, int for_execution, int global);
 
 /* Close a shared library handle */
 extern void caml_dlclose(void * handle);
@@ -79,17 +79,17 @@ extern char * caml_dlerror(void);
 /* Add to [contents] the (short) names of the files contained in
    the directory named [dirname].  No entries are added for [.] and [..].
    Return 0 on success, -1 on error; set errno in the case of error. */
-extern int caml_read_directory(charnat * dirname, struct ext_table * contents);
+extern int caml_read_directory(char_os * dirname, struct ext_table * contents);
 
 /* Recover executable name if possible (/proc/sef/exe under Linux,
    GetModuleFileName under Windows).  Return NULL on error,
    string allocated with [caml_stat_alloc] on success. */
-extern charnat * caml_executable_name(void);
+extern char_os * caml_executable_name(void);
 
 /* Secure version of [getenv]: returns NULL if the process has special
    privileges (setuid bit, setgid bit, capabilities).
 */
-extern charnat *caml_secure_getenv(charnat const *var);
+extern char_os *caml_secure_getenv(char_os const *var);
 
 /* Windows Unicode support */
 
diff --git a/byterun/caml/startup.h b/byterun/caml/startup.h
index b9d30cd75..2b26e9168 100644
--- a/byterun/caml/startup.h
+++ b/byterun/caml/startup.h
@@ -21,25 +21,25 @@
 #include "mlvalues.h"
 #include "exec.h"
 
-CAMLextern void caml_main(charnat **argv);
+CAMLextern void caml_main(char_os **argv);
 
 CAMLextern void caml_startup_code(
            code_t code, asize_t code_size,
            char *data, asize_t data_size,
            char *section_table, asize_t section_table_size,
            int pooling,
-           charnat **argv);
+           char_os **argv);
 
 CAMLextern value caml_startup_code_exn(
   code_t code, asize_t code_size,
   char *data, asize_t data_size,
   char *section_table, asize_t section_table_size,
   int pooling,
-  charnat **argv);
+  char_os **argv);
 
 enum { FILE_NOT_FOUND = -1, BAD_BYTECODE  = -2 };
 
-extern int caml_attempt_open(charnat **name, struct exec_trailer *trail,
+extern int caml_attempt_open(char_os **name, struct exec_trailer *trail,
                              int do_open_script);
 extern void caml_read_section_descriptors(int fd, struct exec_trailer *trail);
 extern int32_t caml_seek_optional_section(int fd, struct exec_trailer *trail,
diff --git a/byterun/caml/sys.h b/byterun/caml/sys.h
index 598d96618..0f3727715 100644
--- a/byterun/caml/sys.h
+++ b/byterun/caml/sys.h
@@ -29,12 +29,12 @@ extern "C" {
 CAMLextern void caml_sys_error (value);
 CAMLextern void caml_sys_io_error (value);
 CAMLextern double caml_sys_time_unboxed(value);
-CAMLextern void caml_sys_init (charnat * exe_name, charnat ** argv);
+CAMLextern void caml_sys_init (char_os * exe_name, char_os ** argv);
 CAMLextern value caml_sys_exit (value);
 extern double caml_sys_time_unboxed(value);
 CAMLextern value caml_sys_get_argv(value unit);
 
-extern charnat * caml_exe_name;
+extern char_os * caml_exe_name;
 
 #ifdef __cplusplus
 }
diff --git a/byterun/debugger.c b/byterun/debugger.c
index 2dccb8703..715367747 100644
--- a/byterun/debugger.c
+++ b/byterun/debugger.c
@@ -164,7 +164,7 @@ static void winsock_cleanup(void)
 void caml_debugger_init(void)
 {
   char * address;
-  charnat * a;
+  char_os * a;
   char * port, * p;
   struct hostent * host;
   int n;
@@ -175,7 +175,7 @@ void caml_debugger_init(void)
   Store_field(marshal_flags, 1, Val_emptylist);
 
   a = caml_secure_getenv(_T("CAML_DEBUG_SOCKET"));
-  address = a ? caml_stat_strdup_of_utf16(a) : NULL;
+  address = a ? caml_stat_strdup_of_os(a) : NULL;
   if (address == NULL) return;
   if (dbg_addr != NULL) caml_stat_free(dbg_addr);
   dbg_addr = address;
diff --git a/byterun/dynlink.c b/byterun/dynlink.c
index bc36aa282..245bf3e71 100644
--- a/byterun/dynlink.c
+++ b/byterun/dynlink.c
@@ -75,9 +75,9 @@ static c_primitive lookup_primitive(char * name)
 
 #define LD_CONF_NAME _T("ld.conf")
 
-static charnat * parse_ld_conf(void)
+static char_os * parse_ld_conf(void)
 {
-  charnat * stdlib, * ldconfname, * wconfig, * p, * q, * tofree = NULL;
+  char_os * stdlib, * ldconfname, * wconfig, * p, * q, * tofree = NULL;
   char * config;
 #ifdef _WIN32
   struct _stati64 st;
@@ -88,25 +88,25 @@ static charnat * parse_ld_conf(void)
 
   stdlib = caml_secure_getenv(_T("OCAMLLIB"));
   if (stdlib == NULL) stdlib = caml_secure_getenv(_T("CAMLLIB"));
-  if (stdlib == NULL) stdlib = tofree = caml_stat_strdup_to_utf16(OCAML_STDLIB_DIR);
-  ldconfname = caml_stat_tcsconcat(3, stdlib, _T("/"), LD_CONF_NAME);
+  if (stdlib == NULL) stdlib = tofree = caml_stat_strdup_to_os(OCAML_STDLIB_DIR);
+  ldconfname = caml_stat_strconcat_os(3, stdlib, _T("/"), LD_CONF_NAME);
   if (tofree != NULL) caml_stat_free(tofree);
-  if (_tstat(ldconfname, &st) == -1) {
+  if (stat_os(ldconfname, &st) == -1) {
     caml_stat_free(ldconfname);
     return NULL;
   }
-  ldconf = _topen(ldconfname, O_RDONLY, 0);
+  ldconf = open_os(ldconfname, O_RDONLY, 0);
   if (ldconf == -1)
     caml_fatal_error_arg("Fatal error: cannot read loader config file %s\n",
-                         caml_stat_strdup_of_utf16(ldconfname));
+                         caml_stat_strdup_of_os(ldconfname));
   config = caml_stat_alloc(st.st_size + 1);
   nread = read(ldconf, config, st.st_size);
   if (nread == -1)
     caml_fatal_error_arg
       ("Fatal error: error while reading loader config file %s\n",
-       caml_stat_strdup_of_utf16(ldconfname));
+       caml_stat_strdup_of_os(ldconfname));
   config[nread] = 0;
-  wconfig = caml_stat_strdup_to_utf16(config);
+  wconfig = caml_stat_strdup_to_os(config);
   caml_stat_free(config);
   q = wconfig;
   for (p = wconfig; *p != 0; p++) {
@@ -124,9 +124,9 @@ static charnat * parse_ld_conf(void)
 
 /* Open the given shared library and add it to shared_libs.
    Abort on error. */
-static void open_shared_lib(charnat * name)
+static void open_shared_lib(char_os * name)
 {
-  charnat * realname;
+  char_os * realname;
   void * handle;
 
   realname = caml_search_dll_in_path(&caml_shared_libs_path, name);
@@ -137,7 +137,7 @@ static void open_shared_lib(charnat * name)
   caml_leave_blocking_section();
   if (handle == NULL)
     caml_fatal_error_arg2("Fatal error: cannot load shared library %s\n",
-                          caml_stat_strdup_of_utf16(name),
+                          caml_stat_strdup_of_os(name),
                           "Reason: %s\n", caml_dlerror());
   caml_ext_table_add(&shared_libs, handle);
   caml_stat_free(realname);
@@ -146,12 +146,12 @@ static void open_shared_lib(charnat * name)
 /* Build the table of primitives, given a search path and a list
    of shared libraries (both 0-separated in a char array).
    Abort the runtime system on error. */
-void caml_build_primitive_table(charnat * lib_path,
-                                charnat * libs,
+void caml_build_primitive_table(char_os * lib_path,
+                                char_os * libs,
                                 char * req_prims)
 {
-  charnat * tofree1, * tofree2;
-  charnat * p;
+  char_os * tofree1, * tofree2;
+  char_os * p;
   char * q;
 
   /* Initialize the search path for dynamic libraries:
@@ -162,13 +162,13 @@ void caml_build_primitive_table(charnat * lib_path,
   tofree1 = caml_decompose_path(&caml_shared_libs_path,
                                 caml_secure_getenv(_T("CAML_LD_LIBRARY_PATH")));
   if (lib_path != NULL)
-    for (p = lib_path; *p != 0; p += _tcslen(p) + 1)
+    for (p = lib_path; *p != 0; p += strlen_os(p) + 1)
       caml_ext_table_add(&caml_shared_libs_path, p);
   tofree2 = parse_ld_conf();
   /* Open the shared libraries */
   caml_ext_table_init(&shared_libs, 8);
   if (libs != NULL)
-    for (p = libs; *p != 0; p += _tcslen(p) + 1)
+    for (p = libs; *p != 0; p += strlen_os(p) + 1)
       open_shared_lib(p);
   /* Build the primitive table */
   caml_ext_table_init(&caml_prim_table, 0x180);
@@ -225,11 +225,11 @@ CAMLprim value caml_dynlink_open_lib(value mode, value filename)
 {
   void * handle;
   value result;
-  charnat * p;
+  char_os * p;
 
   caml_gc_message(0x100, "Opening shared library %s\n",
                   String_val(filename));
-  p = caml_stat_strdup_to_utf16(String_val(filename));
+  p = caml_stat_strdup_to_os(String_val(filename));
   caml_enter_blocking_section();
   handle = caml_dlopen(p, Int_val(mode), 1);
   caml_leave_blocking_section();
diff --git a/byterun/main.c b/byterun/main.c
index f6ac6c593..5e5839fff 100644
--- a/byterun/main.c
+++ b/byterun/main.c
@@ -26,7 +26,7 @@
 #include <windows.h>
 #endif
 
-CAMLextern void caml_main (charnat **);
+CAMLextern void caml_main (char_os **);
 
 #ifdef _WIN32
 CAMLextern void caml_expand_command_line (int *, wchar_t ***);
diff --git a/byterun/startup.c b/byterun/startup.c
index 29502121a..27cfc8386 100644
--- a/byterun/startup.c
+++ b/byterun/startup.c
@@ -88,10 +88,10 @@ static int read_trailer(int fd, struct exec_trailer *trail)
     return BAD_BYTECODE;
 }
 
-int caml_attempt_open(charnat **name, struct exec_trailer *trail,
+int caml_attempt_open(char_os **name, struct exec_trailer *trail,
                       int do_open_script)
 {
-  charnat * truename;
+  char_os * truename;
   int fd;
   int err;
   char buf [2];
@@ -99,7 +99,7 @@ int caml_attempt_open(charnat **name, struct exec_trailer *trail,
   truename = caml_search_exe_in_path(*name);
   caml_gc_message(0x100, "Opening bytecode executable %"
                   ARCH_CHARNATSTR_PRINTF_FORMAT "\n", truename);
-  fd = _topen(truename, O_RDONLY | O_BINARY);
+  fd = open_os(truename, O_RDONLY | O_BINARY);
   if (fd == -1) {
     caml_stat_free(truename);
     caml_gc_message(0x100, "Cannot open file\n");
@@ -192,7 +192,7 @@ static char * read_section(int fd, struct exec_trailer *trail, char *name)
 
 #ifdef _WIN32
 
-static wchar_t * read_section_to_utf16(int fd, struct exec_trailer *trail, char *name)
+static char_os * read_section_to_os(int fd, struct exec_trailer *trail, char *name)
 {
   int32_t len, wlen;
   char * data;
@@ -214,7 +214,7 @@ static wchar_t * read_section_to_utf16(int fd, struct exec_trailer *trail, char
 
 #else
 
-#define read_section_to_utf16 read_section
+#define read_section_to_os read_section
 
 #endif
 
@@ -245,7 +245,7 @@ Algorithm:
 
 /* Parse options on the command line */
 
-static int parse_command_line(charnat **argv)
+static int parse_command_line(char_os **argv)
 {
   int i, j;
 
@@ -255,10 +255,10 @@ static int parse_command_line(charnat **argv)
       ++ caml_trace_level; /* ignored unless DEBUG mode */
       break;
     case _T('v'):
-      if (!_tcscmp (argv[i], _T("-version"))){
+      if (!strcmp_os (argv[i], _T("-version"))){
         printf ("The OCaml runtime, version " OCAML_VERSION_STRING "\n");
         exit (0);
-      }else if (!_tcscmp (argv[i], _T("-vnum"))){
+      }else if (!strcmp_os (argv[i], _T("-vnum"))){
         printf (OCAML_VERSION_STRING "\n");
         exit (0);
       }else{
@@ -280,7 +280,7 @@ static int parse_command_line(charnat **argv)
       }
       break;
     default:
-      caml_fatal_error_arg("Unknown option %s.\n", caml_stat_strdup_of_utf16(argv[i]));
+      caml_fatal_error_arg("Unknown option %s.\n", caml_stat_strdup_of_os(argv[i]));
     }
   }
   return i;
@@ -303,15 +303,15 @@ extern int caml_ensure_spacetime_dot_o_is_included;
 
 /* Main entry point when loading code from a file */
 
-CAMLexport void caml_main(charnat **argv)
+CAMLexport void caml_main(char_os **argv)
 {
   int fd, pos;
   struct exec_trailer trail;
   struct channel * chan;
   value res;
   char * req_prims;
-  charnat * shared_lib_path, * shared_libs;
-  charnat * exe_name, * proc_self_exe;
+  char_os * shared_lib_path, * shared_libs;
+  char_os * exe_name, * proc_self_exe;
 
   caml_ensure_spacetime_dot_o_is_included++;
 
@@ -362,12 +362,12 @@ CAMLexport void caml_main(charnat **argv)
     fd = caml_attempt_open(&exe_name, &trail, 1);
     switch(fd) {
     case FILE_NOT_FOUND:
-      caml_fatal_error_arg("Fatal error: cannot find file '%s'\n", caml_stat_strdup_of_utf16(argv[pos]));
+      caml_fatal_error_arg("Fatal error: cannot find file '%s'\n", caml_stat_strdup_of_os(argv[pos]));
       break;
     case BAD_BYTECODE:
       caml_fatal_error_arg(
         "Fatal error: the file '%s' is not a bytecode executable file\n",
-        caml_stat_strdup_of_utf16(exe_name));
+        caml_stat_strdup_of_os(exe_name));
       break;
     }
   }
@@ -389,8 +389,8 @@ CAMLexport void caml_main(charnat **argv)
   caml_load_code(fd, caml_code_size);
   caml_init_debug_info();
   /* Build the table of primitives */
-  shared_lib_path = read_section_to_utf16(fd, &trail, "DLPT");
-  shared_libs = read_section_to_utf16(fd, &trail, "DLLS");
+  shared_lib_path = read_section_to_os(fd, &trail, "DLPT");
+  shared_libs = read_section_to_os(fd, &trail, "DLLS");
   req_prims = read_section(fd, &trail, "PRIM");
   if (req_prims == NULL) caml_fatal_error("Fatal error: no PRIM section\n");
   caml_build_primitive_table(shared_lib_path, shared_libs, req_prims);
@@ -434,10 +434,10 @@ CAMLexport value caml_startup_code_exn(
            char *data, asize_t data_size,
            char *section_table, asize_t section_table_size,
            int pooling,
-           charnat **argv)
+           char_os **argv)
 {
-  charnat * cds_file;
-  charnat * exe_name;
+  char_os * cds_file;
+  char_os * exe_name;
 
   /* Determine options */
 #ifdef DEBUG
@@ -459,7 +459,7 @@ CAMLexport value caml_startup_code_exn(
   caml_init_custom_operations();
   cds_file = caml_secure_getenv(_T("CAML_DEBUG_FILE"));
   if (cds_file != NULL) {
-    caml_cds_file = caml_stat_tcsdup(cds_file);
+    caml_cds_file = caml_stat_strdup_os(cds_file);
   }
   exe_name = caml_executable_name();
   if (exe_name == NULL) exe_name = caml_search_exe_in_path(argv[0]);
@@ -511,7 +511,7 @@ CAMLexport void caml_startup_code(
            char *data, asize_t data_size,
            char *section_table, asize_t section_table_size,
            int pooling,
-           charnat **argv)
+           char_os **argv)
 {
   value res;
 
diff --git a/byterun/startup_aux.c b/byterun/startup_aux.c
index c85d34326..b913bfaec 100644
--- a/byterun/startup_aux.c
+++ b/byterun/startup_aux.c
@@ -64,12 +64,12 @@ uintnat caml_trace_level = 0;
 uintnat caml_cleanup_on_exit = 0;
 
 
-static void scanmult (charnat *opt, uintnat *var)
+static void scanmult (char_os *opt, uintnat *var)
 {
-  charnat mult = _T(' ');
+  char_os mult = _T(' ');
   unsigned int val = 1;
-  _stscanf (opt, _T("=%u%c"), &val, &mult);
-  _stscanf (opt, _T("=0x%x%c"), &val, &mult);
+  sscanf_os (opt, _T("=%u%c"), &val, &mult);
+  sscanf_os (opt, _T("=0x%x%c"), &val, &mult);
   switch (mult) {
   case _T('k'):   *var = (uintnat) val * 1024; break;
   case _T('M'):   *var = (uintnat) val * (1024 * 1024); break;
@@ -80,7 +80,7 @@ static void scanmult (charnat *opt, uintnat *var)
 
 void caml_parse_ocamlrunparam(void)
 {
-  charnat *opt = caml_secure_getenv (_T("OCAMLRUNPARAM"));
+  char_os *opt = caml_secure_getenv (_T("OCAMLRUNPARAM"));
   uintnat p;
 
   if (opt == NULL) opt = caml_secure_getenv (_T("CAMLRUNPARAM"));
diff --git a/byterun/sys.c b/byterun/sys.c
index 2a1e33756..a7a81d71e 100644
--- a/byterun/sys.c
+++ b/byterun/sys.c
@@ -181,7 +181,7 @@ CAMLprim value caml_sys_open(value path, value vflags, value vperm)
 {
   CAMLparam3(path, vflags, vperm);
   int fd, flags, perm;
-  charnat * p;
+  char_os * p;
 
 #if defined(O_CLOEXEC)
   flags = O_CLOEXEC;
@@ -192,7 +192,7 @@ CAMLprim value caml_sys_open(value path, value vflags, value vperm)
 #endif
 
   caml_sys_check_path(path);
-  p = caml_stat_strdup_to_utf16(String_val(path));
+  p = caml_stat_strdup_to_os(String_val(path));
   flags |= caml_convert_flag_list(vflags, sys_open_flags);
   perm = Int_val(vperm);
   /* open on a named FIFO can block (PR#1533) */
@@ -226,11 +226,11 @@ CAMLprim value caml_sys_file_exists(value name)
 #else
   struct stat st;
 #endif
-  charnat * p;
+  char_os * p;
   int ret;
 
   if (! caml_string_is_c_safe(name)) return Val_false;
-  p = caml_stat_strdup_to_utf16(String_val(name));
+  p = caml_stat_strdup_to_os(String_val(name));
   caml_enter_blocking_section();
   ret = CAML_SYS_STAT(p, &st);
   caml_leave_blocking_section();
@@ -247,11 +247,11 @@ CAMLprim value caml_sys_is_directory(value name)
 #else
   struct stat st;
 #endif
-  charnat * p;
+  char_os * p;
   int ret;
 
   caml_sys_check_path(name);
-  p = caml_stat_strdup_to_utf16(String_val(name));
+  p = caml_stat_strdup_to_os(String_val(name));
   caml_enter_blocking_section();
   ret = CAML_SYS_STAT(p, &st);
   caml_leave_blocking_section();
@@ -268,10 +268,10 @@ CAMLprim value caml_sys_is_directory(value name)
 CAMLprim value caml_sys_remove(value name)
 {
   CAMLparam1(name);
-  charnat * p;
+  char_os * p;
   int ret;
   caml_sys_check_path(name);
-  p = caml_stat_strdup_to_utf16(String_val(name));
+  p = caml_stat_strdup_to_os(String_val(name));
   caml_enter_blocking_section();
   ret = CAML_SYS_UNLINK(p);
   caml_leave_blocking_section();
@@ -282,13 +282,13 @@ CAMLprim value caml_sys_remove(value name)
 
 CAMLprim value caml_sys_rename(value oldname, value newname)
 {
-  charnat * p_old;
-  charnat * p_new;
+  char_os * p_old;
+  char_os * p_new;
   int ret;
   caml_sys_check_path(oldname);
   caml_sys_check_path(newname);
-  p_old = caml_stat_strdup_to_utf16(String_val(oldname));
-  p_new = caml_stat_strdup_to_utf16(String_val(newname));
+  p_old = caml_stat_strdup_to_os(String_val(oldname));
+  p_new = caml_stat_strdup_to_os(String_val(newname));
   caml_enter_blocking_section();
   ret = CAML_SYS_RENAME(p_old, p_new);
   caml_leave_blocking_section();
@@ -302,10 +302,10 @@ CAMLprim value caml_sys_rename(value oldname, value newname)
 CAMLprim value caml_sys_chdir(value dirname)
 {
   CAMLparam1(dirname);
-  charnat * p;
+  char_os * p;
   int ret;
   caml_sys_check_path(dirname);
-  p = caml_stat_strdup_to_utf16(String_val(dirname));
+  p = caml_stat_strdup_to_os(String_val(dirname));
   caml_enter_blocking_section();
   ret = CAML_SYS_CHDIR(p);
   caml_leave_blocking_section();
@@ -316,57 +316,57 @@ CAMLprim value caml_sys_chdir(value dirname)
 
 CAMLprim value caml_sys_getcwd(value unit)
 {
-  charnat buff[4096];
-  charnat * ret;
+  char_os buff[4096];
+  char_os * ret;
 #ifdef HAS_GETCWD
-  ret = _tgetcwd(buff, sizeof(buff)/sizeof(*buff));
+  ret = getcwd_os(buff, sizeof(buff)/sizeof(*buff));
 #else
   ret = getwd(buff);
 #endif /* HAS_GETCWD */
   if (ret == 0) caml_sys_error(NO_ARG);
-  return caml_copy_string_of_utf16(buff);
+  return caml_copy_string_of_os(buff);
 }
 
 CAMLprim value caml_sys_unsafe_getenv(value var)
 {
-  charnat * res, * p;
+  char_os * res, * p;
 
   if (! caml_string_is_c_safe(var)) caml_raise_not_found();
-  p = caml_stat_strdup_to_utf16(String_val(var));
+  p = caml_stat_strdup_to_os(String_val(var));
   res = CAML_SYS_GETENV(p);
   caml_stat_free(p);
   if (res == 0) caml_raise_not_found();
-  return caml_copy_string_of_utf16(res);
+  return caml_copy_string_of_os(res);
 }
 
 CAMLprim value caml_sys_getenv(value var)
 {
-  charnat * res, * p;
+  char_os * res, * p;
 
   if (! caml_string_is_c_safe(var)) caml_raise_not_found();
-  p = caml_stat_strdup_to_utf16(String_val(var));
+  p = caml_stat_strdup_to_os(String_val(var));
   res = caml_secure_getenv(p);
   caml_stat_free(p);
   if (res == 0) caml_raise_not_found();
-  return caml_copy_string_of_utf16(res);
+  return caml_copy_string_of_os(res);
 }
 
-charnat * caml_exe_name;
-charnat ** caml_main_argv;
+char_os * caml_exe_name;
+char_os ** caml_main_argv;
 
 CAMLprim value caml_sys_get_argv(value unit)
 {
   CAMLparam0 ();   /* unit is unused */
   CAMLlocal3 (exe_name, argv, res);
-  exe_name = caml_copy_string_of_utf16(caml_exe_name);
-  argv = caml_alloc_array((void *)caml_copy_string_of_utf16, (char const **) caml_main_argv);
+  exe_name = caml_copy_string_of_os(caml_exe_name);
+  argv = caml_alloc_array((void *)caml_copy_string_of_os, (char const **) caml_main_argv);
   res = caml_alloc_small(2, 0);
   Field(res, 0) = exe_name;
   Field(res, 1) = argv;
   CAMLreturn(res);
 }
 
-void caml_sys_init(charnat * exe_name, charnat **argv)
+void caml_sys_init(char_os * exe_name, char_os **argv)
 {
 #ifdef CAML_WITH_CPLUGINS
   caml_cplugins_init(exe_name, argv);
@@ -390,13 +390,13 @@ CAMLprim value caml_sys_system_command(value command)
 {
   CAMLparam1 (command);
   int status, retcode;
-  charnat *buf;
+  char_os *buf;
 
   if (! caml_string_is_c_safe (command)) {
     errno = EINVAL;
     caml_sys_error(command);
   }
-  buf = caml_stat_strdup_to_utf16(String_val(command));
+  buf = caml_stat_strdup_to_os(String_val(command));
   caml_enter_blocking_section ();
   status = CAML_SYS_SYSTEM(buf);
   caml_leave_blocking_section ();
@@ -579,12 +579,12 @@ CAMLprim value caml_sys_read_directory(value path)
   CAMLparam1(path);
   CAMLlocal1(result);
   struct ext_table tbl;
-  charnat * p;
+  char_os * p;
   int ret;
 
   caml_sys_check_path(path);
   caml_ext_table_init(&tbl, 50);
-  p = caml_stat_strdup_to_utf16(String_val(path));
+  p = caml_stat_strdup_to_os(String_val(path));
   caml_enter_blocking_section();
   ret = CAML_SYS_READ_DIRECTORY(p, &tbl);
   caml_leave_blocking_section();
@@ -631,7 +631,7 @@ value (*caml_cplugins_prim)(int,value,value,value) = NULL;
 
 static struct cplugin_context cplugin_context;
 
-void caml_load_plugin(charnat *plugin)
+void caml_load_plugin(char_os *plugin)
 {
   void* dll_handle = NULL;
 
@@ -647,15 +647,15 @@ void caml_load_plugin(charnat *plugin)
    }
   } else {
    fprintf(stderr, "Cannot load C plugin %s\nReason: %s\n",
-           caml_stat_strdup_of_utf16(plugin), caml_dlerror());
+           caml_stat_strdup_of_os(plugin), caml_dlerror());
   }
 }
 
-void caml_cplugins_load(charnat *env_variable)
+void caml_cplugins_load(char_os *env_variable)
 {
-  charnat *plugins = caml_secure_getenv(env_variable);
+  char_os *plugins = caml_secure_getenv(env_variable);
   if(plugins != NULL){
-    charnat* curs = plugins;
+    char_os* curs = plugins;
     while(*curs != 0){
       if(*curs == _T(',')){
           if(curs > plugins){
@@ -670,7 +670,7 @@ void caml_cplugins_load(charnat *env_variable)
   }
 }
 
-void caml_cplugins_init(charnat * exe_name, charnat **argv)
+void caml_cplugins_init(char_os * exe_name, char_os **argv)
 {
   cplugin_context.api_version = CAML_CPLUGIN_CONTEXT_API;
   cplugin_context.prims_bitmap = CAML_CPLUGINS_PRIMS_BITMAP;
diff --git a/byterun/win32.c b/byterun/win32.c
index 29a0993df..d53b3a1e4 100644
--- a/byterun/win32.c
+++ b/byterun/win32.c
@@ -190,7 +190,7 @@ CAMLexport wchar_t * caml_search_exe_in_path(const wchar_t * name)
     if (retcode == 0) {
       caml_gc_message(0x100, "%" ARCH_CHARNATSTR_PRINTF_FORMAT " not found in search path\n", name);
       caml_stat_free(fullname);
-      return caml_stat_tcsdup(name);
+      return caml_stat_strdup_os(name);
     }
     if (retcode < fullnamelen)
       return fullname;
diff --git a/ocamltest/run.h b/ocamltest/run.h
index 537ebea87..348d16da7 100644
--- a/ocamltest/run.h
+++ b/ocamltest/run.h
@@ -22,17 +22,17 @@
 #include <stdarg.h>
 #include <caml/misc.h>
 
-typedef charnat **array;
+typedef char_os **array;
 
 typedef void Logger(void *, const char *, va_list ap);
 
 typedef struct {
-  charnat *program;
+  char_os *program;
   array argv;
   /* array envp; */
-  charnat *stdin_filename;
-  charnat *stdout_filename;
-  charnat *stderr_filename;
+  char_os *stdin_filename;
+  char_os *stdout_filename;
+  char_os *stderr_filename;
   int append;
   int timeout;
   Logger *logger;
diff --git a/ocamltest/run_common.h b/ocamltest/run_common.h
index 04603acf7..fdedd86c6 100644
--- a/ocamltest/run_common.h
+++ b/ocamltest/run_common.h
@@ -20,7 +20,7 @@
 
 /* is_defined(str) returns 1 iff str points to a non-empty string */
 /* Otherwise returns 0 */
-static int is_defined(const charnat *str)
+static int is_defined(const char_os *str)
 {
   return (str != NULL) && (*str != 0);
 }
diff --git a/ocamltest/run_stubs.c b/ocamltest/run_stubs.c
index f70d5ddaa..6fe491af8 100644
--- a/ocamltest/run_stubs.c
+++ b/ocamltest/run_stubs.c
@@ -37,16 +37,16 @@ static array cstringvect(value arg)
   mlsize_t size, i;
 
   size = Wosize_val(arg);
-  res = (array) caml_stat_alloc((size + 1) * sizeof(charnat *));
+  res = (array) caml_stat_alloc((size + 1) * sizeof(char_os *));
   for (i = 0; i < size; i++)
-    res[i] = caml_stat_strdup_to_utf16(String_val(Field(arg, i)));
+    res[i] = caml_stat_strdup_to_os(String_val(Field(arg, i)));
   res[size] = NULL;
   return res;
 }
 
 static void free_cstringvect(array v)
 {
-  charnat **p;
+  char_os **p;
   for (p = v; *p != NULL; p++)
     caml_stat_free(*p);
   caml_stat_free(v);
@@ -79,12 +79,12 @@ CAMLprim value caml_run_command(value caml_settings)
   command_settings settings;
 
   CAMLparam1(caml_settings);
-  settings.program = caml_stat_strdup_to_utf16(String_val(Field(caml_settings, 0)));
+  settings.program = caml_stat_strdup_to_os(String_val(Field(caml_settings, 0)));
   settings.argv = cstringvect(Field(caml_settings, 1));
   /* settings.envp = cstringvect(Field(caml_settings, 2)); */
-  settings.stdin_filename = caml_stat_strdup_to_utf16(String_val(Field(caml_settings, 2)));
-  settings.stdout_filename = caml_stat_strdup_to_utf16(String_val(Field(caml_settings, 4)));
-  settings.stderr_filename = caml_stat_strdup_to_utf16(String_val(Field(caml_settings, 4)));
+  settings.stdin_filename = caml_stat_strdup_to_os(String_val(Field(caml_settings, 2)));
+  settings.stdout_filename = caml_stat_strdup_to_os(String_val(Field(caml_settings, 4)));
+  settings.stderr_filename = caml_stat_strdup_to_os(String_val(Field(caml_settings, 4)));
   settings.append = Bool_val(Field(caml_settings, 5));
   settings.timeout = Int_val(Field(caml_settings, 6));
   settings.logger = logToChannel;
diff --git a/otherlibs/unix/chdir.c b/otherlibs/unix/chdir.c
index a5f97a1c3..d6217dc55 100644
--- a/otherlibs/unix/chdir.c
+++ b/otherlibs/unix/chdir.c
@@ -24,12 +24,12 @@
 CAMLprim value unix_chdir(value path)
 {
   CAMLparam1(path);
-  charnat * p;
+  char_os * p;
   int ret;
   caml_unix_check_path(path, "chdir");
-  p = caml_stat_strdup_to_utf16(String_val(path));
+  p = caml_stat_strdup_to_os(String_val(path));
   caml_enter_blocking_section();
-  ret = _tchdir(p);
+  ret = chdir_os(p);
   caml_leave_blocking_section();
   caml_stat_free(p);
   if (ret == -1) uerror("chdir", path);
diff --git a/otherlibs/unix/chmod.c b/otherlibs/unix/chmod.c
index 03630ebdf..7aff4878f 100644
--- a/otherlibs/unix/chmod.c
+++ b/otherlibs/unix/chmod.c
@@ -26,12 +26,12 @@
 CAMLprim value unix_chmod(value path, value perm)
 {
   CAMLparam2(path, perm);
-  charnat * p;
+  char_os * p;
   int ret;
   caml_unix_check_path(path, "chmod");
-  p = caml_stat_strdup_to_utf16(String_val(path));
+  p = caml_stat_strdup_to_os(String_val(path));
   caml_enter_blocking_section();
-  ret = _tchmod(p, Int_val(perm));
+  ret = chmod_os(p, Int_val(perm));
   caml_leave_blocking_section();
   caml_stat_free(p);
   if (ret == -1) uerror("chmod", path);
diff --git a/otherlibs/unix/cstringv.c b/otherlibs/unix/cstringv.c
index c2ec71dd5..d537c6d83 100644
--- a/otherlibs/unix/cstringv.c
+++ b/otherlibs/unix/cstringv.c
@@ -21,22 +21,22 @@
 #include <caml/osdeps.h>
 #include "unixsupport.h"
 
-charnat ** cstringvect(value arg, char * cmdname)
+char_os ** cstringvect(value arg, char * cmdname)
 {
-  charnat ** res;
+  char_os ** res;
   mlsize_t size, i;
 
   size = Wosize_val(arg);
   for (i = 0; i < size; i++)
     if (! caml_string_is_c_safe(Field(arg, i)))
       unix_error(EINVAL, cmdname, Field(arg, i));
-  res = (charnat **) caml_stat_alloc((size + 1) * sizeof(charnat *));
-  for (i = 0; i < size; i++) res[i] = caml_stat_strdup_to_utf16(String_val(Field(arg, i)));
+  res = (char_os **) caml_stat_alloc((size + 1) * sizeof(char_os *));
+  for (i = 0; i < size; i++) res[i] = caml_stat_strdup_to_os(String_val(Field(arg, i)));
   res[size] = NULL;
   return res;
 }
 
-void cstringvect_free(charnat ** v)
+void cstringvect_free(char_os ** v)
 {
   int i = 0;
   while (v[i]) caml_stat_free(v[i++]);
diff --git a/otherlibs/unix/execv.c b/otherlibs/unix/execv.c
index 3bfc109d6..e751b19de 100644
--- a/otherlibs/unix/execv.c
+++ b/otherlibs/unix/execv.c
@@ -22,12 +22,12 @@
 
 CAMLprim value unix_execv(value path, value args)
 {
-  charnat * wpath;
-  charnat ** argv;
+  char_os * wpath;
+  char_os ** argv;
   caml_unix_check_path(path, "execv");
   argv = cstringvect(args, "execv");
-  wpath = caml_stat_strdup_to_utf16(String_val(path));
-  (void) _texecv(wpath, EXECV_CAST argv);
+  wpath = caml_stat_strdup_to_os(String_val(path));
+  (void) execv_os(wpath, EXECV_CAST argv);
   caml_stat_free(wpath);
   cstringvect_free(argv);
   uerror("execv", path);
diff --git a/otherlibs/unix/execve.c b/otherlibs/unix/execve.c
index 461bc1497..bdce766b0 100644
--- a/otherlibs/unix/execve.c
+++ b/otherlibs/unix/execve.c
@@ -22,14 +22,14 @@
 
 CAMLprim value unix_execve(value path, value args, value env)
 {
-  charnat ** argv;
-  charnat ** envp;
-  charnat * wpath;
+  char_os ** argv;
+  char_os ** envp;
+  char_os * wpath;
   caml_unix_check_path(path, "execve");
   argv = cstringvect(args, "execve");
   envp = cstringvect(env, "execve");
-  wpath = caml_stat_strdup_to_utf16(String_val(path));
-  (void) _texecve(wpath, EXECV_CAST argv, EXECV_CAST envp);
+  wpath = caml_stat_strdup_to_os(String_val(path));
+  (void) execve_os(wpath, EXECV_CAST argv, EXECV_CAST envp);
   caml_stat_free(wpath);
   cstringvect_free(argv);
   cstringvect_free(envp);
diff --git a/otherlibs/unix/execvp.c b/otherlibs/unix/execvp.c
index 2a837187b..e751f176a 100644
--- a/otherlibs/unix/execvp.c
+++ b/otherlibs/unix/execvp.c
@@ -21,12 +21,12 @@
 
 CAMLprim value unix_execvp(value path, value args)
 {
-  charnat ** argv;
-  charnat * wpath;
+  char_os ** argv;
+  char_os * wpath;
   caml_unix_check_path(path, "execvp");
   argv = cstringvect(args, "execvp");
-  wpath = caml_stat_strdup_to_utf16(String_val(path));
-  (void) _texecvp((const charnat *)wpath, EXECV_CAST argv);
+  wpath = caml_stat_strdup_to_os(String_val(path));
+  (void) execvp_os((const char_os *)wpath, EXECV_CAST argv);
   caml_stat_free(wpath);
   cstringvect_free(argv);
   uerror("execvp", path);
@@ -36,16 +36,16 @@ CAMLprim value unix_execvp(value path, value args)
 
 CAMLprim value unix_execvpe(value path, value args, value env)
 {
-  charnat * exefile, * wpath;
-  charnat ** argv;
-  charnat ** envp;
+  char_os * exefile, * wpath;
+  char_os ** argv;
+  char_os ** envp;
   caml_unix_check_path(path, "execvpe");
-  wpath = caml_stat_strdup_to_utf16(String_val(path));
+  wpath = caml_stat_strdup_to_os(String_val(path));
   exefile = caml_search_exe_in_path(wpath);
   caml_stat_free(wpath);
   argv = cstringvect(args, "execvpe");
   envp = cstringvect(env, "execvpe");
-  (void) _texecve((const charnat *)exefile, EXECV_CAST argv, EXECV_CAST envp);
+  (void) execve_os((const char_os *)exefile, EXECV_CAST argv, EXECV_CAST envp);
   caml_stat_free(exefile);
   cstringvect_free(argv);
   cstringvect_free(envp);
diff --git a/otherlibs/unix/getcwd.c b/otherlibs/unix/getcwd.c
index 623f70382..a38e40929 100644
--- a/otherlibs/unix/getcwd.c
+++ b/otherlibs/unix/getcwd.c
@@ -37,11 +37,11 @@
 
 CAMLprim value unix_getcwd(value unit)
 {
-  charnat buff[PATH_MAX];
-  charnat * ret;
-  ret = _tgetcwd(buff, sizeof(buff)/sizeof(*buff));
+  char_os buff[PATH_MAX];
+  char_os * ret;
+  ret = getcwd_os(buff, sizeof(buff)/sizeof(*buff));
   if (ret == 0) uerror("getcwd", Nothing);
-  return caml_copy_string_of_utf16(buff);
+  return caml_copy_string_of_os(buff);
 }
 
 #else
diff --git a/otherlibs/unix/putenv.c b/otherlibs/unix/putenv.c
index c69c5b519..76ec1b2d2 100644
--- a/otherlibs/unix/putenv.c
+++ b/otherlibs/unix/putenv.c
@@ -31,15 +31,15 @@
 CAMLprim value unix_putenv(value name, value val)
 {
   char * s;
-  charnat * p;
+  char_os * p;
   int ret;
 
   if (! (caml_string_is_c_safe(name) && caml_string_is_c_safe(val)))
     unix_error(EINVAL, "putenv", name);
   s = caml_stat_strconcat(3, name, "=", val);
-  p = caml_stat_strdup_to_utf16(s);
+  p = caml_stat_strdup_to_os(s);
   caml_stat_free(s);
-  ret = _tputenv(p);
+  ret = putenv_os(p);
   if (ret == -1) {
     caml_stat_free(p);
     uerror("putenv", name);
diff --git a/otherlibs/unix/rmdir.c b/otherlibs/unix/rmdir.c
index 717b12580..3405f1932 100644
--- a/otherlibs/unix/rmdir.c
+++ b/otherlibs/unix/rmdir.c
@@ -24,12 +24,12 @@
 CAMLprim value unix_rmdir(value path)
 {
   CAMLparam1(path);
-  charnat * p;
+  char_os * p;
   int ret;
   caml_unix_check_path(path, "rmdir");
-  p = caml_stat_strdup_to_utf16(String_val(path));
+  p = caml_stat_strdup_to_os(String_val(path));
   caml_enter_blocking_section();
-  ret = _trmdir(p);
+  ret = rmdir_os(p);
   caml_leave_blocking_section();
   caml_stat_free(p);
   if (ret == -1) uerror("rmdir", path);
diff --git a/otherlibs/unix/unlink.c b/otherlibs/unix/unlink.c
index c1188f8cb..578125f58 100644
--- a/otherlibs/unix/unlink.c
+++ b/otherlibs/unix/unlink.c
@@ -24,12 +24,12 @@
 CAMLprim value unix_unlink(value path)
 {
   CAMLparam1(path);
-  charnat * p;
+  char_os * p;
   int ret;
   caml_unix_check_path(path, "unlink");
-  p = caml_stat_strdup_to_utf16(String_val(path));
+  p = caml_stat_strdup_to_os(String_val(path));
   caml_enter_blocking_section();
-  ret = _tunlink(p);
+  ret = unlink_os(p);
   caml_leave_blocking_section();
   caml_stat_free(p);
   if (ret == -1) uerror("unlink", path);
diff --git a/otherlibs/unix/utimes.c b/otherlibs/unix/utimes.c
index 7aec56ab6..e90555b88 100644
--- a/otherlibs/unix/utimes.c
+++ b/otherlibs/unix/utimes.c
@@ -72,7 +72,7 @@ CAMLprim value unix_utimes(value path, value atime, value mtime)
 #else
   struct utimbuf times, * t;
 #endif
-  charnat * p;
+  char_os * p;
   int ret;
   double at, mt;
   caml_unix_check_path(path, "utimes");
@@ -85,9 +85,9 @@ CAMLprim value unix_utimes(value path, value atime, value mtime)
     times.modtime = mt;
     t = &times;
   }
-  p = caml_stat_strdup_to_utf16(String_val(path));
+  p = caml_stat_strdup_to_os(String_val(path));
   caml_enter_blocking_section();
-  ret = _tutime(p, t);
+  ret = utime_os(p, t);
   caml_leave_blocking_section();
   caml_stat_free(p);
   if (ret == -1) uerror("utimes", path);
diff --git a/otherlibs/win32unix/unixsupport.h b/otherlibs/win32unix/unixsupport.h
index 6d408a154..09ebaca9f 100644
--- a/otherlibs/win32unix/unixsupport.h
+++ b/otherlibs/win32unix/unixsupport.h
@@ -128,6 +128,6 @@ typedef struct _REPARSE_DATA_BUFFER
 } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
 #endif
 
-#define EXECV_CAST (const charnat * const *)
+#define EXECV_CAST (const char_os * const *)
 
 #endif /* CAML_UNIXSUPPORT_H */