[osmium-tool] 39/97: Formatting includes.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue Jul 21 20:15:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to tag v1.0.0
in repository osmium-tool.
commit 4abfe762dac1060c2296d5405b7d422ef2169e63
Author: Jochen Topf <jochen at topf.org>
Date: Fri Sep 26 19:45:06 2014 +0200
Formatting includes.
---
src/command_fileinfo.cpp | 16 +++++++++-------
src/command_help.cpp | 7 ++++---
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/command_fileinfo.cpp b/src/command_fileinfo.cpp
index b0e1f32..57226ad 100644
--- a/src/command_fileinfo.cpp
+++ b/src/command_fileinfo.cpp
@@ -24,9 +24,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <sys/types.h>
#include <sys/stat.h>
+
#ifndef _MSC_VER
-#include <unistd.h>
+# include <unistd.h>
+#endif
+
+#ifdef USE_CRYPTOPP
+# include <cryptopp/sha.h>
+#else
+# include <crypto++/sha.h>
#endif
+
#include <boost/program_options.hpp>
namespace po = boost::program_options;
@@ -37,12 +45,6 @@ namespace po = boost::program_options;
#include "command_fileinfo.hpp"
-#ifdef USE_CRYPTOPP
-# include <cryptopp/sha.h>
-#else
-# include <crypto++/sha.h>
-#endif
-
bool CommandFileinfo::setup(const std::vector<std::string>& arguments) {
po::variables_map vm;
try {
diff --git a/src/command_help.cpp b/src/command_help.cpp
index 2b7bb86..e4424df 100644
--- a/src/command_help.cpp
+++ b/src/command_help.cpp
@@ -27,11 +27,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <map>
#include <numeric>
#include <string>
+
#ifndef _MSC_VER
-#include <unistd.h>
+# include <unistd.h>
#else
-#include <process.h>
-#define execlp _execlp
+# include <process.h>
+# define execlp _execlp
#endif
#include "command_help.hpp"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git
More information about the Pkg-grass-devel
mailing list