3 files changed, 11 insertions, 1 deletions
diff --git a/include/lang.h b/include/lang.h
index 705aca35df1c..09b0d6072806 100644
--- a/include/lang.h
+++ b/include/lang.h
@@ -37,6 +37,9 @@
 #define BC_LANG_H
 
 #include <stdbool.h>
+#if BC_C11
+#include <assert.h>
+#endif // BC_C11
 
 #include <status.h>
 #include <vector.h>
@@ -324,6 +327,11 @@ typedef enum BcInst {
 
 } BcInst;
 
+#if BC_C11
+static_assert(BC_INST_INVALID <= UCHAR_MAX,
+              "Too many instructions to fit into an unsigned char");
+#endif // BC_C11
+
 /// Used by maps to identify where items are in the array.
 typedef struct BcId {
 
diff --git a/include/version.h b/include/version.h
index eca73baf508f..0c4122528e7d 100644
--- a/include/version.h
+++ b/include/version.h
@@ -37,6 +37,6 @@
 #define BC_VERSION_H
 
 /// The current version.
-#define VERSION 5.2.1
+#define VERSION 5.2.2
 
 #endif // BC_VERSION_H
diff --git a/include/vm.h b/include/vm.h
index d6f698fb1e6d..6f69712a804b 100644
--- a/include/vm.h
+++ b/include/vm.h
@@ -545,8 +545,10 @@ typedef struct BcVm {
 	/// The messages for each error.
 	const char *err_msgs[BC_ERR_NELEMS];
 
+#if BC_ENABLE_NLS
 	/// The locale.
 	const char *locale;
+#endif // BC_ENABLE_NLS
 
 #endif // !BC_ENABLE_LIBRARY