[PATCH] fix some build breakage

[PATCH] fix some build breakage

[Nathan Sidwell]

[-- Attachment #1: Type: text/plain, Size: 226 bytes --]

Jeff alerted me to some build breakage on s390 and spu targets.  He's confirmed 
this patch unbreaks s390, so I expect spu is also good.  Committing to trunk.

Sorry for not deploying grep earlier.

nathan.
-- 
Nathan Sidwell

[-- Attachment #2: m.diff --]
[-- Type: text/x-patch, Size: 1062 bytes --]

2018-08-20  Nathan Sidwell  <nathan@acm.org>
	    Jeff Law <law@redhat.com>

	* config/s390/s390-c (s390_macro_to_expand): Use cpp_macro_p.
	* config/spu/spu-c.c (spu_macro_to_expand): Likewise.

Index: s390/s390-c.c
===================================================================
--- s390/s390-c.c	(revision 263673)
+++ s390/s390-c.c	(working copy)
@@ -233,7 +233,7 @@ s390_macro_to_expand (cpp_reader *pfile,
 
   rid_code = (enum rid)(ident->rid_code);
 
-  if (ident->type == NT_MACRO)
+  if (cpp_macro_p (ident))
     {
       /* Now actually fetch the tokens we "peeked" before and do a
 	 lookahead for the next.  */
Index: spu/spu-c.c
===================================================================
--- spu/spu-c.c	(revision 263673)
+++ spu/spu-c.c	(working copy)
@@ -64,7 +64,7 @@ spu_macro_to_expand (cpp_reader *pfile,
       if (ident)
 	{
 	  enum rid rid_code = (enum rid)(ident->rid_code);
-	  if (ident->type == NT_MACRO)
+	  if (cpp_macro_p (ident))
 	    {
 	      (void) cpp_get_token (pfile);
 	      tok = cpp_peek_token (pfile, 0);