summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--mrbgems/mruby-bin-mruby-config/mruby-config2
-rw-r--r--mrbgems/mruby-bin-mruby-config/mruby-config.bat2
-rw-r--r--src/class.c2
-rw-r--r--src/pool.c4
4 files changed, 7 insertions, 3 deletions
diff --git a/mrbgems/mruby-bin-mruby-config/mruby-config b/mrbgems/mruby-bin-mruby-config/mruby-config
index fcc3fabe3..14a4f1630 100644
--- a/mrbgems/mruby-bin-mruby-config/mruby-config
+++ b/mrbgems/mruby-bin-mruby-config/mruby-config
@@ -10,7 +10,7 @@ while [ $# -gt 0 ]; do
echo " switches:"
echo " --cflags print flags passed to compiler"
echo " --ldflags print flags passed to linker"
- echo " --ldflags-before-libs print flags passwd to linker before linked libraries"
+ echo " --ldflags-before-libs print flags passed to linker before linked libraries"
echo " --libs print linked libraries"
exit 0;;
esac
diff --git a/mrbgems/mruby-bin-mruby-config/mruby-config.bat b/mrbgems/mruby-bin-mruby-config/mruby-config.bat
index 212dbdd77..8cd7e78ef 100644
--- a/mrbgems/mruby-bin-mruby-config/mruby-config.bat
+++ b/mrbgems/mruby-bin-mruby-config/mruby-config.bat
@@ -32,5 +32,5 @@ echo Usage: mruby-config [switches]
echo switches:
echo --cflags print flags passed to compiler
echo --ldflags print flags passed to linker
-echo --ldflags-before-libs print flags passwd to linker before linked libraries
+echo --ldflags-before-libs print flags passed to linker before linked libraries
echo --libs print linked libraries
diff --git a/src/class.c b/src/class.c
index 8aa976c08..4349e7b49 100644
--- a/src/class.c
+++ b/src/class.c
@@ -696,7 +696,7 @@ mrb_get_args(mrb_state *mrb, const char *format, ...)
if (i < argc && mrb_nil_p(ARGV[arg_i])) {
*ps = NULL;
*pl = 0;
- i++;
+ i++; arg_i++;
break;
}
}
diff --git a/src/pool.c b/src/pool.c
index 18f66fc27..db4546abf 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -13,8 +13,12 @@
/* allocated memory address should be multiple of POOL_ALIGNMENT */
/* or undef it if alignment does not matter */
#ifndef POOL_ALIGNMENT
+#if INTPTR_MAX == INT64_MAX
+#define POOL_ALIGNMENT 8
+#else
#define POOL_ALIGNMENT 4
#endif
+#endif
/* page size of memory pool */
#ifndef POOL_PAGE_SIZE
#define POOL_PAGE_SIZE 16000