Get rid of ids copy of gcc-attributes.h so it uses the right one

Author: stevegrubb

audisp/plugins/ids/Makefile.am

@@ -29,7 +29,7 @@ prog_conf = ids.conf
 plugin_confdir=$(prog_confdir)/plugins.d
 plugin_conf = audisp-ids.conf
 sbin_PROGRAMS = audisp-ids
-noinst_HEADERS = account.h avl.h ids_config.h gcc-attributes.h ids.h \
+noinst_HEADERS = account.h avl.h ids_config.h ids.h \
 	model_bad_event.h model_behavior.h nvpair.h origin.h \
 	reactions.h session.h timer-services.h
 

audisp/plugins/ids/avl.h

@@ -39,14 +39,14 @@ typedef struct avl_iterator {
  * a is linked directly to the tree, so it has to
  * be properly allocated by the caller.
  */
-avl_t *avl_insert(avl_tree_t *t, avl_t *a) NEVERNULL WARNUNUSED;
+avl_t *avl_insert(avl_tree_t *t, avl_t *a) __wur;
 
 /* Remove an element a from the AVL tree t
  * returns a pointer to the removed element
  * or NULL if an element equal to a is not found
  * (equal as returned by t->compar())
  */
-avl_t *avl_remove(avl_tree_t *t, avl_t *a) WARNUNUSED;
+avl_t *avl_remove(avl_tree_t *t, avl_t *a) __wur;
 
 /* Find the element into the tree that equal to a
  * (equal as returned by t->compar())