diff options
| author | Seth Jackson <sethjackson@gmail.com> | 2015-08-25 18:55:07 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-08-25 19:35:39 -0400 |
| commit | 7c135b8ccb5dba0f3ad3e2767fe4d3592345f23f (patch) | |
| tree | 43afc6079d3a338ca44e6974c2a78620c8b7ac32 | |
| parent | bbe24da869a071e5dd203f2ff7e249ec06ac6c95 (diff) | |
| download | rneovim-7c135b8ccb5dba0f3ad3e2767fe4d3592345f23f.tar.gz rneovim-7c135b8ccb5dba0f3ad3e2767fe4d3592345f23f.tar.bz2 rneovim-7c135b8ccb5dba0f3ad3e2767fe4d3592345f23f.zip | |
MSVC: Define `inline` and `restrict`. #3237
MSVC 2015 defines __func__ (C++11).
https://msdn.microsoft.com/en-us/library/dn919276.aspx
MSVC only allows inline in C++ and requires __inline in C instead.
https://msdn.microsoft.com/en-us/library/bw1hbe6y.aspx
| -rw-r--r-- | src/nvim/os/win_defs.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/nvim/os/win_defs.h b/src/nvim/os/win_defs.h index 025833060a..c169dbfe83 100644 --- a/src/nvim/os/win_defs.h +++ b/src/nvim/os/win_defs.h @@ -21,6 +21,15 @@ // - SYS_VIMRC_FILE // - SPECIAL_WILDCHAR +#ifdef _MSC_VER +# ifndef inline +# define inline __inline +# endif +# ifndef restrict +# define restrict __restrict +# endif +#endif + typedef SSIZE_T ssize_t; #ifndef SSIZE_MAX |