[committed] Use VAR_OR_FUNCTION_DECL_P

[Marek Polacek]

As Uros pointed out.

Bootstrapped/regtested on x86_64-linux, applying to trunk.

2015-06-26  Marek Polacek  <pola...@redhat.com>

        * c-common.c (handle_unused_attribute): Use VAR_OR_FUNCTION_DECL_P.

diff --git gcc/c-family/c-common.c gcc/c-family/c-common.c
index 73d0c7f..b11a756 100644
--- gcc/c-family/c-common.c
+++ gcc/c-family/c-common.c
@@ -7376,8 +7376,7 @@ handle_unused_attribute (tree *node, tree name, tree 
ARG_UNUSED (args),
       tree decl = *node;
 
       if (TREE_CODE (decl) == PARM_DECL
-         || VAR_P (decl)
-         || TREE_CODE (decl) == FUNCTION_DECL
+         || VAR_OR_FUNCTION_DECL_P (decl)
          || TREE_CODE (decl) == LABEL_DECL
          || TREE_CODE (decl) == TYPE_DECL)
        {

        Marek