From 4d6b99a7383871c960e3e32a2d022489149889a9 Mon Sep 17 00:00:00 2001
From: Olivier SOLDANO <olivier.soldano@savoirfairelinux.com>
Date: Wed, 25 Oct 2017 17:19:44 -0400
Subject: [PATCH] add macro redefinitions wrap because of windows.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
the usual suspect has stroke again! we use the pragmas
to undefine locally the leaking macros of windows.h
Change-Id: I838db4fb994c8cf05dd7830b684e6840745dffe4
Reviewed-by: Anthony Léonard <anthony.leonard@savoirfairelinux.com>
---
src/api/account.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/api/account.h b/src/api/account.h
index a9010510..e36a2d74 100644
--- a/src/api/account.h
+++ b/src/api/account.h
@@ -45,6 +45,9 @@ enum class Type {
SIP
};
+#pragma push_macro("REGISTERED")
+#undef REGISTERED
+
enum class Status {
INVALID,
INITIALIZING,
@@ -68,6 +71,8 @@ to_status(const std::string& type)
return account::Status::INVALID;
}
+#pragma pop_macro("REGISTERED")
+
struct Info
{
std::string id;
--
GitLab