diff options
| author | Bryce Harrington <bryce@bryceharrington.org> | 2008-01-31 19:06:59 +0000 |
|---|---|---|
| committer | bryce <bryce@users.sourceforge.net> | 2008-01-31 19:06:59 +0000 |
| commit | 06d8aaba21496e6a39a7c18dd82e0d3efbeb531c (patch) | |
| tree | b2dec94e06000e9929f24385c60e64f629e4e041 /src/display | |
| parent | r17815@shi: ted | 2008-01-31 08:58:15 -0800 (diff) | |
| download | inkscape-06d8aaba21496e6a39a7c18dd82e0d3efbeb531c.tar.gz inkscape-06d8aaba21496e6a39a7c18dd82e0d3efbeb531c.zip | |
Applying fixes for gcc 4.3 build issues (closes LP: #169115)
(bzr r4629)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/canvas-grid.h | 13 | ||||
| -rw-r--r-- | src/display/curve.cpp | 2 | ||||
| -rw-r--r-- | src/display/nr-arena-item.cpp | 2 | ||||
| -rw-r--r-- | src/display/nr-filter-gaussian.cpp | 1 | ||||
| -rw-r--r-- | src/display/nr-filter.cpp | 2 |
5 files changed, 13 insertions, 7 deletions
diff --git a/src/display/canvas-grid.h b/src/display/canvas-grid.h index c201fa7df..8ae26d4c4 100644 --- a/src/display/canvas-grid.h +++ b/src/display/canvas-grid.h @@ -11,21 +11,20 @@ * */ -#include <display/sp-canvas.h> -#include "xml/repr.h" -#include <gtkmm/box.h> - +#include <cstring> +#include <string> +#include <gtkmm/box.h> #include <gtkmm.h> + +#include "display/sp-canvas.h" +#include "xml/repr.h" #include "ui/widget/color-picker.h" #include "ui/widget/scalar-unit.h" - #include "ui/widget/registered-widget.h" #include "ui/widget/registry.h" #include "ui/widget/tolerance-slider.h" - #include "xml/node-event-vector.h" - #include "snapper.h" #include "line-snapper.h" diff --git a/src/display/curve.cpp b/src/display/curve.cpp index 01148c44c..9b59a3c45 100644 --- a/src/display/curve.cpp +++ b/src/display/curve.cpp @@ -21,6 +21,8 @@ #include <libnr/n-art-bpath.h> #include <libnr/nr-point-matrix-ops.h> #include <libnr/nr-translate-ops.h> +#include <cstring> +#include <string> #define SP_CURVE_LENSTEP 32 diff --git a/src/display/nr-arena-item.cpp b/src/display/nr-arena-item.cpp index c78a0eca5..95b0c0eae 100644 --- a/src/display/nr-arena-item.cpp +++ b/src/display/nr-arena-item.cpp @@ -15,6 +15,8 @@ #define noNR_ARENA_ITEM_VERBOSE #define noNR_ARENA_ITEM_DEBUG_CASCADE +#include <cstring> +#include <string> #include <libnr/nr-blit.h> #include <libnr/nr-pixops.h> diff --git a/src/display/nr-filter-gaussian.cpp b/src/display/nr-filter-gaussian.cpp index a3fa37bd7..b4d1fb00d 100644 --- a/src/display/nr-filter-gaussian.cpp +++ b/src/display/nr-filter-gaussian.cpp @@ -17,6 +17,7 @@ #include <cmath> #include <complex> #include <glib.h> +#include <cstdlib> #include <limits> #include "isnan.h" diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp index 84e8180bc..6027b5f27 100644 --- a/src/display/nr-filter.cpp +++ b/src/display/nr-filter.cpp @@ -13,6 +13,8 @@ #include <glib.h> #include <cmath> +#include <cstring> +#include <string> #include "display/nr-filter.h" #include "display/nr-filter-primitive.h" |