[osmium-tool] 32/97: fix includes for MSVC

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Tue Jul 21 20:15:32 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 1e9a1e65225c87d86d3adcfa53aba72943471b4b
Author: alex85k <alex85k at github.com>
Date:   Tue Aug 26 14:10:23 2014 +0600

    fix includes for MSVC
---
 src/command_fileinfo.cpp | 3 ++-
 src/command_help.cpp     | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/command_fileinfo.cpp b/src/command_fileinfo.cpp
index 1c9a57a..703cbf6 100644
--- a/src/command_fileinfo.cpp
+++ b/src/command_fileinfo.cpp
@@ -24,8 +24,9 @@ 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>
-
+#endif
 #include <boost/program_options.hpp>
 namespace po = boost::program_options;
 
diff --git a/src/command_help.cpp b/src/command_help.cpp
index 61035dd..2b7bb86 100644
--- a/src/command_help.cpp
+++ b/src/command_help.cpp
@@ -27,7 +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>
+#else
+#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