Merge 37386b857a into c116794c83

Makefile

@@ -134,8 +134,6 @@ all: $(SERVER)
 
 windows: $(SERVER)
 
-nosandbox: $(SERVER)
-
 # assign Windows-specific values if targeting Windows
 windows : CC=$(WIN_CC)
 windows : CXX=$(WIN_CXX)
@@ -144,8 +142,6 @@ 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:
@@ -167,7 +163,7 @@ version.h:
 
 src/main.o: version.h
 
-.PHONY: all windows nosandbox clean nuke
+.PHONY: all windows 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,8 @@ typedef __int64 ssize_t;
 #include <wincrypt.h> /* CryptAcquireContext, CryptGenRandom */
 #else
 #include "bcrypt.h"
-#endif
-
 #include "ow-crypt.h"
+#endif
 
 #define RANDBYTES (16)