summaryrefslogtreecommitdiff
path: root/src/global.cc
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2010-06-15 06:28:30 -0400
committerJohn Wiegley <johnw@newartisans.com>2010-06-15 06:28:30 -0400
commitbe91f38ab4ccdba6006106d45fd7061db2110470 (patch)
tree25874de7e90c34224c842e6b716ca9e82fe01028 /src/global.cc
parentf3bedb88b24ae8b2047ad86e57b161265c2812f5 (diff)
parent968a6f3c0ac4690a6fc74e8d84058bce91019c2e (diff)
downloadledger-be91f38ab4ccdba6006106d45fd7061db2110470.tar.gz
ledger-be91f38ab4ccdba6006106d45fd7061db2110470.tar.bz2
ledger-be91f38ab4ccdba6006106d45fd7061db2110470.zip
Merge branch 'next'
Diffstat (limited to 'src/global.cc')
-rw-r--r--src/global.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/global.cc b/src/global.cc
index b1466cae..c0698376 100644
--- a/src/global.cc
+++ b/src/global.cc
@@ -422,6 +422,7 @@ expr_t::func_t global_scope_t::look_for_command(scope_t& scope,
void global_scope_t::visit_man_page() const
{
+#ifndef WIN32
int pid = fork();
if (pid < 0) {
throw std::logic_error(_("Failed to fork child process"));
@@ -436,6 +437,7 @@ void global_scope_t::visit_man_page() const
int status = -1;
wait(&status);
+#endif
exit(0); // parent
}
@@ -471,7 +473,7 @@ void handle_debug_options(int argc, char * argv[])
// global in utils.h
_trace_level = boost::lexical_cast<uint8_t>(argv[i + 1]);
}
- catch (const boost::bad_lexical_cast& e) {
+ catch (const boost::bad_lexical_cast&) {
throw std::logic_error(_("Argument to --trace must be an integer"));
}
i++;