Avoid usage of typeof and replace __builtin_offsetof with offsetof

1bbef4be · Tatsuhiro Tsujikawa · 918f8cca · 1bbef4be
Commit 1bbef4be authored Sep 10, 2015 by Tatsuhiro Tsujikawa
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

lib/nghttp2_helper.h lib/nghttp2_helper.h +2 -5

No files found.
--- a/lib/nghttp2_helper.h
+++ b/lib/nghttp2_helper.h
@@ -40,11 +40,8 @@

 #define lstreq(A, B, N) ((sizeof((A)) - 1) == (N) && memcmp((A), (B), (N)) == 0)

-#define nghttp2_struct_of(ptr, type, member)                                    \
-  ({                                                                            \
-    const typeof(((type *)0)->member) *nghttp2__mptr = (ptr);                   \
-    (type *)(void *)((char *)nghttp2__mptr - __builtin_offsetof(type, member)); \
-  })
+#define nghttp2_struct_of(ptr, type, member)                                   \
+  ((type *)(void *)((char *)(ptr) - offsetof(type, member)))

 /*
 * Copies 2 byte unsigned integer |n| in host byte order to |buf| in