summaryrefslogtreecommitdiff
path: root/gcc/cppfiles.c
diff options
context:
space:
mode:
authorzack <zack@138bc75d-0d04-0410-961f-82ee72b054a4>2000-04-30 17:11:25 +0000
committerzack <zack@138bc75d-0d04-0410-961f-82ee72b054a4>2000-04-30 17:11:25 +0000
commit14feeebae23fbc4a1c7b54d10e34fe8473029e6f (patch)
treeb2cbd4667ef9d395099460fd9be30ff0ec56ed29 /gcc/cppfiles.c
parent490d830ff8b0eddafa9b2655a06eccdc5d91d5ab (diff)
downloadgcc-14feeebae23fbc4a1c7b54d10e34fe8473029e6f.tar.gz
* cppfiles.c (redundant_include_p): Provide length of token to
cpp_defined. * cpphash.c (_cpp_make_hashnode, _cpp_lookup_slot): Hash values are unsigned int. (_cpp_lookup, _cpp_lookup_slot): Do not calculate the length. (_cpp_lookup_slot): Do not calculate the hash, either. * cpphash.h: Update prototypes. * cpplib.c (do_define, do_undef, do_pragma_poison, do_assert): Hashes are unsigned int. Calculate hash here, pass by value to _cpp_lookup_slot. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33551 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cppfiles.c')
-rw-r--r--gcc/cppfiles.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c
index ddf4439ce6d..d92b84d97e0 100644
--- a/gcc/cppfiles.c
+++ b/gcc/cppfiles.c
@@ -132,7 +132,8 @@ redundant_include_p (pfile, ihash, ilist)
included again if the string is the name of a defined macro. */
return (i->control_macro
&& (i->control_macro[0] == '\0'
- || cpp_defined (pfile, i->control_macro, -1)))
+ || cpp_defined (pfile, i->control_macro,
+ strlen (i->control_macro))))
? (IHASH *)-1 : i;
return 0;