diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-03-22 18:51:33 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-03-22 18:51:33 +0000 |
| commit | a7b5bae21b2d5250b5b452f8f882a321485a88e9 (patch) | |
| tree | ee7e4cf46c57c610b6f291731031c3039b3fc5ce /libcpp | |
| parent | da8d5dc7b0e8bb3b59c384fa066e92b6081a749d (diff) | |
| download | gcc-a7b5bae21b2d5250b5b452f8f882a321485a88e9.tar.gz | |
2009-03-22 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r144999
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@145000 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 4 | ||||
| -rw-r--r-- | libcpp/include/cpplib.h | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index d86092b677c..acffe8e39e0 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,7 @@ +2009-03-18 Jakub Jelinek <jakub@redhat.com> + + * include/cpplib.h (struct cpp_dir): Reorder fields for 64-bit hosts. + 2009-02-21 Joseph Myers <joseph@codesourcery.com> * lex.c (lex_string): Return a CPP_LESS token for missing '>' in a diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index 5720c6fc8ea..e2c505c3869 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -1,6 +1,6 @@ /* Definitions for CPP library. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2007, 2008 + 2004, 2005, 2007, 2008, 2009 Free Software Foundation, Inc. Written by Per Bothner, 1994-95. @@ -516,14 +516,17 @@ struct cpp_dir char *name; unsigned int len; - /* The canonicalized NAME as determined by lrealpath. This field - is only used by hosts that lack reliable inode numbers. */ - char *canonical_name; - /* One if a system header, two if a system header that has extern "C" guards for C++. */ unsigned char sysp; + /* Is this a user-supplied directory? */ + bool user_supplied_p; + + /* The canonicalized NAME as determined by lrealpath. This field + is only used by hosts that lack reliable inode numbers. */ + char *canonical_name; + /* Mapping of file names for this directory for MS-DOS and related platforms. A NULL-terminated array of (from, to) pairs. */ const char **name_map; @@ -538,9 +541,6 @@ struct cpp_dir directories in the search path. */ ino_t ino; dev_t dev; - - /* Is this a user-supplied directory? */ - bool user_supplied_p; }; /* Name under which this program was invoked. */ |