Changeset 331 for EcnlProtoTool/trunk/mruby-1.3.0/include/mrbconf.h

Timestamp:

Jan 21, 2018, 12:10:09 AM (6 years ago)

Author:

coas-nagasima

Message:

prototoolに関連するプロジェクトをnewlibからmuslを使うよう変更・更新
ntshellをnewlibの下位の実装から、muslのsyscallの実装に変更・更新
以下のOSSをアップデート
・mruby-1.3.0
・musl-1.1.18
・onigmo-6.1.3
・tcc-0.9.27
以下のOSSを追加
・openssl-1.1.0e
・curl-7.57.0
・zlib-1.2.11
以下のmrbgemsを追加
・iij/mruby-digest
・iij/mruby-env
・iij/mruby-errno
・iij/mruby-iijson
・iij/mruby-ipaddr
・iij/mruby-mock
・iij/mruby-require
・iij/mruby-tls-openssl

Location:

EcnlProtoTool/trunk/mruby-1.3.0

Files:

• . (moved) (moved from EcnlProtoTool/trunk/mruby-1.2.0 )
• include/mrbconf.h (modified) (5 diffs)

EcnlProtoTool/trunk/mruby-1.3.0/include/mrbconf.h

@@ -8 +8 @@
 #define MRUBYCONF_H
 
+#include <limits.h>
+#include <stdint.h>
+
+/* architecture selection: */
+/* specify -DMRB_32BIT or -DMRB_64BIT to override */
+#if !defined(MRB_32BIT) && !defined(MRB_64BIT)
+#if UINT64_MAX == SIZE_MAX
+#define MRB_64BIT
+#else
+#define MRB_32BIT
+#endif
+#endif
+
+#if defined(MRB_32BIT) && defined(MRB_64BIT)
+#error Cannot build for 32 and 64 bit architecture at the same time
+#endif
+
 /* configuration options: */
 /* add -DMRB_USE_FLOAT to use float instead of double for floating point numbers */
 //#define MRB_USE_FLOAT
-#define MRB_USE_FLOAT
 
 /* add -DMRB_INT16 to use 16bit integer for mrb_int; conflict with MRB_INT64 */
@@ -33 +49 @@
 /* argv max size in mrb_funcall */
 //#define MRB_FUNCALL_ARGC_MAX 16
-#define MRB_FUNCALL_ARGC_MAX 8
 
 /* number of object per heap page */
 //#define MRB_HEAP_PAGE_SIZE 1024
-#define MRB_HEAP_PAGE_SIZE 64
 
 /* use segmented list for IV table */
 //#define MRB_USE_IV_SEGLIST
-#define MRB_USE_IV_SEGLIST
 
 /* initial size for IV khash; ignored when MRB_USE_IV_SEGLIST is set */
@@ -58 +71 @@
 /* default size of khash table bucket */
 //#define KHASH_DEFAULT_SIZE 32
-#define KHASH_DEFAULT_SIZE 8
 
 /* allocated memory address alignment */
@@ -65 +77 @@
 /* page size of memory pool */
 //#define POOL_PAGE_SIZE 16000
-#define POOL_PAGE_SIZE 4096
 
 /* initial minimum size for string buffer */
 //#define MRB_STR_BUF_MIN_SIZE 128
-#define MRB_STR_BUF_MIN_SIZE 20
 
 /* arena size */
@@ -76 +86 @@
 /* fixed size GC arena */
 //#define MRB_GC_FIXED_ARENA
-#define MRB_GC_FIXED_ARENA
 
 /* state atexit stack size */