summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--include/network.h8
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f6f890..8d95e48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,7 @@ o remove prefetch in slist.h since it confuses gcc
o fix illegal use of return in the yacc code, use break instead
o fix wrong invocations after prototype cleanup
o set the return type of the parse functions to "void"
+o use the comma operator instead of curly braces
version 0.9.5 (2007/07/29)
------------------------------
diff --git a/include/network.h b/include/network.h
index f8fdd0d..e92f6c3 100644
--- a/include/network.h
+++ b/include/network.h
@@ -152,10 +152,10 @@ struct netattr {
(void *)(((char *)x) + sizeof(struct netattr))
#define NTA_NEXT(x, len) \
-({ \
- len -= NTA_ALIGN(NTA_LENGTH(x->nta_len)); \
- (struct netattr *)(((char *)x) + NTA_ALIGN(NTA_LENGTH(x->nta_len))); \
-})
+( \
+ len -= NTA_ALIGN(NTA_LENGTH(x->nta_len)), \
+ (struct netattr *)(((char *)x) + NTA_ALIGN(NTA_LENGTH(x->nta_len))) \
+)
#define NTA_ALIGNTO 4
#define NTA_ALIGN(len) (((len) + NTA_ALIGNTO - 1) & ~(NTA_ALIGNTO - 1))