diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-11-18 12:12:49 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-11-18 12:12:49 +0000 |
| commit | 249b8d69e44aa5e0e74a35f10ebc156c10cb4500 (patch) | |
| tree | 966eda41f105f4042f8ae2c5b4014a6e21ee93a1 /sysutils | |
| parent | 34d806ba3699be9ce79413491f947811ba0007b6 (diff) | |
| download | pkgsrc-249b8d69e44aa5e0e74a35f10ebc156c10cb4500.tar.gz | |
Pull in grp.h and pwd.h from libnbcompat, fixes implicit declaration of
gid_from_group and uid_from_user on Darwin. Fix (lightly modified by myself)
submitted by Aleksej Lebedev in PR#50440.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/bsdinstall/files/bsdinstall.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/sysutils/bsdinstall/files/bsdinstall.c b/sysutils/bsdinstall/files/bsdinstall.c index b020215b8a8..18b3950bb46 100644 --- a/sysutils/bsdinstall/files/bsdinstall.c +++ b/sysutils/bsdinstall/files/bsdinstall.c @@ -1,4 +1,4 @@ -/* $NetBSD: bsdinstall.c,v 1.2 2013/09/03 15:27:38 jperkin Exp $ */ +/* $NetBSD: bsdinstall.c,v 1.3 2015/11/18 12:12:49 jperkin Exp $ */ /* NetBSD: xinstall.c,v 1.114 2009/11/12 10:10:49 tron Exp */ /* @@ -71,26 +71,22 @@ __RCSID("NetBSD: xinstall.c,v 1.114 2009/11/12 10:10:49 tron Exp"); #endif #include <errno.h> #include <fcntl.h> -#include <grp.h> #include <libgen.h> -#if defined(HAVE_NBCOMPAT_H) -#include <nbcompat/paths.h> -#else -#include <paths.h> -#endif -#include <pwd.h> #include <stdio.h> -#if defined(HAVE_NBCOMPAT_H) -#include <nbcompat/stdlib.h> -#else -#include <stdlib.h> -#endif #include <string.h> #include <unistd.h> #if defined(HAVE_NBCOMPAT_H) +#include <nbcompat/grp.h> +#include <nbcompat/paths.h> +#include <nbcompat/pwd.h> +#include <nbcompat/stdlib.h> #include <nbcompat/util.h> #include <nbcompat/vis.h> #else +#include <grp.h> +#include <paths.h> +#include <pwd.h> +#include <stdlib.h> #include <util.h> #include <vis.h> #endif |