summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>2015-11-19 09:59:40 +0100
committerXavier Leroy <xavier.leroy@inria.fr>2015-11-19 09:59:40 +0100
commit2641daf1fe6150a4597e2c4ea92478b48b386b37 (patch)
treeb5e2ebba1423ae1d6d79937933a768add6b4397a
parent4fd254e3256cfe96e600eafdd229ecb0761ba7d6 (diff)
downloadocaml-2641daf1fe6150a4597e2c4ea92478b48b386b37.tar.gz
PR#6910 and GPR#224: extend marshaling to support data encodings beyond 4 Gb
- Update Changelog - #define inline in config/m-nt.h to support MSVC (to be tested).
-rw-r--r--Changes2
-rw-r--r--config/m-nt.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/Changes b/Changes
index c9d32021fb..526fd095fc 100644
--- a/Changes
+++ b/Changes
@@ -113,6 +113,8 @@ Runtime system:
which is still open (Alain Frisch, review by Damien Doligez)
- Signal handling: for read-and-clear, use GCC/Clang atomic builtins
if available. (Xavier Leroy)
+- PR#6910, GPR#224: marshaling (output_value, input_value, et al)
+ now support marshaled data bigger than 4 Gb. (Xavier Leroy)
- GPR#226: select higher levels of optimization for GCC and Clang when
compiling the run-time system and C stub code. (Xavier Leroy)
- GPR#262: Multiple GC roots per compilation unit (Pierre Chambart, Mark
diff --git a/config/m-nt.h b/config/m-nt.h
index a80b0ac5e7..9af624c467 100644
--- a/config/m-nt.h
+++ b/config/m-nt.h
@@ -40,4 +40,8 @@
#endif
#define ARCH_INT64_PRINTF_FORMAT "I64"
+#if !defined(__MINGW32__) && !defined(inline)
+#define inline __inline
+#endif
+
#undef NONSTANDARD_DIV_MOD