diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2015-12-27 17:33:13 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2015-12-27 17:33:13 +0000 |
| commit | 9944a1a48890ac3d45c8c2d1e67b91403b461f04 (patch) | |
| tree | f1e64f7dc51aebfabe5495539709825b18181f92 | |
| parent | Apply Tav/suv patch to replace Pango OT functions with Harfbuzz (diff) | |
| download | inkscape-9944a1a48890ac3d45c8c2d1e67b91403b461f04.tar.gz inkscape-9944a1a48890ac3d45c8c2d1e67b91403b461f04.zip | |
Remove superfluous glibmm/threads.h checks
(bzr r14550)
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/widgets/gradient-selector.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/sp-color-selector.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/sp-color-selector.h | 4 |
4 files changed, 0 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index 373430efe..6aeef6da6 100644 --- a/configure.ac +++ b/configure.ac @@ -1119,13 +1119,6 @@ AC_SUBST(INKSCAPE_LIBS) AC_SUBST(INKSCAPE_CXX_DEPS_CFLAGS) AC_SUBST(INKSCAPE_CXX_DEPS_LIBS) -dnl Check to see if we have a newer (2.32.0+) glibmm -TMP_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$GTK_CFLAGS $CPPFLAGS" -AC_CHECK_HEADERS([glibmm/threads.h]) -CPPFLAGS="$TMP_CPPFLAGS" - - dnl Define our data paths for config.h AC_DEFINE_DIR([INKSCAPE_DATADIR], [datadir], [Base data directory]) AC_DEFINE_DIR([PACKAGE_LOCALE_DIR], [localedir], [Locatization directory]) diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp index 63599f3f9..604ecd108 100644 --- a/src/widgets/gradient-selector.cpp +++ b/src/widgets/gradient-selector.cpp @@ -17,10 +17,6 @@ # include "config.h" #endif -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -#include <glibmm/threads.h> -#endif - #include <gtkmm/treeview.h> #include "gradient-vector.h" diff --git a/src/widgets/sp-color-selector.cpp b/src/widgets/sp-color-selector.cpp index dad0a18b0..93eaaee8b 100644 --- a/src/widgets/sp-color-selector.cpp +++ b/src/widgets/sp-color-selector.cpp @@ -7,10 +7,6 @@ # include "config.h" #endif -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -#include <glibmm/threads.h> -#endif - #include <math.h> #include <gtk/gtk.h> #include <glibmm/i18n.h> diff --git a/src/widgets/sp-color-selector.h b/src/widgets/sp-color-selector.h index 308a5519c..75cb79b00 100644 --- a/src/widgets/sp-color-selector.h +++ b/src/widgets/sp-color-selector.h @@ -5,10 +5,6 @@ # include <config.h> #endif -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -#include <glibmm/threads.h> -#endif - #include <gtk/gtk.h> #include "color.h" |