From ca47c89e553c8f1824eefce0273917bd85e04c52 Mon Sep 17 00:00:00 2001 From: Douglas B Rupp Date: Wed, 21 Nov 2001 16:55:36 -0500 Subject: [PATCH] cppinit.c (INO_T_COPY): Define. * cppinit.c (INO_T_COPY): Define. (INO_T_EQ): Uppercase parameters. (append_include_chain): Use INO_T_COPY. From-SVN: r47244 --- gcc/ChangeLog | 6 ++++++ gcc/cppinit.c | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5021b405998..351c21e0e69 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +Wed Nov 21 16:44:01 2001 Douglas B. Rupp + + * cppinit.c (INO_T_COPY): Define. + (INO_T_EQ): Uppercase parameters. + (append_include_chain): Use INO_T_COPY. + 2001-11-21 Richard Sandiford * cfg.c: Fix typos and formatting in the introductory comment. diff --git a/gcc/cppinit.c b/gcc/cppinit.c index ba9f1222487..bc8886c1126 100644 --- a/gcc/cppinit.c +++ b/gcc/cppinit.c @@ -40,13 +40,15 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ Cygwin's emulation can generate non-unique inodes, so don't use it. VMS has non-numeric inodes. */ #ifdef VMS -# define INO_T_EQ(a, b) (!memcmp (&(a), &(b), sizeof (a))) +# define INO_T_EQ(A, B) (!memcmp (&(A), &(B), sizeof (A))) +# define INO_T_COPY(DEST, SRC) memcpy(&(DEST), &(SRC), sizeof (SRC)) #else # if (defined _WIN32 && ! defined (_UWIN)) || defined __MSDOS__ -# define INO_T_EQ(a, b) 0 +# define INO_T_EQ(A, B) 0 # else -# define INO_T_EQ(a, b) ((a) == (b)) +# define INO_T_EQ(A, B) ((A) == (B)) # endif +# define INO_T_COPY(DEST, SRC) (DEST) = (SRC) #endif /* Internal structures and prototypes. */ @@ -244,7 +246,7 @@ append_include_chain (pfile, dir, path, cxx_aware) new = (struct search_path *) xmalloc (sizeof (struct search_path)); new->name = dir; new->len = len; - new->ino = st.st_ino; + INO_T_COPY (new->ino, st.st_ino); new->dev = st.st_dev; /* Both systm and after include file lists should be treated as system include files since these two lists are really just a concatenation