netlink_sock_diag: print inet_diag_sockid.idiag_if as an interface index

[strace] / gcc_compat.h

diff --git a/gcc_compat.h b/gcc_compat.h
index eb5242f77e5ee879d7b92e1f1b54004245a9a191..956aff1767c48cf8dc4ab42f220499bb0bed8475 100644 (file)
--- a/gcc_compat.h
+++ b/gcc_compat.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,9 +55,9 @@
 
 #if GNUC_PREREQ(3, 0)
 # define SAME_TYPE(x, y)       __builtin_types_compatible_p(typeof(x), typeof(y))
-# define BUILD_BUG_ON_ZERO(expr) (sizeof(int[-1 + 2 * !!(expr)]) * 0)
+# define FAIL_BUILD_ON_ZERO(expr) (sizeof(int[-1 + 2 * !!(expr)]) * 0)
 /* &(a)[0] is a pointer and not an array, shouldn't be treated as the same */
-# define MUST_BE_ARRAY(a) BUILD_BUG_ON_ZERO(!SAME_TYPE((a), &(a)[0]))
+# define MUST_BE_ARRAY(a) FAIL_BUILD_ON_ZERO(!SAME_TYPE((a), &(a)[0]))
 #else
 # define SAME_TYPE(x, y)       0
 # define MUST_BE_ARRAY(a)      0
@@ -83,7 +84,7 @@
 #if GNUC_PREREQ(4, 1)
 # define ALIGNOF(t_)   __alignof__(t_)
 #else
-# define ALIGNOF(t_)   (sizeof(struct {char x_; t_ y_;}) - sizeof(t_))
+# define ALIGNOF(t_)   (sizeof(struct { char x_; t_ y_; }) - sizeof(t_))
 #endif
 
 #if GNUC_PREREQ(4, 3)