2746. [port] hpux: address signed/unsigned expansion mismatch of

                        dns_rbtnode_t.nsec. [RT #20542]

diff --git a/CHANGES b/CHANGES
index c47ffe276fd27683ecff0d08142c5cae32799944..a385948f61000b75aa53b17224cfc92ab15630d0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2746.  [port]          hpux: address signed/unsigned expansion mismatch of
+                       dns_rbtnode_t.nsec. [RT #20542]
+
 2745.  [bug]           configure script didn't probe the return type of
                        gai_strerror(3) correctly. [RT #20573]
 

diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
index a0f5acaa5468599ca552703be05b9daf4a248922..3e9dc886576fa89bfe6d79d59ff1fadba91d7b5a 100644 (file)
--- a/lib/dns/include/dns/rbt.h
+++ b/lib/dns/include/dns/rbt.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbt.h,v 1.76 2009/10/27 04:46:58 marka Exp $ */
+/* $Id: rbt.h,v 1.77 2009/11/04 01:18:19 marka Exp $ */
 
 #ifndef DNS_RBT_H
 #define DNS_RBT_H 1
@@ -70,6 +70,12 @@ ISC_LANG_BEGINDECLS
  * multiple dns_rbtnode structures will not work.
  */
 typedef struct dns_rbtnode dns_rbtnode_t;
+enum {
+       DNS_RBT_NSEC_NORMAL=0,      /* in main tree */
+       DNS_RBT_NSEC_HAS_NSEC=1,    /* also has node in nsec tree */
+       DNS_RBT_NSEC_NSEC=2,        /* in nsec tree */
+       DNS_RBT_NSEC_NSEC3=3        /* in nsec3 tree */
+};
 struct dns_rbtnode {
 #if DNS_RBT_USEMAGIC
        unsigned int magic;
@@ -103,12 +109,7 @@ struct dns_rbtnode {
        unsigned int color : 1;         /*%< range is 0..1 */
        unsigned int find_callback : 1; /*%< range is 0..1 */
        unsigned int attributes : 3;    /*%< range is 0..2 */
-       enum {
-           DNS_RBT_NSEC_NORMAL=0,      /*      in main tree */
-           DNS_RBT_NSEC_HAS_NSEC=1,    /*      also has node in nsec tree */
-           DNS_RBT_NSEC_NSEC=2,        /*      in nsec tree */
-           DNS_RBT_NSEC_NSEC3=3        /*      in nsec3 tree */
-       } nsec : 2;                     /*%< range is 0..3 */
+       unsigned int nsec : 2;          /*%< range is 0..3 */
        unsigned int namelen : 8;       /*%< range is 1..255 */
        unsigned int offsetlen : 8;     /*%< range is 1..128 */
        unsigned int oldnamelen : 8;    /*%< range is 1..255 */