*** empty log message ***

diff --git a/src/Headers/constraintTerm.h b/src/Headers/constraintTerm.h
index e3c703716cf1933be173ffcdbfd98e206ee5b661..14a102b8fed768c600e0a089b7efde62ce2d1d8f 100644 (file)
--- 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 4bbf2933b0f510628615b7088cbaf9fbc5cfc5a0..aaaa9e68997cd12c836cdf2e92d5a7b4e80ffd21 100644 (file)
--- 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 f4f27ac3cb6d7dfea0dcf876be03ebdb1652fafb..9faec5fca7f661423c986b7709aafccece51497d 100644 (file)
--- 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 1cf43fb17488e4a401fb97939d7ce2e6fc7d9a94..06be66a73ca4641f1d7328417c8d42798cc4c39e 100644 (file)
--- 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));