From fd4bf963784c36e355f58ab445aec3ff3ba8b858 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Fri, 20 Jun 2014 15:08:01 +0200
Subject: [PATCH] ctdb:includes: add #ifdef guard for ZERO_STRUCT

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---
 ctdb/include/internal/includes.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ctdb/include/internal/includes.h b/ctdb/include/internal/includes.h
index 639d75e1871..05f24889027 100644
--- a/ctdb/include/internal/includes.h
+++ b/ctdb/include/internal/includes.h
@@ -46,7 +46,9 @@ enum debug_level {
 #define _PURE_
 #endif /* _PURE_ */
 
+#ifndef ZERO_STRUCT
 #define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
+#endif /* ZERO_STRUCT */
 
 #ifndef discard_const
 #define discard_const(ptr) ((void *)((intptr_t)(ptr)))
-- 
2.11.4.GIT