summaryrefslogtreecommitdiffhomepage
path: root/include/mrbconf.h
diff options
context:
space:
mode:
authorDaniel Bovensiepen <[email protected]>2012-09-19 09:36:35 +0900
committerDaniel Bovensiepen <[email protected]>2012-09-19 09:36:35 +0900
commitc0ff4fed3b721ae5892f3644e57b51551a612c0d (patch)
tree272807d44ec0025a2f64ef79301f3131630f4642 /include/mrbconf.h
parent17c877011d2ecaba8a904f1b5b87a4aa2f5a82bb (diff)
parent1afda93c7ae70d85e713a2a44e9c32dd604f1a5a (diff)
downloadmruby-c0ff4fed3b721ae5892f3644e57b51551a612c0d.tar.gz
mruby-c0ff4fed3b721ae5892f3644e57b51551a612c0d.zip
Merge remote-tracking branch 'upstream/master' into mrbgems
Diffstat (limited to 'include/mrbconf.h')
-rw-r--r--include/mrbconf.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/mrbconf.h b/include/mrbconf.h
index b4332adcd..d7ccb261d 100644
--- a/include/mrbconf.h
+++ b/include/mrbconf.h
@@ -62,11 +62,10 @@ typedef double mrb_float;
#ifdef MRB_NAN_BOXING
typedef int32_t mrb_int;
-typedef int32_t mrb_sym;
#else
typedef int mrb_int;
-typedef intptr_t mrb_sym;
#endif
+typedef short mrb_sym;
/* define ENABLE_XXXX from DISABLE_XXX */
#ifndef DISABLE_REGEXP