From bcd6a682f26c885618bf498ecea3d68aa6570312 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 20 Sep 2017 15:03:02 +0200 Subject: [PATCH] Fix order of includes to prevent issues with gettext. --- src/conference/local-conference-event-handler.cpp | 5 +++-- src/conference/remote-conference-event-handler.cpp | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/conference/local-conference-event-handler.cpp b/src/conference/local-conference-event-handler.cpp index bc84868a2..d06cf4d9a 100644 --- a/src/conference/local-conference-event-handler.cpp +++ b/src/conference/local-conference-event-handler.cpp @@ -21,8 +21,6 @@ #include "local-conference-event-handler.h" #include "object/object-p.h" -#include "private.h" - #if __clang__ || __GNUC__ >= 4 #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wsuggest-override" @@ -34,6 +32,9 @@ #pragma GCC diagnostic pop #endif +/* Needs to be included after xml/conference-info.h because of _() macro definition that breaks everything */ +#include "private.h" + // ============================================================================= using namespace std; diff --git a/src/conference/remote-conference-event-handler.cpp b/src/conference/remote-conference-event-handler.cpp index 433465bda..8e6099552 100644 --- a/src/conference/remote-conference-event-handler.cpp +++ b/src/conference/remote-conference-event-handler.cpp @@ -17,7 +17,6 @@ */ #include "remote-conference-event-handler.h" -#include "private.h" #include "object/object-p.h" #if __clang__ || __GNUC__ >= 4 @@ -31,6 +30,9 @@ #pragma GCC diagnostic pop #endif +/* Needs to be included after xml/conference-info.h because of _() macro definition that breaks everything */ +#include "private.h" + // ============================================================================= using namespace std;