[vinagre] Correct include order to fix Win32 build
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vinagre] Correct include order to fix Win32 build
- Date: Mon, 4 Jul 2011 21:26:20 +0000 (UTC)
commit 80fc9fce799665a14557d119a8c3cb4f2ea907f2
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date: Sat Jul 2 17:32:39 2011 +0200
Correct include order to fix Win32 build
Signed-off-by: David King <amigadave amigadave com>
plugins/spice/vinagre-spice-tunnel.c | 3 ++-
vinagre/vinagre-ssh.c | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/plugins/spice/vinagre-spice-tunnel.c b/plugins/spice/vinagre-spice-tunnel.c
index baec7f0..8da71df 100644
--- a/plugins/spice/vinagre-spice-tunnel.c
+++ b/plugins/spice/vinagre-spice-tunnel.c
@@ -20,6 +20,8 @@
*/
#include <config.h>
+#include <vinagre/vinagre-ssh.h>
+
#ifdef G_OS_WIN32
#undef DATADIR
#include <winsock2.h>
@@ -32,7 +34,6 @@
#include <stdlib.h>
#include <glib/gi18n.h>
-#include <vinagre/vinagre-ssh.h>
#include "vinagre-spice-tunnel.h"
#define TUNNEL_PORT_OFFSET 5500
diff --git a/vinagre/vinagre-ssh.c b/vinagre/vinagre-ssh.c
index ae241e6..24711ea 100644
--- a/vinagre/vinagre-ssh.c
+++ b/vinagre/vinagre-ssh.c
@@ -20,6 +20,10 @@
*/
#include <config.h>
+
+#include "vinagre-ssh.h"
+#include "pty_open.h"
+
#ifdef G_OS_WIN32
#undef DATADIR
#include <winsock2.h>
@@ -36,9 +40,6 @@
#include <glib/gi18n.h>
#include <gnome-keyring.h>
-#include "vinagre-ssh.h"
-#include "pty_open.h"
-
#define SSH_READ_TIMEOUT 40 /* seconds */
#ifdef HAVE_GRANTPT
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]