From d6d27036d27a9c2bc02b6a4d518eb96aecace701 Mon Sep 17 00:00:00 2001 From: zosrothko Date: Tue, 17 Apr 2018 20:45:08 +0200 Subject: [PATCH] PocoDoc fixes --- Foundation/include/Poco/UnWindows.h | 11 ++++++++--- PocoDoc/cfg/mkdoc-poco.xml | 2 +- PocoDoc/src/PocoDoc.cpp | 5 +++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Foundation/include/Poco/UnWindows.h b/Foundation/include/Poco/UnWindows.h index 0888c5964..59ba2d779 100644 --- a/Foundation/include/Poco/UnWindows.h +++ b/Foundation/include/Poco/UnWindows.h @@ -84,9 +84,14 @@ // discovered in Platform_WIN32.h. // #define POCO_FORCE_MIN_WINDOWS_OS_SUPPORT - -#include - +#if !defined(POCO_NO_WINDOWS_H) + #include + #ifdef __MINGW32__ + #include + #include + #include + #endif // __MINGW32__ +#endif #if !defined(POCO_NO_UNWINDOWS) // A list of annoying macros to #undef. diff --git a/PocoDoc/cfg/mkdoc-poco.xml b/PocoDoc/cfg/mkdoc-poco.xml index 0be05b2da..5194f1018 100644 --- a/PocoDoc/cfg/mkdoc-poco.xml +++ b/PocoDoc/cfg/mkdoc-poco.xml @@ -36,8 +36,8 @@ -D_DEBUG, -E, -C, + -DPOCO_NO_WINDOWS_H, -DPOCO_NO_GCC_API_ATTRIBUTE, - -DPOCO_NO_WINDOWS_H -xc++ diff --git a/PocoDoc/src/PocoDoc.cpp b/PocoDoc/src/PocoDoc.cpp index bc770fe22..e2602e778 100644 --- a/PocoDoc/src/PocoDoc.cpp +++ b/PocoDoc/src/PocoDoc.cpp @@ -254,6 +254,11 @@ protected: logger().debug("exec " + exec); logger().debug("path " + path); + for (int no = 0; no < args.size(); ++no) + { + logger().debug("arg " + args[no]); + } + if (usePipe) {