Merge branch 'solaris-fixes-v9_12-v9_11' into 'v9_11'

Silence some warnings and errors

See merge request isc-projects/bind9!749
This commit is contained in:
Evan Hunt
2018-08-31 21:02:44 -04:00
2 changed files with 2 additions and 4 deletions
+1 -1
View File
@@ -1772,7 +1772,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
+1 -3
View File
@@ -9,8 +9,6 @@
* information regarding copyright ownership.
*/
/* $Id$ */
#ifndef ISC_SOCKET_H
#define ISC_SOCKET_H 1
@@ -259,7 +257,7 @@ struct isc_socket_connev {
* _DSCP: The UDP DSCP value is valid.
* _USEMINMTU: Set the per packet IPV6_USE_MIN_MTU flag.
*/
#define ISC_SOCKEVENTATTR_ATTACHED 0x80000000U /* internal */
#define ISC_SOCKEVENTATTR_ATTACHED 0x10000000U /* internal */
#define ISC_SOCKEVENTATTR_TRUNC 0x00800000U /* public */
#define ISC_SOCKEVENTATTR_CTRUNC 0x00400000U /* public */
#define ISC_SOCKEVENTATTR_TIMESTAMP 0x00200000U /* public */