From ff0253127eb8a8a15017d9c1bbdc9fc6f14298c9 Mon Sep 17 00:00:00 2001 From: Seth Jackson Date: Fri, 1 Jan 2016 12:56:03 -0500 Subject: 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. --- src/nvim/os/users.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/nvim/os/users.c') 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; -- cgit