init.c (read_original_filename): Don't call read_original_directory if…

init.c (read_original_filename): Don't call read_original_directory if _cpp_handle_directive returns 0. * init.c (read_original_filename): Don't call read_original_directory if _cpp_handle_directive returns 0. From-SVN: r156720

init.c (read_original_filename): Don't call read_original_directory if…
init.c (read_original_filename): Don't call read_original_directory if _cpp_handle_directive returns 0. * init.c (read_original_filename): Don't call read_original_directory if _cpp_handle_directive returns 0. From-SVN: r156720
709d7160 · Jakub Jelinek · Jakub Jelinek · a79ff094 · 709d7160 · 709d7160
Commit 709d7160 authored Feb 11, 2010 by Jakub Jelinek Committed by Jakub Jelinek Feb 11, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

libcpp/ChangeLog
+5 -0

libcpp/init.c
+3 -3

No files found.
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
+2010-02-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* init.c (read_original_filename): Don't call read_original_directory
+	if _cpp_handle_directive returns 0.
+
 2010-01-01  Joseph Myers  <joseph@codesourcery.com>

 	PR preprocessor/41947

--- a/libcpp/init.c
+++ b/libcpp/init.c
 /* CPP Library.
   Copyright (C) 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008,
-   2009 Free Software Foundation, Inc.
+   2009, 2010 Free Software Foundation, Inc.
   Contributed by Per Bothner, 1994-95.
   Based on CCCP program by Paul Rubin, June 1986
   Adapted to ANSI C, Richard Stallman, Jan 1987
@@ -595,9 +595,9 @@ read_original_filename (cpp_reader *pfile)
      pfile->state.in_directive = 0;

      /* If it's a #line directive, handle it.  */
-      if (token1->type == CPP_NUMBER)
+      if (token1->type == CPP_NUMBER
+	  && _cpp_handle_directive (pfile, token->flags & PREV_WHITE))
 	{
-	  _cpp_handle_directive (pfile, token->flags & PREV_WHITE);
 	  read_original_directory (pfile);
 	  return;
 	}