diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2013-06-07 04:57:04 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2013-06-07 04:57:04 +0000 |
| commit | be62ee4a8567deb8679d413c8342e30114058d0c (patch) | |
| tree | ad87038105d713574a66d95521ecae594f33b489 /src | |
| parent | Adding inclusion of config.h where needed for threads.h check. (diff) | |
| download | inkscape-be62ee4a8567deb8679d413c8342e30114058d0c.tar.gz inkscape-be62ee4a8567deb8679d413c8342e30114058d0c.zip | |
Glibmm 2.32+ fix extended to optional components. Fixes bug #1179338.
Fixed bugs:
- https://launchpad.net/bugs/1179338
(bzr r12356)
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/internal/bitmap/imagemagick.cpp | 8 | ||||
| -rw-r--r-- | src/extension/internal/cdr-input.h | 4 | ||||
| -rw-r--r-- | src/extension/internal/vsd-input.h | 4 |
3 files changed, 16 insertions, 0 deletions
diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp index 728c38dea..0d47240d4 100644 --- a/src/extension/internal/bitmap/imagemagick.cpp +++ b/src/extension/internal/bitmap/imagemagick.cpp @@ -8,6 +8,14 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H +#include <glibmm/threads.h> +#endif + #include <libintl.h> #include <gtkmm/box.h> diff --git a/src/extension/internal/cdr-input.h b/src/extension/internal/cdr-input.h index 10af41d5a..3de6c1ed0 100644 --- a/src/extension/internal/cdr-input.h +++ b/src/extension/internal/cdr-input.h @@ -19,6 +19,10 @@ #ifdef WITH_LIBCDR +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H +#include <glibmm/threads.h> +#endif + #include <gtkmm/dialog.h> #include "../implementation/implementation.h" diff --git a/src/extension/internal/vsd-input.h b/src/extension/internal/vsd-input.h index acc52debf..3414e0ec9 100644 --- a/src/extension/internal/vsd-input.h +++ b/src/extension/internal/vsd-input.h @@ -19,6 +19,10 @@ #ifdef WITH_LIBVISIO +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H +#include <glibmm/threads.h> +#endif + #include <gtkmm/dialog.h> #include "../implementation/implementation.h" |