From d5253b25191cc31eb45205f19d17fa7aad616a63 Mon Sep 17 00:00:00 2001 From: borutr Date: Sun, 28 Aug 2011 19:03:41 +0000 Subject: * support\cpp\libiberty\concat.c, support\cpp\libiberty\filenames.h, support\cpp\libiberty\hashtab.c, support\cpp\libiberty\vasprintf.c, support\cpp\libiberty\xmemdup.c, support\cpp\libiberty\hashtab.h, support\cpp\libiberty\splay-tree.c, support\cpp\libiberty\lbasename.c, support\cpp\libiberty\splay-tree.h, support\cpp\libiberty\getpwd.c, support\cpp\libiberty\fopen_unlocked.c, support\cpp\libcpp\directives.c, support\cpp\libcpp\macro.c, support\cpp\libcpp\files.c, support\cpp\libcpp\include\cpplib.h, support\cpp\libcpp\include\symtab.h, support\cpp\libcpp\include\line-map.h, support\cpp\libcpp\init.c, support\cpp\libcpp\errors.c, support\cpp\libcpp\expr.c, support\cpp\libcpp\internal.h, support\cpp\libcpp\lex.c, support\cpp\libcpp\system.h, support\cpp\libcpp\charset.c: SDCPP synchronized with GCC CPP release version 4.6.1 git-svn-id: https://svn.code.sourceforge.net/p/sdcc/code/trunk/sdcc@6773 4a8a32a2-be11-0410-ad9d-d568d2c75423 --- support/cpp/libcpp/files.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'support/cpp/libcpp/files.c') diff --git a/support/cpp/libcpp/files.c b/support/cpp/libcpp/files.c index db88c3fb7..7c8e01cf2 100644 --- a/support/cpp/libcpp/files.c +++ b/support/cpp/libcpp/files.c @@ -1,6 +1,6 @@ /* Part of CPP library. File handling. Copyright (C) 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Written by Per Bothner, 1994. Based on CCCP program by Paul Rubin, June 1986 @@ -1272,7 +1272,8 @@ report_missing_guard (void **slot, void *d) _cpp_file *file = entry->u.file; /* We don't want MI guard advice for the main file. */ - if (file->cmacro == NULL && file->stack_count == 1 && !file->main_file) + if (!file->once_only && file->cmacro == NULL + && file->stack_count == 1 && !file->main_file) { if (data->paths == NULL) { -- cgit v1.2.3