--- a/stage3/array_range_check.cc	Thu Jul 19 13:42:05 2012 +0100
+++ b/stage3/array_range_check.cc	Fri Jul 20 15:50:49 2012 +0100
@@ -71,8 +71,8 @@
     warning_found = true;                                                                                                   \
 }
 
-#define GET_CVALUE(dtype, symbol)             ((symbol)->const_value_##dtype->value)
-#define VALID_CVALUE(dtype, symbol)           ((NULL != (symbol)->const_value_##dtype) && (symbol_c::cs_const_value == (symbol)->const_value_##dtype->status))
+#define GET_CVALUE(dtype, symbol)             ((symbol)->const_value._##dtype.value)
+#define VALID_CVALUE(dtype, symbol)           (symbol_c::cs_const_value == (symbol)->const_value._##dtype.status)