From 8888c5de4c415b857f260212229893f3605b9097 Mon Sep 17 00:00:00 2001 From: David Nugent Date: Sat, 15 Jan 2000 00:20:22 +0000 Subject: Portability fixes for other bsd4.4 derivatives. --- pw/pwupd.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'pw/pwupd.h') diff --git a/pw/pwupd.h b/pw/pwupd.h index 046bd2e..8da036d 100644 --- a/pw/pwupd.h +++ b/pw/pwupd.h @@ -35,6 +35,12 @@ #include +#if defined(__FreeBSD__) +#define RET_SETGRENT int +#else +#define RET_SETGRENT void +#endif + enum updtype { UPD_DELETE = -1, @@ -63,7 +69,7 @@ struct pwf struct passwd * (*_getpwuid)(uid_t uid); struct passwd * (*_getpwnam)(const char * nam); int (*_pwdb)(char *arg, ...); - int (*_setgrent)(void); + RET_SETGRENT (*_setgrent)(void); void (*_endgrent)(void); struct group * (*_getgrent)(void); struct group * (*_getgrgid)(gid_t gid); @@ -135,15 +141,13 @@ struct passwd * vgetpwnam __P((const char * nam)); struct passwd * vgetpwent __P((void)); int vpwdb __P((char *arg, ...)); -int vsetgrent __P((void)); -void vendgrent __P((void)); struct group * vgetgrent __P((void)); struct group * vgetgrgid __P((gid_t gid)); struct group * vgetgrnam __P((const char * nam)); struct group * vgetgrent __P((void)); int vgrdb __P((char *arg, ...)); -int vsetgrent __P((void)); -void vendgrent __P((void)); +RET_SETGRENT vsetgrent __P((void)); +void vendgrent __P((void)); void copymkdir __P((char const * dir, char const * skel, mode_t mode, uid_t uid, gid_t gid)); void rm_r __P((char const * dir, uid_t uid)); -- cgit v1.2.3