Changeset ee820ff in mainline for uspace/lib/c/include/macros.h

Timestamp:

2018-02-22T19:39:53Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

0539c14

Parents:

5fe3f954 (diff), df368491 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit 'df368491aa1c0ce3024a51c602b7d0cbe4bd84d3'

File:

• uspace/lib/c/include/macros.h (modified) (1 diff)

uspace/lib/c/include/macros.h

@@ -55 +55 @@
             | ((((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
+        ((type *) (((void *) (ptr_member)) - \
+            ((void *) &(((type *) 0)->member_identif))))
 
+#define _paddname(line)     PADD_ ## line ## __
+#define _padd(width, line)  uint ## width ## _t _paddname(line)
+
+#define PADD32  _padd(32, __LINE__)
+#define PADD16  _padd(16, __LINE__)
+#define PADD8   _padd(8, __LINE__)
 
 #endif
 
-#define _paddname(line) PADD_ ## line ## __
-#define _padd(width, line) uint ## width ## _t _paddname(line)
-#define PADD32 _padd(32, __LINE__)
-#define PADD16 _padd(16, __LINE__)
-#define PADD8 _padd(8, __LINE__)
-
 /** @}
  */