summaryrefslogtreecommitdiffstats
path: root/src/io/sys.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2011-06-19 10:00:24 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2011-06-19 10:00:24 +0000
commit06dfaa02d7a80bcdff717d579a48f81643f53f31 (patch)
tree49b8e67ad9051f1507b0959cac986383ab4001e2 /src/io/sys.cpp
parentFix rendering of control points (diff)
parentfix bug 796451: Measure tools should support rotation constraint (diff)
downloadinkscape-06dfaa02d7a80bcdff717d579a48f81643f53f31.tar.gz
inkscape-06dfaa02d7a80bcdff717d579a48f81643f53f31.zip
Merge from trunk
(bzr r9508.1.89)
Diffstat (limited to 'src/io/sys.cpp')
-rw-r--r--src/io/sys.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/io/sys.cpp b/src/io/sys.cpp
index 198be94e6..437a9d18c 100644
--- a/src/io/sys.cpp
+++ b/src/io/sys.cpp
@@ -19,11 +19,9 @@
#include <glib/gstdio.h>
#include <glib/gutils.h>
#include <glibmm/fileutils.h>
-#if GLIB_CHECK_VERSION(2,6,0)
- #include <glib/gstdio.h>
-#endif
+#include <glib/gstdio.h>
#include <glibmm/ustring.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
#include "preferences.h"
#include "sys.h"