diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 05f68fd7b49..aeaa27d31f7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-05  David Malcolm  <dmalcolm@redhat.com>
+
+	* diagnostic.h (CARET_LINE_MARGIN): Convert from macro to const
+	int.
+
 2017-05-05  David Malcolm  <dmalcolm@redhat.com>
 
 	* diagnostic.h (diagnostic_override_option_index): Convert from
diff --git a/gcc/diagnostic.h b/gcc/diagnostic.h
index c419b000f16..dbd1703e0ef 100644
--- a/gcc/diagnostic.h
+++ b/gcc/diagnostic.h
@@ -348,7 +348,7 @@ diagnostic_expand_location (const diagnostic_info * diagnostic, int which = 0)
 /* This is somehow the right-side margin of a caret line, that is, we
    print at least these many characters after the position pointed at
    by the caret.  */
-#define CARET_LINE_MARGIN 10
+const int CARET_LINE_MARGIN = 10;
 
 /* Return true if the two locations can be represented within the same
    caret line.  This is used to build a prefix and also to determine