[PATCH 1/3] mdadm.h: Undefine dprintf before redefining

[PATCH 1/3] mdadm.h: Undefine dprintf before redefining

[maxin.john]

From: Khem Raj <raj.khem@gmail.com>

dprintf is also defined in libc see
usr/include/bits/stdio2.h, this comes into
play especially when fortify sources is enabled
and compilers like clang reports the override

In file included from policy.c:25:
./mdadm.h:1562:9: error: 'dprintf' macro redefined [-Werror,-Wmacro-redefined]
        ^
/mnt/oe/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/bits/stdio2.h:145:12: note: previous definition is here

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 mdadm.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mdadm.h b/mdadm.h
index ee9b837..55c707a 100644
--- a/mdadm.h
+++ b/mdadm.h
@@ -1647,11 +1647,13 @@ static inline char *to_subarray(struct mdstat_ent *ent, char *container)
 }
 
 #ifdef DEBUG
+#undef dprintf
 #define dprintf(fmt, arg...) \
 	fprintf(stderr, "%s: %s: "fmt, Name, __func__, ##arg)
 #define dprintf_cont(fmt, arg...) \
 	fprintf(stderr, fmt, ##arg)
 #else
+#undef dprintf
 #define dprintf(fmt, arg...) \
         ({ if (0) fprintf(stderr, "%s: %s: " fmt, Name, __func__, ##arg); 0; })
 #define dprintf_cont(fmt, arg...) \
-- 
2.4.0

[PATCH 2/3] mdadm.h: include sys/sysmacros.h for major/minor defintions

[maxin.john]

From: Khem Raj <raj.khem@gmail.com>

glibc 2.25 is warning about it if applications depend on
sys/types.h for these macros, it expects to be included
from <sys/sysmacros.h>

Fixes
| Grow.c:3534:13: error: In the GNU C Library, "minor" is defined
|  by <sys/sysmacros.h>. For historical compatibility, it is
|  currently defined by <sys/types.h> as well, but we plan to
|  remove this soon. To use "minor", include <sys/sysmacros.h>
|  directly. If you did not intend to use a system-defined macro
|  "minor", you should undefine it after including <sys/types.h>. [-Werror]
| Query.c: In function 'Query':
| Query.c:105:13: error: In the GNU C Library, "makedev" is defined
|  by <sys/sysmacros.h>. For historical compatibility, it is
|  currently defined by <sys/types.h> as well, but we plan to
|  remove this soon. To use "makedev", include <sys/sysmacros.h>
|  directly. If you did not intend to use a system-defined macro
|  "makedev", you should undefine it after including <sys/types.h>. [-Werror]
|           makedev((unsigned)disc.major,(unsigned)disc.minor) == stb.st_rdev)
|              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 mdadm.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mdadm.h b/mdadm.h
index 55c707a..dce5f82 100644
--- a/mdadm.h
+++ b/mdadm.h
@@ -34,6 +34,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
 #endif
 
 #include	<sys/types.h>
+#include	<sys/sysmacros.h>
 #include	<sys/stat.h>
 #include	<stdint.h>
 #include	<stdlib.h>
-- 
2.4.0

[PATCH 3/3] monitor.c: Fix build in x32 ABI

[maxin.john]

From: Aníbal Limón <anibal.limon@linux.intel.com>

When we try to print time_t values as a long int it causes an error
because time_t data type in x32 ABI is long long int.

Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 monitor.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/monitor.c b/monitor.c
index 81537ed..7cd9b8a 100644
--- a/monitor.c
+++ b/monitor.c
@@ -447,7 +447,11 @@ static int read_and_act(struct active_array *a, fd_set *fds)
 	}
 
 	gettimeofday(&tv, NULL);
+#if defined(__x86_64__) && defined(__ILP32__)
+	dprintf("(%d): %lld.%06lld state:%s prev:%s action:%s prev: %s start:%llu\n",
+#else
 	dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
+#endif
 		a->info.container_member,
 		tv.tv_sec, tv.tv_usec,
 		array_states[a->curr_state],
-- 
2.4.0