DelayLoadHelper, svrplus: #include "stdboolx.h"

DankRank · Jan 14, 2020 · b09471a · b09471a
1 parent 841965f
commit b09471a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 21 deletions.
diff --git a/src/libwin32common/DelayLoadHelper.c b/src/libwin32common/DelayLoadHelper.c
@@ -13,16 +13,8 @@
 // C includes.
 #include <stdlib.h>
 
-// TODO: Move to our own stdboolx.h file.
-#ifndef __cplusplus
-# if defined(_MSC_VER) && _MSC_VER >= 1800
-#  include <stdbool.h>
-# else
-typedef unsigned char bool;
-#  define true 1
-#  define false 0
-# endif
-#endif /* __cplusplus */
+// stdbool
+#include "stdboolx.h"
 
 // ImageBase for GetModuleFileName().
 // Reference: https://blogs.msdn.microsoft.com/oldnewthing/20041025-00/?p=37483

diff --git a/src/svrplus/svrplus.c b/src/svrplus/svrplus.c
@@ -17,6 +17,9 @@
 // MSVCRT-specific
 #include <process.h>
 
+// stdbool
+#include "stdboolx.h"
+
 // libwin32common
 #include "libwin32common/RpWin32_sdk.h"
 #include "libwin32common/secoptions.h"
@@ -50,17 +53,6 @@
 	((int)(((sizeof(x) / sizeof(x[0]))) / \
 		(size_t)(!(sizeof(x) % sizeof(x[0])))))
 
-// TODO: Move to our own stdboolx.h file.
-#ifndef __cplusplus
-# if defined(_MSC_VER) && _MSC_VER >= 1800
-#  include <stdbool.h>
-# else
-typedef unsigned char bool;
-#  define true 1
-#  define false 0
-# endif
-#endif /* __cplusplus */
-
 // File paths
 static const TCHAR str_rp32path[] = _T("i386\\rom-properties.dll");
 static const TCHAR str_rp64path[] = _T("amd64\\rom-properties.dll");