Merge branch 'master' into next

28550b22 · Monster Iestyn · 7e562a3c · d2fefb6b · 28550b22
Commit 28550b22 authored 5 years ago by Monster Iestyn
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -104,7 +104,7 @@ static inline VOID MakeCodeWritable(VOID)
 #endif
 #ifdef LOGMESSAGES
-static VOID InitLogging(VOID)
+static void InitLogging(void)
 {
 	const char *logdir = NULL;
 	time_t my_time;