diff options
| author | Nicolas Ojeda Bar <nicolas.ojeda.bar@lexifi.com> | 2015-12-28 22:01:40 +0100 |
|---|---|---|
| committer | Nicolas Ojeda Bar <nicolas.ojeda.bar@lexifi.com> | 2015-12-28 22:01:40 +0100 |
| commit | 00f04279a07c77d4d538f585df74f6d5b6bd9472 (patch) | |
| tree | 807976458698806faa8049e2bde132c87af15607 | |
| parent | 6533f3bc06d69512871b8f2224f8e4df7b7b33cf (diff) | |
| download | ocaml-00f04279a07c77d4d538f585df74f6d5b6bd9472.tar.gz | |
Remove extra `inline` macro definition
| -rw-r--r-- | byterun/caml/config.h | 8 | ||||
| -rw-r--r-- | config/m-nt.h | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/byterun/caml/config.h b/byterun/caml/config.h index febc721677..58f2f4266d 100644 --- a/byterun/caml/config.h +++ b/byterun/caml/config.h @@ -113,14 +113,6 @@ typedef uint64_t uintnat; #endif -/* We use static inline functions in some cases instead of duplicating - code but the MSVC compiler has a slightly different syntax. */ - -#ifdef _MSC_VER -#define inline _inline -#endif - - /* We use threaded code interpretation if the compiler provides labels as first-class values (GCC 2.x). */ diff --git a/config/m-nt.h b/config/m-nt.h index d869c375e0..783fdd170d 100644 --- a/config/m-nt.h +++ b/config/m-nt.h @@ -40,7 +40,7 @@ #endif #define ARCH_INT64_PRINTF_FORMAT "I64" -#if !defined(__MINGW32__) && !defined(__cplusplus) && !defined(inline) +#if defined(_MSC_VER) && !defined(__cplusplus) #define inline __inline #endif |