mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-22 21:58:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix order of includes to prevent issues with gettext.

Browse source
This commit is contained in:
Ghislain MARY 2017-09-20 15:03:02 +02:00
parent a5a3b2ad26
commit bcd6a682f2
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/conference/local-conference-event-handler.cpp
View file

@ -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;

4
src/conference/remote-conference-event-handler.cpp
View file

@ -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;