diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2013-06-06 13:44:11 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2013-06-06 13:44:11 +0000 |
| commit | 72d8e897c6b67e46b2a613c4743ef9c13de25059 (patch) | |
| tree | 8aa472fc661f6cacb075274a8f9579dfe8c3c841 /src/display | |
| parent | Fixes r12348 and r12350. (diff) | |
| download | inkscape-72d8e897c6b67e46b2a613c4743ef9c13de25059.tar.gz inkscape-72d8e897c6b67e46b2a613c4743ef9c13de25059.zip | |
Added configure/ifdef guards to only bring in the needed #include if glibmm has it.
(bzr r12353)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/canvas-axonomgrid.cpp | 2 | ||||
| -rw-r--r-- | src/display/canvas-grid.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index 2d3064649..1eadd3fd2 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -17,7 +17,9 @@ # include "config.h" #endif +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include <glibmm/threads.h> +#endif #include <gtkmm/box.h> #include <gtkmm/label.h> diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index ac7f53411..ee5ad0945 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -17,7 +17,9 @@ # include "config.h" #endif +#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H #include <glibmm/threads.h> +#endif #include <gtkmm/box.h> #include <gtkmm/label.h> |