diff options
| author | Martin Owens <doctormo@gmail.com> | 2013-08-30 00:13:57 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2013-08-30 00:13:57 +0000 |
| commit | 4e5d08311dc4a19a020fc678020e782c85f3d209 (patch) | |
| tree | 202c9f36ac51152a97a174a6f8a843692e951a5c /src/extension/init.cpp | |
| parent | Updating outdated test. Fixes bug #1202271. (diff) | |
| parent | fix make check (POTFILES.in) (diff) | |
| download | inkscape-4e5d08311dc4a19a020fc678020e782c85f3d209.tar.gz inkscape-4e5d08311dc4a19a020fc678020e782c85f3d209.zip | |
Merge emf/wmf work
(bzr r12488)
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); } |