Skip to content
Snippets Groups Projects
Commit 6a574e4b authored by dmitriy.gerasimov's avatar dmitriy.gerasimov
Browse files

Merge branch 'bugs-2658' into 'master'

Windows build fixed

See merge request !15
parents 82d8d1ab 8a2ada22
No related branches found
No related tags found
1 merge request!15Windows build fixed
......@@ -11,7 +11,6 @@ if(WIN32)
include_directories(../3rdparty/wepoll/include/)
include_directories(../3rdparty/uthash/src/)
include_directories(../3rdparty/libjson-c/)
include_directories(../3rdparty/libmagic/src/)
include_directories(../3rdparty/curl/include/)
include_directories(../3rdparty/libsqlite3/)
endif()
......
......@@ -27,7 +27,7 @@
#include <pthread.h>
#include <time.h>
#include <assert.h>
#include <string.h>
//#include <string.h>
#include "uthash.h"
......@@ -39,6 +39,7 @@
#ifdef WIN32
#include "registry.h"
#include <string.h>
#endif
#ifndef MAX_PATH
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment