Skip to content

Commit 835d733

Browse files
committed
Fix some _msize conflict in snmalloc
1 parent 86c59c3 commit 835d733

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

server/proxy_server/main.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,14 @@
88
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
99
//
1010

11-
#include "proxy/proxy_server.hpp"
12-
#include "proxy/socks_client.hpp"
13-
#include "proxy/logging.hpp"
14-
15-
#include "proxy/use_awaitable.hpp"
16-
#include "proxy/ipip.hpp"
17-
1811
#ifdef _MSC_VER
1912
# pragma warning(push)
2013
# pragma warning(disable: 4005)
2114
#endif // _MSC_VER
2215

2316
#ifdef USE_SNMALLOC
2417
# ifdef NDEBUG
18+
# define SNMALLOC_STATIC_LIBRARY_PREFIX sn_
2519
# include "src/snmalloc/override/malloc.cc"
2620
# include "src/snmalloc/override/new.cc"
2721
# endif
@@ -31,6 +25,13 @@
3125
# pragma warning(pop)
3226
#endif
3327

28+
#include "proxy/proxy_server.hpp"
29+
#include "proxy/socks_client.hpp"
30+
#include "proxy/logging.hpp"
31+
32+
#include "proxy/use_awaitable.hpp"
33+
#include "proxy/ipip.hpp"
34+
3435
#include "main.hpp"
3536

3637
#include <boost/asio/io_context.hpp>

0 commit comments

Comments
 (0)