Merge ^/head r305687 through r305890.

[pw-darwin.git] / pw / pw_vpw.c

diff --git a/pw/pw_vpw.c b/pw/pw_vpw.c
index 2d1c75b4b983783e9fcf0bf3b123fbeb1fa94774..58e52946f146ff02b271c9960bf54dbcabeb93a1 100644 (file)
--- a/pw/pw_vpw.c
+++ b/pw/pw_vpw.c
@@ -33,11 +33,9 @@ static const char rcsid[] =
 #include <pwd.h>
 #include <grp.h>
 #include <libutil.h>
-#define _WITH_GETLINE
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <sys/param.h>
 #include <err.h>
 
 #include "pwupd.h"
@@ -132,13 +130,10 @@ vendgrent(void)
        }
 }
 
-RET_SETGRENT
+void
 vsetgrent(void)
 {
        vendgrent();
-#if defined(__FreeBSD__)
-       return 0;
-#endif
 }
 
 static struct group *