Merge from trunk.

[thirdparty/gcc.git] / gcc / c-family / c-format.c

diff --git a/gcc/c-family/c-format.c b/gcc/c-family/c-format.c
index 491ef71e42d84e1ecc09bb6e4f123367c1e21657..0ae6733c2d703ddeb1a4259d799500c5522a6162 100644 (file)
--- a/gcc/c-family/c-format.c
+++ b/gcc/c-family/c-format.c
@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "tree.h"
+#include "stringpool.h"
 #include "flags.h"
 #include "c-common.h"
 #include "c-objc.h"
@@ -232,7 +233,7 @@ get_constant (tree expr, unsigned HOST_WIDE_INT *value, int validated_p)
       return false;
     }
 
-  *value = tree_to_hwi (expr);
+  *value = TREE_INT_CST_LOW (expr);
 
   return true;
 }