Skip to content

Commit

Permalink
No longer mark Windows Unicode runtime as experimental (#10318)
Browse files Browse the repository at this point in the history
  • Loading branch information
nojb committed Apr 8, 2021
1 parent 69a573f commit ef296e4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
4 changes: 4 additions & 0 deletions Changes
Expand Up @@ -81,6 +81,10 @@ Working version
(Xavier Leroy, reports by Tomasz Kłoczko and R.W.M. Jones, review by Anil
Madhavapeddy, Stephen Dolan, and Florian Angeletti)

- #10318: Windows Unicode runtime functions are no longer marked as
experimental.
(Nicolás Ojeda Bär, review by David Allsopp)

### Code generation and optimizations:

- #9876: do not cache the young_limit GC variable in a processor register.
Expand Down
6 changes: 0 additions & 6 deletions manual/src/cmds/intf-c.etex
Expand Up @@ -2539,10 +2539,6 @@ use the OCaml run-time system, typically a blocking input/output operation.
This section contains some general guidelines for writing C stubs that use
Windows Unicode APIs.

{\bf Note:} This is an experimental feature of OCaml: the set of APIs below, as
well as their exact semantics are not final and subject to change in future
releases.

The OCaml system under Windows can be configured at build time in one of two
modes:

Expand Down Expand Up @@ -2645,9 +2641,7 @@ of the function to bind:
The rest of the binding is the same for both platforms:

\begin{verbatim}
/* The following define is necessary because the API is experimental */
#define CAML_NAME_SPACE
#define CAML_INTERNALS

#include <caml/mlvalues.h>
#include <caml/misc.h>
Expand Down
16 changes: 10 additions & 6 deletions runtime/caml/osdeps.h
Expand Up @@ -127,6 +127,16 @@ CAMLextern int win_wide_char_to_multi_byte(const wchar_t* s,
char *out,
int outlen);

CAMLextern int caml_win32_isatty(int fd);

CAMLextern void caml_expand_command_line (int *, wchar_t ***);

#endif /* _WIN32 */

#endif /* CAML_INTERNALS */

#ifdef _WIN32

/* [caml_stat_strdup_to_utf16(s)] returns a NULL-terminated copy of [s],
re-encoded in UTF-16. The encoding of [s] is assumed to be UTF-8 if
[caml_windows_unicode_runtime_enabled] is non-zero **and** [s] is valid
Expand All @@ -152,12 +162,6 @@ CAMLextern char* caml_stat_strdup_of_utf16(const wchar_t *s);
*/
CAMLextern value caml_copy_string_of_utf16(const wchar_t *s);

CAMLextern int caml_win32_isatty(int fd);

CAMLextern void caml_expand_command_line (int *, wchar_t ***);

#endif /* _WIN32 */

#endif /* CAML_INTERNALS */

#endif /* CAML_OSDEPS_H */

0 comments on commit ef296e4

Please sign in to comment.