diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-08-16 20:19:05 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-08-16 20:19:05 +0000 |
| commit | ac719d1ccab34c24fd5b39cf8cfe49039289b033 (patch) | |
| tree | 0a1771f52aa9a90ad781b3924adc7f280aa38ae6 /pw/pwupd.h | |
| parent | ae4f3b0a81875867702cade7ba2f5920d92ee481 (diff) | |
| parent | 54a011838a76f1406af6edea1f1b2741105c5b80 (diff) | |
| download | pw-darwin-ac719d1ccab34c24fd5b39cf8cfe49039289b033.tar.gz pw-darwin-ac719d1ccab34c24fd5b39cf8cfe49039289b033.zip | |
Merge ^/head r303250 through r304235.
Diffstat (limited to 'pw/pwupd.h')
| -rw-r--r-- | pw/pwupd.h | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -38,12 +38,6 @@ #include <stdbool.h> #include <stringlist.h> -#if defined(__FreeBSD__) -#define RET_SETGRENT int -#else -#define RET_SETGRENT void -#endif - struct pwf { int _altdir; void (*_setpwent)(void); @@ -51,7 +45,7 @@ struct pwf { struct passwd * (*_getpwent)(void); struct passwd * (*_getpwuid)(uid_t uid); struct passwd * (*_getpwnam)(const char * nam); - RET_SETGRENT (*_setgrent)(void); + void (*_setgrent)(void); void (*_endgrent)(void); struct group * (*_getgrent)(void); struct group * (*_getgrgid)(gid_t gid); @@ -141,7 +135,7 @@ struct passwd * vgetpwnam(const char * nam); struct group * vgetgrent(void); struct group * vgetgrgid(gid_t gid); struct group * vgetgrnam(const char * nam); -RET_SETGRENT vsetgrent(void); +void vsetgrent(void); void vendgrent(void); void copymkdir(int rootfd, char const * dir, int skelfd, mode_t mode, uid_t uid, |