diff options
| author | Andrew Higginson <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
|---|---|---|
| committer | Andrew <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
| commit | 80960b623a99aae1402ab651b2974ef544ed3b03 (patch) | |
| tree | ba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/io/sys.cpp | |
| parent | try to fix bug (diff) | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip | |
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/io/sys.cpp')
| -rw-r--r-- | src/io/sys.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/io/sys.cpp b/src/io/sys.cpp index e7fdfaa2d..5f19ee5db 100644 --- a/src/io/sys.cpp +++ b/src/io/sys.cpp @@ -17,23 +17,13 @@ #include <glib.h> #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 <glibmm/ustring.h> -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #include "preferences.h" #include "sys.h" -#ifdef WIN32 -// For now to get at is_os_wide(). -#include "extension/internal/win32.h" -using Inkscape::Extension::Internal::PrintWin32; -#endif // WIN32 - //#define INK_DUMP_FILENAME_CONV 1 #undef INK_DUMP_FILENAME_CONV |
