mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-30 23:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows: Make the os_get_uname argument portable.

Browse Source 
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.
This commit is contained in:
Seth Jackson
2016-01-01 12:56:03 -05:00
parent df4ac79761
commit ff0253127e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/os/users.c
View File

@@ -42,17 +42,17 @@ int os_get_usernames(garray_T *users)
int os_get_user_name(char *s, size_t len) int os_get_user_name(char *s, size_t len)
{ {
#ifdef UNIX #ifdef UNIX
return os_get_uname(getuid(), s, len); return os_get_uname((uv_uid_t)getuid(), s, len);
#else #else
// TODO(equalsraf): Windows GetUserName() // TODO(equalsraf): Windows GetUserName()
return os_get_uname(0, s, len); return os_get_uname((uv_uid_t)0, s, len);
#endif #endif
} }
// Insert user name for "uid" in s[len]. // Insert user name for "uid" in s[len].
// Return OK if a name found. // Return OK if a name found.
// If the name is not found, write the uid into s[len] and return FAIL. // 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) #if defined(HAVE_PWD_H) && defined(HAVE_GETPWUID)
struct passwd *pw; struct passwd *pw;