From 8700fcbf2ed3b201d8ce58cf7f388799579cc9a4 Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Silva Date: Mon, 20 Aug 2012 16:16:25 -0300 Subject: ephy-embed-single.c: move unstable API defines to be the very first thing in the file It may happen that config.h or ephy-embed-single.h end up including soup.h, which would cause the soup-password-manager.h header file to be included without the defines. https://bugzilla.gnome.org/show_bug.cgi?id=682289 --- embed/ephy-embed-single.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'embed') diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c index 4e6feee1e..f1c778350 100644 --- a/embed/ephy-embed-single.c +++ b/embed/ephy-embed-single.c @@ -18,12 +18,15 @@ * */ -#include "config.h" -#include "ephy-embed-single.h" - +/* These defines need to go at the top because config.h or ephy-embed-single.h + * may include soup. + */ #define LIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY #define LIBSOUP_USE_UNSTABLE_REQUEST_API +#include "config.h" +#include "ephy-embed-single.h" + #include "ephy-about-handler.h" #include "ephy-debug.h" #include "ephy-embed-prefs.h" -- cgit v1.2.3