diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-08 12:14:30 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-07-05 11:02:50 +0000 |
| commit | f4c68d3ad80734e15d093eeee211519e97e2a8ec (patch) | |
| tree | d304b328723d8f089c2a6636a49b5f8af4018ac2 /desktop/source/minidump | |
| parent | 7001ca25ec7251c5bac4a5ff304d1f26794b58a0 (diff) | |
use a dynamic library for minidump shared code
This has the disadvantage to make the minidump_upload executable depend on LibreOffice libraries but there seems to be no other way to make the 7.1 SDK happy.
Change-Id: I82c37f503ed29cb50711eae7db22063f49747a48
Reviewed-on: https://gerrit.libreoffice.org/26055
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 3498cd3e7b2c820fc3f3025eb4434666a444fda1)
Reviewed-on: https://gerrit.libreoffice.org/26915
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'desktop/source/minidump')
| -rw-r--r-- | desktop/source/minidump/minidump.cxx | 5 | ||||
| -rw-r--r-- | desktop/source/minidump/minidump_upload.cxx | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/desktop/source/minidump/minidump.cxx b/desktop/source/minidump/minidump.cxx index 135b24a78435..e44fc4ccfb2f 100644 --- a/desktop/source/minidump/minidump.cxx +++ b/desktop/source/minidump/minidump.cxx @@ -13,6 +13,7 @@ #include <memory> #include <fstream> #include <sstream> +#include <string> #include <curl/curl.h> @@ -178,6 +179,8 @@ bool uploadContent(std::map<std::string, std::string>& parameters, std::string& return true; } +namespace crashreport { + bool readConfig(const std::string& iniPath, std::string& response) { std::ifstream file(iniPath); @@ -199,4 +202,6 @@ bool readConfig(const std::string& iniPath, std::string& response) return uploadContent(parameters, response); } +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/minidump/minidump_upload.cxx b/desktop/source/minidump/minidump_upload.cxx index 934f1add7268..ded2f1df0a43 100644 --- a/desktop/source/minidump/minidump_upload.cxx +++ b/desktop/source/minidump/minidump_upload.cxx @@ -10,6 +10,7 @@ #include <desktop/minidump.hxx> #include <iostream> +#include <string> int main(int argc, char** argv) { @@ -21,7 +22,7 @@ int main(int argc, char** argv) std::string iniPath(argv[1]); std::string response; - if (!readConfig(iniPath, response)) + if (!crashreport::readConfig(iniPath, response)) return EXIT_FAILURE; std::cout << "Response: " << response << std::endl; |