From deb72c5aaf4562057c3a0e308cfbd8b3fdbd4c06 Mon Sep 17 00:00:00 2001
From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 2 Jul 2015 15:48:16 -0700
Subject: [PATCH] ceph_json: make sure header doesn't clobber _ASSERT_H

_ASSERT_H is needed for dout() compilation

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---
 src/common/ceph_json.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/common/ceph_json.h b/src/common/ceph_json.h
index e69055b1611ba..94d690471117d 100644
--- a/src/common/ceph_json.h
+++ b/src/common/ceph_json.h
@@ -5,7 +5,18 @@
 #include <include/types.h>
 #include <list>
 
+#ifdef _ASSERT_H
+#define NEED_ASSERT_H
+#pragma push_macro("_ASSERT_H")
+#endif
+
 #include "json_spirit/json_spirit.h"
+#undef _ASSERT_H
+
+#ifdef NEED_ASSERT_H
+#pragma pop_macro("_ASSERT_H")
+#endif
+
 #include "Formatter.h"
 
 
-- 
2.39.5