Changeset 5b382774 in mainline

Timestamp:

2012-07-24T14:19:58Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4a6da62

Parents:

2696a76

Message:

Added member_to_inst() to macros.h in uspace and kernel.

Files:

• kernel/generic/include/macros.h (modified) (1 diff)
• uspace/lib/c/include/adt/list.h (modified) (1 diff)
• uspace/lib/c/include/macros.h (modified) (1 diff)
• uspace/lib/nic/src/nic_addr_db.c (modified) (2 diffs)

kernel/generic/include/macros.h

@@ -131 +131 @@
         })
 
+
+#ifndef member_to_inst
+#define member_to_inst(ptr_member, type, member_identif) \
+        ((type*) (((void*)(ptr_member)) - ((void*)&(((type*)0)->member_identif))))
+#endif
+
+
 #endif
 

uspace/lib/c/include/adt/list.h

@@ -102 +102 @@
                 iterator = next_iter, next_iter = iterator->next)
 
-#ifndef member_to_inst
-#define member_to_inst(ptr_member, type, member_identif) \
-        ((type*) (((void*)(ptr_member)) - ((void*)&(((type*)0)->member_identif))))
-#endif
-
-
 #define assert_link_not_used(link) \
         assert(((link)->prev == NULL) && ((link)->next == NULL))

uspace/lib/c/include/macros.h

@@ -52 +52 @@
             | ((((uint64_t) (up)) & 0xffffffff) << 32))
 
+#ifndef member_to_inst
+#define member_to_inst(ptr_member, type, member_identif) \
+        ((type*) (((void*)(ptr_member)) - ((void*)&(((type*)0)->member_identif))))
+#endif
+
+
 #endif
 

uspace/lib/nic/src/nic_addr_db.c

@@ -35 +35 @@
  * @brief Generic hash-set based database of addresses
  */
+#include "nic_addr_db.h"
 #include <assert.h>
 #include <stdlib.h>
@@ -40 +41 @@
 #include <errno.h>
 #include <mem.h>
-
-#include "nic_addr_db.h"
-#include "adt/hash_table.h"
-//#include "string.h"
+#include <adt/hash_table.h>
+#include <macros.h>
+