Commit 73b26484 authored by Evan Hunt's avatar Evan Hunt

Merge branch 'solaris-fixes' into 'master'

Silence some warnings and errors

See merge request !746
parents 0716902f d932ec87
Pipeline #4592 passed with stages
in 7 minutes and 57 seconds
......@@ -1871,7 +1871,7 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) {
typedef struct {
const char *name;
int allowed;
unsigned int allowed;
} optionstable;
static isc_result_t
......
......@@ -231,7 +231,7 @@ enum {
* _USEMINMTU: Set the per packet IPV6_USE_MIN_MTU flag.
*/
typedef enum {
ISC_SOCKEVENTATTR_ATTACHED = 0x80000000U, /* internal */
ISC_SOCKEVENTATTR_ATTACHED = 0x10000000U, /* internal */
ISC_SOCKEVENTATTR_TRUNC = 0x00800000U, /* public */
ISC_SOCKEVENTATTR_CTRUNC = 0x00400000U, /* public */
ISC_SOCKEVENTATTR_TIMESTAMP = 0x00200000U, /* public */
......@@ -352,7 +352,7 @@ typedef struct isc_socketmethods {
void (*detach)(isc_socket_t **socketp);
isc_result_t (*bind)(isc_socket_t *sock,
const isc_sockaddr_t *sockaddr,
unsigned int options);
isc_socket_options_t options);
isc_result_t (*sendto)(isc_socket_t *sock, isc_region_t *region,
isc_task_t *task, isc_taskaction_t action,
void *arg,
......
......@@ -134,7 +134,7 @@ isc_socket_detach(isc_socket_t **socketp) {
isc_result_t
isc_socket_bind(isc_socket_t *sock, const isc_sockaddr_t *sockaddr,
unsigned int options)
isc_socket_options_t options)
{
REQUIRE(ISCAPI_SOCKET_VALID(sock));
......
......@@ -543,7 +543,7 @@ isc__socket_permunix(const isc_sockaddr_t *sockaddr, uint32_t perm,
uint32_t owner, uint32_t group);
isc_result_t
isc__socket_bind(isc_socket_t *sock, const isc_sockaddr_t *sockaddr,
unsigned int options);
isc_socket_options_t options);
isc_result_t
isc__socket_filter(isc_socket_t *sock, const char *filter);
isc_result_t
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment