diff options
| author | dougb <dougb@FreeBSD.org> | 2002-07-01 01:20:28 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2002-07-01 01:20:28 +0000 |
| commit | 6c7d734ad5356ca0a26e4ac4a48b159367a32613 (patch) | |
| tree | aac3a8864bfcf09cca9408465b0649334b61d842 /contrib/bind/port/freebsd | |
| parent | 67c9dec97554c34ae92f7d669f1c0de844fcf4c8 (diff) | |
| download | FreeBSD-src-6c7d734ad5356ca0a26e4ac4a48b159367a32613.zip FreeBSD-src-6c7d734ad5356ca0a26e4ac4a48b159367a32613.tar.gz | |
Resolve conflicts, generally in favor of the vendor version.
Diffstat (limited to 'contrib/bind/port/freebsd')
| -rw-r--r-- | contrib/bind/port/freebsd/include/port_before.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/contrib/bind/port/freebsd/include/port_before.h b/contrib/bind/port/freebsd/include/port_before.h index cdedbbd..a97e2ef 100644 --- a/contrib/bind/port/freebsd/include/port_before.h +++ b/contrib/bind/port/freebsd/include/port_before.h @@ -16,6 +16,7 @@ #define SETPWENT_VOID #endif +#include <sys/param.h> #include <sys/types.h> #define GROUP_R_RETURN struct group * @@ -27,8 +28,13 @@ #define GROUP_R_ENT_ARGS void #define GROUP_R_OK gptr #define GROUP_R_BAD NULL +#if defined(__FreeBSD_version) && __FreeBSD_version >= 500030 #define GETGROUPLIST_ARGS const char *name, gid_t basegid, gid_t *groups, \ int *ngroups +#else +#define GETGROUPLIST_ARGS const char *name, int basegid, int *groups, \ + int *ngroups +#endif #define HOST_R_RETURN struct hostent * #define HOST_R_SET_RETURN void |
