diff options
| author | rfree2monero <rfreemonero@op.pl> | 2015-04-01 19:00:45 +0200 |
|---|---|---|
| committer | rfree2monero <rfreemonero@op.pl> | 2015-04-01 19:00:45 +0200 |
| commit | c511abf0058b8c1d020255faaad418b0ffd2eb26 (patch) | |
| tree | 26c4cd88d16e79d5dc59fb3bfc43d399fb2239a3 /src/daemon/daemon.cpp | |
| parent | Merge remote-tracking branch 'monero-official/master' into network-1.6-work1 (diff) | |
| download | monero-c511abf0058b8c1d020255faaad418b0ffd2eb26.tar.xz | |
remerged; commands JSON. logging upgrade. doxygen
Diffstat (limited to 'src/daemon/daemon.cpp')
| -rw-r--r-- | src/daemon/daemon.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp index ec12c281c..7931ba03f 100644 --- a/src/daemon/daemon.cpp +++ b/src/daemon/daemon.cpp @@ -1,5 +1,5 @@ -// Copyright (c) 2014, The Monero Project -// +// Copyright (c) 2014-2015, The Monero Project +// // All rights reserved. // // Redistribution and use in source and binary forms, with or without modification, are @@ -38,10 +38,16 @@ #include "daemon/command_server.h" #include "misc_log_ex.h" #include "version.h" +#include "../../contrib/epee/include/syncobj.h" + +using namespace epee; + #include <boost/program_options.hpp> #include <functional> #include <memory> +unsigned int epee::g_test_dbg_lock_sleep = 0; + namespace daemonize { struct t_internals { |