diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-09-08 21:29:10 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-09-08 21:29:10 +0000 |
| commit | 36553c85069d88ba5e7b5fba7cd31cc4818a454d (patch) | |
| tree | f9832fe22e771c66215647a4857ee68fa3f9300b /src/extension/init.cpp | |
| parent | update to trunk (diff) | |
| parent | Add a check so objects removed from the document dont crash inkscape, happens... (diff) | |
| download | inkscape-36553c85069d88ba5e7b5fba7cd31cc4818a454d.tar.gz inkscape-36553c85069d88ba5e7b5fba7cd31cc4818a454d.zip | |
update to trunk
(bzr r11950.1.138)
Diffstat (limited to 'src/extension/init.cpp')
| -rw-r--r-- | src/extension/init.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/extension/init.cpp b/src/extension/init.cpp index d403d270f..1a163d4c2 100644 --- a/src/extension/init.cpp +++ b/src/extension/init.cpp @@ -34,10 +34,10 @@ #include "system.h" #include "db.h" #include "internal/svgz.h" -#ifdef WIN32 -# include "internal/emf-win32-inout.h" -# include "internal/emf-win32-print.h" -#endif +# include "internal/emf-inout.h" +# include "internal/emf-print.h" +# include "internal/wmf-inout.h" +# include "internal/wmf-print.h" #ifdef HAVE_CAIRO_PDF # include "internal/cairo-renderer-pdf-out.h" # include "internal/cairo-png-out.h" @@ -181,10 +181,10 @@ init() Internal::PdfInputCairo::init(); } #endif -#ifdef WIN32 - Internal::PrintEmfWin32::init(); - Internal::EmfWin32::init(); -#endif + Internal::PrintEmf::init(); + Internal::Emf::init(); + Internal::PrintWmf::init(); + Internal::Wmf::init(); Internal::PovOutput::init(); Internal::JavaFXOutput::init(); Internal::OdfOutput::init(); @@ -324,7 +324,7 @@ build_module_from_dir(gchar const *dirname) continue; } - gchar *pathname = g_build_filename(dirname, filename, NULL); + gchar *pathname = g_build_filename(dirname, filename, (char *) NULL); build_from_file(pathname); g_free(pathname); } |