Merge 37386b857a into 7c66041a6f

Co-authored-by: Jade Shrinemaiden <jadeshrinemaiden@gmail.com>

Makefile

@@ -134,6 +134,8 @@ all: $(SERVER)
 
 windows: $(SERVER)
 
+nosandbox: $(SERVER)
+
 # assign Windows-specific values if targeting Windows
 windows : CC=$(WIN_CC)
 windows : CXX=$(WIN_CXX)
@@ -142,6 +144,8 @@ windows : CXXFLAGS=$(WIN_CXXFLAGS)
 windows : LDFLAGS=$(WIN_LDFLAGS)
 windows : SERVER=$(WIN_SERVER)
 
+nosandbox : CFLAGS+=-DCONFIG_NOSANDBOX=1
+
 .SUFFIXES: .o .c .cpp .h .hpp
 
 .c.o:
@@ -163,7 +167,7 @@ version.h:
 
 src/main.o: version.h
 
-.PHONY: all windows clean nuke
+.PHONY: all windows nosandbox clean nuke
 
 # only gets rid of OpenFusion objects, so we don't need to
 # recompile the libs every time

vendor/bcrypt/bcrypt.c

@@ -38,9 +38,10 @@ typedef __int64 ssize_t;
 #include <wincrypt.h> /* CryptAcquireContext, CryptGenRandom */
 #else
 #include "bcrypt.h"
-#include "ow-crypt.h"
 #endif
 
+#include "ow-crypt.h"
+
 #define RANDBYTES (16)
 
 static int try_close(int fd)