From f0171cff609dadc8363308bb1ac7ae9102f56cae Mon Sep 17 00:00:00 2001
From: evans <evans>
Date: Thu, 5 Jul 2001 21:13:18 +0000
Subject: [PATCH] *** empty log message ***

---
 src/Headers/constraintTerm.h | 3 +++
 src/constraint.c             | 1 +
 src/constraintTerm.c         | 2 +-
 src/uentry.c                 | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Headers/constraintTerm.h b/src/Headers/constraintTerm.h
index e3c7037..14a102b 100644
--- a/src/Headers/constraintTerm.h
+++ b/src/Headers/constraintTerm.h
@@ -26,6 +26,9 @@ struct _constraintTerm {
 
 abst_typedef struct _constraintTerm *constraintTerm;
 
+/*@i311 shouldn't need this...never null */
+extern bool constraintTerm_isDefined (constraintTerm t) /*@*/ ;
+
 extern constraintTermType constraintTerm_getKind (constraintTerm) ;
 extern /*@exposed@*/ sRef constraintTerm_getSRef (constraintTerm) ;
 
diff --git a/src/constraint.c b/src/constraint.c
index 4bbf293..aaaa9e6 100644
--- a/src/constraint.c
+++ b/src/constraint.c
@@ -9,6 +9,7 @@
 # include "basic.h"
 # include "cgrammar.h"
 # include "cgrammar_tokens.h"
+
 # include "exprChecks.h"
 # include "exprNodeSList.h"
 
diff --git a/src/constraintTerm.c b/src/constraintTerm.c
index f4f27ac..9faec5f 100644
--- a/src/constraintTerm.c
+++ b/src/constraintTerm.c
@@ -19,7 +19,7 @@
 
 /*@access exprNode @*/
 
-static bool constraintTerm_isDefined (constraintTerm t)
+bool constraintTerm_isDefined (constraintTerm t)
 {
   return t != NULL;
 }
diff --git a/src/uentry.c b/src/uentry.c
index 1cf43fb..06be66a 100644
--- a/src/uentry.c
+++ b/src/uentry.c
@@ -9116,7 +9116,7 @@ uentry_clearDecl (void)
 void
 uentry_checkDecl (void)
 {
-  if (uentry_isValid (posRedeclared))
+  if (uentry_isValid (posRedeclared) && !fileloc_isXHFile (posLoc))
     {
       llassert (fileloc_isDefined (posLoc));
 
-- 
2.45.2