diff options
author | Seth Jackson <sethjackson@gmail.com> | 2016-01-01 12:56:03 -0500 |
---|---|---|
committer | Seth Jackson <sethjackson@gmail.com> | 2016-01-01 14:13:56 -0500 |
commit | ff0253127eb8a8a15017d9c1bbdc9fc6f14298c9 (patch) | |
tree | c3491cc8b37c4d7312e66629c9267879e4a41420 /src | |
parent | df4ac79761162313de4e27a265044125062013cf (diff) | |
download | rneovim-ff0253127eb8a8a15017d9c1bbdc9fc6f14298c9.tar.gz rneovim-ff0253127eb8a8a15017d9c1bbdc9fc6f14298c9.tar.bz2 rneovim-ff0253127eb8a8a15017d9c1bbdc9fc6f14298c9.zip |
Windows: Make the os_get_uname argument portable.
Since uid_t is not defined on Windows use uv_uid_t instead.
We now use uv_uid_t everywhere except one place in src/nvim/main.c
which is wrapped in a #ifdef UNIX check.
Diffstat (limited to 'src')
-rw-r--r-- | src/nvim/os/users.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/os/users.c b/src/nvim/os/users.c index 637a86c74f..8ebb7562ef 100644 --- a/src/nvim/os/users.c +++ b/src/nvim/os/users.c @@ -42,17 +42,17 @@ int os_get_usernames(garray_T *users) int os_get_user_name(char *s, size_t len) { #ifdef UNIX - return os_get_uname(getuid(), s, len); + return os_get_uname((uv_uid_t)getuid(), s, len); #else // TODO(equalsraf): Windows GetUserName() - return os_get_uname(0, s, len); + return os_get_uname((uv_uid_t)0, s, len); #endif } // Insert user name for "uid" in s[len]. // Return OK if a name found. // If the name is not found, write the uid into s[len] and return FAIL. -int os_get_uname(uid_t uid, char *s, size_t len) +int os_get_uname(uv_uid_t uid, char *s, size_t len) { #if defined(HAVE_PWD_H) && defined(HAVE_GETPWUID) struct passwd *pw; |