Convert CARET_LINE_MARGIN to const int

gcc/ChangeLog:
	* diagnostic.h (CARET_LINE_MARGIN): Convert from macro to const
	int.

From-SVN: r247666

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 05f68fd..aeaa27d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
 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
        macro to inline function.
 

diff --git a/gcc/diagnostic.h b/gcc/diagnostic.h
index c419b00..dbd1703 100644 (file)
--- 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