From bf46079c13f3bf4a566028d85e913e8871c81e01 Mon Sep 17 00:00:00 2001
From: MaartenBrock <MaartenBrock@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Thu, 21 Feb 2008 23:48:02 +0000
Subject: [PATCH] * src/SDCCast.c (createIvalStruct): fixed bug 1466761

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@5037 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 ChangeLog     |  4 ++++
 src/SDCCast.c | 12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fec45713..1a673ab0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-22 Maarten Brock <sourceforge.brock AT dse.nl>
+
+	* src/SDCCast.c (createIvalStruct): fixed bug 1466761
+
 2008-02-21 Borut Razem <borut.razem AT siol.net>
 
 	* support/regression/Makefile.in,
diff --git a/src/SDCCast.c b/src/SDCCast.c
index 702d6ec1..fa33a799 100644
--- a/src/SDCCast.c
+++ b/src/SDCCast.c
@@ -998,10 +998,14 @@ createIvalStruct (ast * sym, sym_link * type, initList * ilist, ast *rootValue)
 
     }
 
-  if (iloop) {
-    werrorfl (sym->opval.val->sym->fileDef, sym->opval.val->sym->lineDef,
-              W_EXCESS_INITIALIZERS, "struct",
-              sym->opval.val->sym->name);
+  if (iloop)
+    {
+      if (IS_AST_VALUE (sym))
+        werrorfl (sym->opval.val->sym->fileDef, sym->opval.val->sym->lineDef,
+                  W_EXCESS_INITIALIZERS, "struct",
+                  sym->opval.val->sym->name);
+      else
+        werrorfl (sym->filename, sym->lineno, E_INIT_COUNT);
   }
 
   return rast;
-- 
2.47.2