Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2994 

2018cf74 Fix Windows build (dEBRUYNE-1)
This commit is contained in:
Riccardo Spagni 2017-12-24 18:49:48 +02:00
parent 7a9a4a6669 2018cf74a6
commit b373d0f15e
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/epee/include/misc_os_dependent.h
View File

@ -23,6 +23,10 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// //
#ifdef _WIN32
#include <Winsock2.h>
#endif
#ifdef WIN32 #ifdef WIN32
#ifndef WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN

1
external/easylogging++/ea_config.h vendored
View File

@ -8,3 +8,4 @@
#endif #endif
#define ELPP_DISABLE_DEFAULT_CRASH_HANDLING #define ELPP_DISABLE_DEFAULT_CRASH_HANDLING
#define ELPP_NO_CHECK_MACROS #define ELPP_NO_CHECK_MACROS
#define ELPP_WINSOCK2

3
src/daemonizer/windows_service.cpp
View File

@ -26,6 +26,9 @@
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/chrono/chrono.hpp>
#include <boost/thread/thread.hpp>
#undef UNICODE #undef UNICODE
#undef _UNICODE #undef _UNICODE