diff options
| author | Bob Jamison <ishmalius@gmail.com> | 2008-05-13 15:30:30 +0000 |
|---|---|---|
| committer | ishmal <ishmal@users.sourceforge.net> | 2008-05-13 15:30:30 +0000 |
| commit | f1ca0302d7e50b87d1f39e79d42acdf43083cf98 (patch) | |
| tree | 8fe0e8c2dd51d4ef5f815cf38e5fcb5e4174805b /src | |
| parent | Setting for testing got into the tree. oops. (diff) | |
| download | inkscape-f1ca0302d7e50b87d1f39e79d42acdf43083cf98.tar.gz inkscape-f1ca0302d7e50b87d1f39e79d42acdf43083cf98.zip | |
Fix for future testing.
(bzr r5666)
Diffstat (limited to 'src')
| -rw-r--r-- | src/dom/dom.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/dom/dom.h b/src/dom/dom.h index c1d9428d0..21ea44669 100644 --- a/src/dom/dom.h +++ b/src/dom/dom.h @@ -57,8 +57,11 @@ * Then below, select one of the corresponding typedefs. */ +#ifdef DOM_STANDALONE +#include <string> +#else #include <glibmm.h> -//#include <string> +#endif //# Unfortunate hack for a name collision #ifdef SEVERITY_ERROR @@ -78,13 +81,14 @@ namespace dom /** * This is the org::w3c::dom::DOMString definition. * Which type do we want? - */ + */ +#ifdef DOM_STANDALONE +typedef std::string DOMString; +typedef unsigned short XMLCh; +#else typedef Glib::ustring DOMString; typedef gunichar XMLCh; - -//typedef std::string DOMString; -//typedef unsigned short XMLCh; - +#endif /** * At least 64 bit time stamp value. |