diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2017-03-08 11:29:24 +0000 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2017-05-16 19:48:37 +0100 |
| commit | d526e7cce9ef568e8c4f197c2ca3897bc6eec053 (patch) | |
| tree | 549697cdf88c38e0dff2560de7d0c070ab2c2b2d | |
| parent | f7f5b9487fb1e6179cd2eebd3d0a51a8f2d9ac64 (diff) | |
| download | ocaml-d526e7cce9ef568e8c4f197c2ca3897bc6eec053.tar.gz | |
Move INT64_LITERAL from byterun/ints.c to m.h
| -rw-r--r-- | byterun/ints.c | 7 | ||||
| -rw-r--r-- | config/m-nt.h | 7 | ||||
| -rwxr-xr-x | configure | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/byterun/ints.c b/byterun/ints.c index c49f42f0ef..16326395f0 100644 --- a/byterun/ints.c +++ b/byterun/ints.c @@ -501,13 +501,6 @@ value caml_int64_direct_bswap(value v) { return caml_swap64(v); } #endif -/* Microsoft introduced the LL integer literal suffix in Visual C++ .NET 2003 */ -#if defined(_MSC_VER) && _MSC_VER < 1400 -#define INT64_LITERAL(s) s ## i64 -#else -#define INT64_LITERAL(s) s ## LL -#endif - CAMLprim value caml_int64_bswap(value v) { int64_t x = Int64_val(v); diff --git a/config/m-nt.h b/config/m-nt.h index d7a2167c3b..56a50feb79 100644 --- a/config/m-nt.h +++ b/config/m-nt.h @@ -49,3 +49,10 @@ #undef NONSTANDARD_DIV_MOD #define PROFINFO_WIDTH 0 + +/* Microsoft introduced the LL integer literal suffix in Visual C++ .NET 2003 */ +#if defined(_MSC_VER) && _MSC_VER < 1400 +#define INT64_LITERAL(s) s ## i64 +#else +#define INT64_LITERAL(s) s ## LL +#endif @@ -635,6 +635,7 @@ echo "#define SIZEOF_LONG $2" >> m.h echo "#define SIZEOF_PTR $3" >> m.h echo "#define SIZEOF_SHORT $4" >> m.h echo "#define SIZEOF_LONGLONG $5" >> m.h +echo "#define INT64_LITERAL(s) s ## LL" >> m.h # Determine endianness |