git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
util.h
diff --git
a/lib/util.h
b/lib/util.h
index
2159594
..
911ad32
100644
(file)
--- a/
lib/util.h
+++ b/
lib/util.h
@@
-189,9
+189,9
@@
is_pow2(uintmax_t x)
* that that OBJECT points to, assigns the address of the outer object to
* OBJECT, which must be an lvalue.
*
* that that OBJECT points to, assigns the address of the outer object to
* OBJECT, which must be an lvalue.
*
- * Evaluates to
1
. */
+ * Evaluates to
(void) 0 as the result is not to be used
. */
#define ASSIGN_CONTAINER(OBJECT, POINTER, MEMBER) \
#define ASSIGN_CONTAINER(OBJECT, POINTER, MEMBER) \
- ((OBJECT) = OBJECT_CONTAINING(POINTER, OBJECT, MEMBER),
1
)
+ ((OBJECT) = OBJECT_CONTAINING(POINTER, OBJECT, MEMBER),
(void) 0
)
#ifdef __cplusplus
extern "C" {
#ifdef __cplusplus
extern "C" {