Let matrix_foreach(), matrix_foreach_in_col() and matrix_foreach_in_row() declare...

[libfirm] / ir / ir / irlinkednodemap.h

diff --git a/ir/ir/irlinkednodemap.h b/ir/ir/irlinkednodemap.h
index 49f74ab..f58c7f1 100644 (file)
--- a/ir/ir/irlinkednodemap.h
+++ b/ir/ir/irlinkednodemap.h
@@ -21,13 +21,10 @@
  * @file
  * @author    Michael Beck
  * @brief     A linked nodemap.
- * @version   $Id$
  */
 #ifndef _FIRM_IRLINKEDNODEMAP_H_
 #define _FIRM_IRLINKEDNODEMAP_H_
 
-#include "firm_config.h"
-
 #include "firm_types.h"
 #include "xmalloc.h"
 #include "list.h"
@@ -49,19 +46,15 @@ typedef struct ir_lnk_nodemap_entry_t {
 } ir_lnk_nodemap_entry_t;
 
 #define HashSet          ir_lnk_nodemap_t
-#define HashSetIterator  ir_lnk_nodemap_iterator_t
 #define ValueType        ir_lnk_nodemap_entry_t
 #define ADDITIONAL_DATA  list_head elem_list; list_head all_iters;
 #define DO_REHASH
-#define NO_ITERATOR
 
 #include "hashset.h"
 
-#undef NO_ITERATOR
 #undef DO_REHASH
 #undef ADDITIONAL_DATA
 #undef ValueType
-#undef HashSetIterator
 #undef HashSet
 
 typedef struct ir_lnk_nodemap_t ir_lnk_nodemap_t;
@@ -99,7 +92,7 @@ void ir_lnk_nodemap_destroy(ir_lnk_nodemap_t *nodemap);
  * @param expected_elements   Number of elements expected in the nodemap (roughly)
  * @return The initialized nodemap
  */
-static INLINE ir_lnk_nodemap_t *ir_lnk_nodemap_new(size_t expected_elements) {
+static inline ir_lnk_nodemap_t *ir_lnk_nodemap_new(size_t expected_elements) {
        ir_lnk_nodemap_t *res = XMALLOC(ir_lnk_nodemap_t);
        ir_lnk_nodemap_init_size(res, expected_elements);
        return res;
@@ -108,7 +101,7 @@ static INLINE ir_lnk_nodemap_t *ir_lnk_nodemap_new(size_t expected_elements) {
 /**
  * Destroys a linked nodemap and frees the memory of the nodemap itself.
  */
-static INLINE void ir_lnk_nodemap_del(ir_lnk_nodemap_t *nodemap) {
+static inline void ir_lnk_nodemap_del(ir_lnk_nodemap_t *nodemap) {
        ir_lnk_nodemap_destroy(nodemap);
        xfree(nodemap);
 }