From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 27 Mar 2013 09:45:06 +0000 (+0100)
Subject: fix compilation issue
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=4cffe873661443f2a393df800aa6718341e6baf7

fix compilation issue
---

diff --git a/gtk/main.c b/gtk/main.c
index ae6c8a01..b188782a 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -69,9 +69,10 @@ void linphone_gtk_status_icon_set_blinking(gboolean val);
 void _linphone_gtk_enable_video(gboolean val);
 
 
-
+#ifndef HAVE_GTK_OSX
 static gint main_window_x=0;
 static gint main_window_y=0;
+#endif
 static gboolean verbose=0;
 static gboolean auto_answer = 0;
 static gchar * addr_to_call = NULL;
diff --git a/mediastreamer2 b/mediastreamer2
index 4b8d2b65..5a7ae95e 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 4b8d2b655acc8a329464e7806653dceb04ade445
+Subproject commit 5a7ae95e0dbe5f485086d4635a655c893c9c44b1