summaryrefslogtreecommitdiffhomepage
path: root/src/pool.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2017-09-29 00:18:39 +0900
committerGitHub <[email protected]>2017-09-29 00:18:39 +0900
commit29a9e698e33f89c18cd8f9622bd503aa55df2f51 (patch)
treee83110a7db0edaa3a6c191abe850ed7b657f766e /src/pool.c
parent381850280c036116adaffe42cc420da9c71d28a2 (diff)
parent999ce87129fb9216ae746140aa716a764a79b354 (diff)
downloadmruby-29a9e698e33f89c18cd8f9622bd503aa55df2f51.tar.gz
mruby-29a9e698e33f89c18cd8f9622bd503aa55df2f51.zip
Merge pull request #3815 from dabroz/fix-warnings
Fix MSVC 14.0 warnings
Diffstat (limited to 'src/pool.c')
-rw-r--r--src/pool.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/pool.c b/src/pool.c
index db4546abf..b87d2cfaa 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -25,6 +25,13 @@
#endif
/* end of configuration section */
+/* Disable MSVC warning "C4200: nonstandard extension used: zero-sized array
+ * in struct/union" when in C++ mode */
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4200)
+#endif
+
struct mrb_pool_page {
struct mrb_pool_page *next;
size_t offset;
@@ -33,6 +40,10 @@ struct mrb_pool_page {
char page[];
};
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
struct mrb_pool {
mrb_state *mrb;
struct mrb_pool_page *pages;