Commit bcd6a682 authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Fix order of includes to prevent issues with gettext.

parent a5a3b2ad
......@@ -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;
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment