summaryrefslogtreecommitdiffstats
path: root/src/libdepixelize/kopftracer2011.cpp
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2015-04-27 23:38:31 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2015-04-27 23:38:31 +0000
commitba4dbfb351180e0fc4ad57be6e3534fa2ab5cf8c (patch)
tree8a089e291323cf75e99ea9b3813193b0394fa7f1 /src/libdepixelize/kopftracer2011.cpp
parentadd two files omitted in patch at revision 14062 (diff)
downloadinkscape-ba4dbfb351180e0fc4ad57be6e3534fa2ab5cf8c.tar.gz
inkscape-ba4dbfb351180e0fc4ad57be6e3534fa2ab5cf8c.zip
Fix unnecessary inclusion of glibmm/threads.h. This can be resolved by ensuring that glibmm headers always preceed glib.h headers. Same applies with gtkmm/gtk+ etc
(bzr r14064)
Diffstat (limited to 'src/libdepixelize/kopftracer2011.cpp')
-rw-r--r--src/libdepixelize/kopftracer2011.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/libdepixelize/kopftracer2011.cpp b/src/libdepixelize/kopftracer2011.cpp
index 1e769b0c9..96784b14f 100644
--- a/src/libdepixelize/kopftracer2011.cpp
+++ b/src/libdepixelize/kopftracer2011.cpp
@@ -28,11 +28,6 @@
#include <glibmm.h>
-// Build fix under Inkscape build tree
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
#include <algorithm>
#include "kopftracer2011.h"
#include "priv/colorspace.h"
@@ -667,4 +662,4 @@ inline bool Heuristics::islands(PixelGraph::const_iterator a,
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :