2012-01-09 Richard Guenther <rguenther@suse.de>

[pf3gnuchains/gcc-fork.git] / libcpp / directives-only.c

diff --git a/libcpp/directives-only.c b/libcpp/directives-only.c
index addd9a7..c6772af 100644 (file)
--- a/libcpp/directives-only.c
+++ b/libcpp/directives-only.c
@@ -1,11 +1,11 @@
 /* CPP Library - directive only preprocessing for distributed compilation.
-   Copyright (C) 2007
+   Copyright (C) 2007, 2009
    Free Software Foundation, Inc.
    Contributed by Ollie Wild <aaw@google.com>.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2, or (at your option) any
+Free Software Foundation; either version 3, or (at your option) any
 later version.
 
 This program is distributed in the hope that it will be useful,
@@ -14,8 +14,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+along with this program; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
 
 #include "config.h"
 #include "system.h"
@@ -142,7 +142,7 @@ _cpp_preprocess_dir_only (cpp_reader *pfile,
            flags |= DO_LINE_COMMENT;
          else if (!(flags & DO_SPECIAL))
            /* Mark the position for possible error reporting. */
-           LINEMAP_POSITION_FOR_COLUMN (loc, pfile->line_table, col);
+           loc = linemap_position_for_column (pfile->line_table, col);
 
          break;