938. [port] aix 4.3.2 namespace clash on "struct token".

diff --git a/CHANGES b/CHANGES
index 5d97d303445de62609500466d5a4aaaa96b7bad5..7eaba0efc48880c6e19ce2cd89344b70f3184e00 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+ 938.  [port]          aix 4.3.2 namespace clash on "struct token".
+
  929.  [bug]           RUNTIME_CHECK() used inappropriately in named.conf
                        parser.
 

diff --git a/lib/dns/config/confparser.y.dirty b/lib/dns/config/confparser.y.dirty
index 1537d5c77e4fc54e64c92027f4ed8742ae73eb70..278644c534c433d34de65fb82668c3a6fdd6fc34 100644 (file)
--- a/lib/dns/config/confparser.y.dirty
+++ b/lib/dns/config/confparser.y.dirty
@@ -33,7 +33,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: confparser.y.dirty,v 1.44.2.9 2001/07/11 13:31:01 marka Exp $ */
+/* $Id: confparser.y.dirty,v 1.44.2.10 2001/07/17 07:36:03 marka Exp $ */
 
 #include <config.h>
 
@@ -6134,13 +6134,13 @@ static int              lasttoken;
  * Definition of all unique keyword tokens to be recognised by the
  * lexer. All the 'L_' tokens defined in parser.y must be defined here too.
  */
-struct token
+struct dns_token
 {
        const char *token;
        int yaccval;
 };
 
-static struct token keyword_tokens [] = {
+static struct dns_token keyword_tokens [] = {
        { "{",                          L_LBRACE },
        { "}",                          L_RBRACE },
        { ";",                          L_EOS },
@@ -6327,7 +6327,7 @@ static struct token keyword_tokens [] = {
 };
 
 
-static struct token class_symbol_tokens[] = {
+static struct dns_token class_symbol_tokens[] = {
        { "IN", dns_rdataclass_in },
 #if 0                                  /* XXX expand */
        { "CHAOS", dns_rdataclass_chaos },
@@ -6499,7 +6499,7 @@ dns_c_parse_namedconf(const char *filename, isc_mem_t *mem,
 static isc_result_t
 keyword_init(void)
 {
-       struct token *tok;
+       struct dns_token *tok;
        isc_symvalue_t symval;
        isc_result_t result;