2000-04-04 Philippe De Muyter <phdm@macqel.be>

	* cpphash.c (_cpp_free_definition): Test argnames, not nargs >= 0,
	before freeing argnames.
	* cpplib.c (do_ifndef): Cast return value of xstrdup.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@32924 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8c113d2..7dbd95e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-04  Philippe De Muyter  <phdm@macqel.be>
+
+       * cpphash.c (_cpp_free_definition): Test argnames, not nargs >= 0,
+       before freeing argnames.
+       * cpplib.c (do_ifndef): Cast return value of xstrdup.
+
 2000-04-05  Michael Meissner  <meissner@redhat.com>
 
        * config/rs6000/rs6000.c (print_operand): Patch from Jonathan

diff --git a/gcc/cpphash.c b/gcc/cpphash.c
index 0eadc9a..ac8fbcb 100644 (file)
--- a/gcc/cpphash.c
+++ b/gcc/cpphash.c
@@ -256,7 +256,7 @@ _cpp_free_definition (d)
       nextap = ap->next;
       free (ap);
     }
-  if (d->nargs >= 0)
+  if (d->argnames)
     free (d->argnames);
   free (d);
 }

diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index f097f72..b113853 100644 (file)
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -1309,7 +1309,7 @@ do_ifndef (pfile)
   skip = parse_ifdef (pfile, dtable[T_IFNDEF].name);
 
   if (start_of_file && !skip)
-    control_macro = xstrdup (CPP_PWRITTEN (pfile));
+    control_macro = (U_CHAR *) xstrdup (CPP_PWRITTEN (pfile));
 
   conditional_skip (pfile, skip, T_IFNDEF, control_macro);
   return 0;