diff options
| author | Dmitry Zhulanov <dmitry.zhulanov@gmail.com> | 2016-10-01 10:08:49 +0000 |
|---|---|---|
| committer | Dmitry Zhulanov <dmitry.zhulanov@gmail.com> | 2016-10-01 10:08:49 +0000 |
| commit | 017616c4fc99883323c2a0d6e44b88f7cd16ce2d (patch) | |
| tree | 6a1ab72d73b5db369763a1baef6e341ba32e249c /src | |
| parent | fix indent (diff) | |
| download | inkscape-017616c4fc99883323c2a0d6e44b88f7cd16ce2d.tar.gz inkscape-017616c4fc99883323c2a0d6e44b88f7cd16ce2d.zip | |
fix cmake warning and remove whole xverbs code from compilation without yaml
(bzr r15136.1.11)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main-cmdlinexact.cpp | 11 | ||||
| -rw-r--r-- | src/main-cmdlinexact.h | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/main-cmdlinexact.cpp b/src/main-cmdlinexact.cpp index f29d22377..f5db522ae 100644 --- a/src/main-cmdlinexact.cpp +++ b/src/main-cmdlinexact.cpp @@ -38,7 +38,7 @@ * # inkscape have a lot of useful verbs * - verb-id: FileQuit */ - +#ifdef WITH_YAML #include <ui/view/view.h> #include <desktop.h> #include <helper/action.h> @@ -52,9 +52,8 @@ #include <glibmm/i18n.h> #include "main-cmdlinexact.h" -#ifdef WITH_YAML + #include "yaml.h" -#endif // WITH_YAML #include "extension/system.h" #include "file.h" @@ -315,9 +314,6 @@ typedef std::list<verb_info_t> verbs_list_t; void CmdLineXAction::createActionsFromYAML( gchar const *yaml_filename ) { -#ifndef WITH_YAML - return; -#else // WITH_YAML FILE *fh = fopen(yaml_filename, "r"); if(fh == NULL) { printf("Failed to open file!\n"); @@ -535,12 +531,13 @@ CmdLineXAction::createActionsFromYAML( gchar const *yaml_filename ) { } fflush(stdout); -#endif // WITH_YAML } } // Inkscape +#endif // WITH_YAML + /* Local Variables: mode:c++ diff --git a/src/main-cmdlinexact.h b/src/main-cmdlinexact.h index 1ac630e55..8634f3875 100644 --- a/src/main-cmdlinexact.h +++ b/src/main-cmdlinexact.h @@ -2,6 +2,8 @@ #ifndef __INK_MAIN_CMD_LINE_XACTIONS_H__ #define __INK_MAIN_CMD_LINE_XACTIONS_H__ +#ifdef WITH_YAML + /** \file * Extended actions that can be queued at the yaml file */ @@ -37,7 +39,7 @@ public: } // Inkscape - +#endif // WITH_YAML #endif /* __INK_MAIN_CMD_LINE_XACTIONS_H__ */ /* |