--- a/absyntax_utils/array_dimension_iterator.cc	Tue Aug 14 19:40:01 2012 +0200
+++ b/absyntax_utils/array_dimension_iterator.cc	Wed Aug 22 16:46:17 2012 +0200
@@ -49,6 +49,7 @@
 
 
 #include "array_dimension_iterator.hh"
+#include "../main.hh" // required for ERROR() and ERROR_MSG() macros.
 
 
 //#define DEBUG
@@ -59,9 +60,6 @@
 #endif
 
 
-#define ERROR error_exit(__FILE__,__LINE__)
-/* function defined in main.cc */
-extern void error_exit(const char *file_name, int line_no);
 
 void* array_dimension_iterator_c::iterate_list(list_c *list) {
   void *res;
@@ -102,7 +100,7 @@
  *
  * Returns the subrange symbol!
  */
-symbol_c *array_dimension_iterator_c::next(void) {
+subrange_c *array_dimension_iterator_c::next(void) {
   void *res = array_specification->accept(*this);
   if (res == NULL) 
     return NULL;