summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/mrbconf.h16
-rw-r--r--include/mruby/numeric.h2
-rw-r--r--mrbgems/mruby-numeric-ext/src/numeric_ext.c1
-rw-r--r--mrbgems/mruby-sprintf/src/sprintf.c1
-rw-r--r--src/array.c14
-rw-r--r--src/class.c5
-rw-r--r--src/codegen.c12
-rw-r--r--src/error.c12
-rw-r--r--src/gc.c20
-rw-r--r--src/hash.c4
-rw-r--r--src/kernel.c4
-rw-r--r--src/load.c11
-rw-r--r--src/numeric.c23
-rw-r--r--src/object.c2
-rw-r--r--src/parse.y9
-rw-r--r--src/pool.c2
-rw-r--r--src/proc.c2
-rw-r--r--src/state.c6
-rw-r--r--src/string.c17
-rw-r--r--src/symbol.c7
-rw-r--r--src/variable.c6
-rw-r--r--src/vm.c22
-rw-r--r--tools/mrbc/mrbc.c10
23 files changed, 107 insertions, 101 deletions
diff --git a/include/mrbconf.h b/include/mrbconf.h
index 988bdf0ad..bd8f6ea80 100644
--- a/include/mrbconf.h
+++ b/include/mrbconf.h
@@ -111,14 +111,6 @@ typedef short mrb_sym;
#define DISABLE_DEBUG
#endif
-#ifndef FALSE
-# define FALSE 0
-#endif
-
-#ifndef TRUE
-# define TRUE 1
-#endif
-
#ifdef _MSC_VER
# include <float.h>
# define inline __inline
@@ -154,4 +146,12 @@ typedef _Bool mrb_bool;
# include <stdio.h>
#endif
+#ifndef FALSE
+# define FALSE 0
+#endif
+
+#ifndef TRUE
+# define TRUE 1
+#endif
+
#endif /* MRUBYCONF_H */
diff --git a/include/mruby/numeric.h b/include/mruby/numeric.h
index 9a5ba449f..4bcb43966 100644
--- a/include/mruby/numeric.h
+++ b/include/mruby/numeric.h
@@ -11,8 +11,6 @@
extern "C" {
#endif
-#include <limits.h>
-
#define POSFIXABLE(f) ((f) <= MRB_INT_MAX)
#define NEGFIXABLE(f) ((f) >= MRB_INT_MIN)
#define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f))
diff --git a/mrbgems/mruby-numeric-ext/src/numeric_ext.c b/mrbgems/mruby-numeric-ext/src/numeric_ext.c
index 1e5d5f5d9..09904c1a9 100644
--- a/mrbgems/mruby-numeric-ext/src/numeric_ext.c
+++ b/mrbgems/mruby-numeric-ext/src/numeric_ext.c
@@ -1,3 +1,4 @@
+#include <limits.h>
#include "mruby.h"
#include "mruby/numeric.h"
diff --git a/mrbgems/mruby-sprintf/src/sprintf.c b/mrbgems/mruby-sprintf/src/sprintf.c
index 1b41eb171..9989abf2f 100644
--- a/mrbgems/mruby-sprintf/src/sprintf.c
+++ b/mrbgems/mruby-sprintf/src/sprintf.c
@@ -6,6 +6,7 @@
#include "mruby.h"
+#include <limits.h>
#include <stdio.h>
#include <string.h>
#include "mruby/string.h"
diff --git a/src/array.c b/src/array.c
index a20fa6daf..88f56f6b4 100644
--- a/src/array.c
+++ b/src/array.c
@@ -4,18 +4,18 @@
** See Copyright Notice in mruby.h
*/
+#ifndef SIZE_MAX
+ /* Some versions of VC++
+ * has SIZE_MAX in stdint.h
+ */
+# include <limits.h>
+#endif
#include "mruby.h"
#include "mruby/array.h"
-#include <string.h>
-#include "mruby/string.h"
#include "mruby/class.h"
+#include "mruby/string.h"
#include "value_array.h"
-/* SIZE_MAX is not supported by VC++. */
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t)-1)
-#endif
-
#define ARY_DEFAULT_LEN 4
#define ARY_SHRINK_RATIO 5 /* must be larger than 2 */
#define ARY_C_MAX_SIZE (SIZE_MAX / sizeof(mrb_value))
diff --git a/src/class.c b/src/class.c
index 030d018bc..9dc7b46d6 100644
--- a/src/class.c
+++ b/src/class.c
@@ -7,13 +7,12 @@
#include "mruby.h"
#include <stdarg.h>
#include <ctype.h>
-#include <string.h>
+#include "mruby/array.h"
#include "mruby/class.h"
+#include "mruby/numeric.h"
#include "mruby/proc.h"
#include "mruby/string.h"
-#include "mruby/numeric.h"
#include "mruby/variable.h"
-#include "mruby/array.h"
#include "error.h"
KHASH_DEFINE(mt, mrb_sym, struct RProc*, 1, kh_int_hash_func, kh_int_hash_equal)
diff --git a/src/codegen.c b/src/codegen.c
index bbce4aac2..cff3b3ce4 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -4,16 +4,16 @@
** See Copyright Notice in mruby.h
*/
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
#include "mruby.h"
-#include "mruby/string.h"
-#include "mruby/irep.h"
#include "mruby/compile.h"
+#include "mruby/irep.h"
#include "mruby/numeric.h"
-#include "opcode.h"
+#include "mruby/string.h"
#include "node.h"
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
+#include "opcode.h"
#include "re.h"
typedef mrb_ast_node node;
diff --git a/src/error.c b/src/error.c
index 8b8b8bd35..19d702da2 100644
--- a/src/error.c
+++ b/src/error.c
@@ -4,19 +4,19 @@
** See Copyright Notice in mruby.h
*/
-#include "mruby.h"
#include <errno.h>
+#include <setjmp.h>
#include <stdarg.h>
#include <stdlib.h>
-#include <setjmp.h>
#include <string.h>
-#include "error.h"
-#include "mruby/variable.h"
-#include "mruby/string.h"
+#include "mruby.h"
#include "mruby/array.h"
#include "mruby/class.h"
-#include "mruby/proc.h"
#include "mruby/irep.h"
+#include "mruby/proc.h"
+#include "mruby/string.h"
+#include "mruby/variable.h"
+#include "error.h"
mrb_value
mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, long len)
diff --git a/src/gc.c b/src/gc.c
index 1c668bbf3..c90e00c89 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -4,21 +4,23 @@
** See Copyright Notice in mruby.h
*/
+#ifndef SIZE_MAX
+ /* Some versions of VC++
+ * has SIZE_MAX in stdint.h
+ */
+# include <limits.h>
+#endif
+#include <string.h>
#include "mruby.h"
-#include "mruby/class.h"
#include "mruby/array.h"
-#include "mruby/string.h"
+#include "mruby/class.h"
+#include "mruby/data.h"
#include "mruby/hash.h"
-#include "mruby/range.h"
-#include <string.h>
#include "mruby/proc.h"
-#include "mruby/data.h"
+#include "mruby/range.h"
+#include "mruby/string.h"
#include "mruby/variable.h"
-#ifndef SIZE_MAX
-#include <limits.h> // for SIZE_MAX
-#endif
-
/*
= Tri-color Incremental Garbage Collection
diff --git a/src/hash.c b/src/hash.c
index 8de7b55c8..e32ee73e1 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -5,10 +5,10 @@
*/
#include "mruby.h"
+#include "mruby/array.h"
+#include "mruby/class.h"
#include "mruby/hash.h"
#include "mruby/khash.h"
-#include "mruby/class.h"
-#include "mruby/array.h"
#include "mruby/string.h"
#include "mruby/variable.h"
diff --git a/src/kernel.c b/src/kernel.c
index ec6408701..f14a94b3a 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -5,10 +5,10 @@
*/
#include "mruby.h"
-#include "mruby/string.h"
-#include "mruby/proc.h"
#include "mruby/array.h"
#include "mruby/class.h"
+#include "mruby/proc.h"
+#include "mruby/string.h"
#include "mruby/variable.h"
#include "error.h"
diff --git a/src/load.c b/src/load.c
index 6a173788a..4a9947e75 100644
--- a/src/load.c
+++ b/src/load.c
@@ -4,13 +4,18 @@
** See Copyright Notice in mruby.h
*/
+#ifndef SIZE_MAX
+ /* Some versions of VC++
+ * has SIZE_MAX in stdint.h
+ */
+# include <limits.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include "mruby/dump.h"
-
-#include "mruby/string.h"
-#include "mruby/proc.h"
#include "mruby/irep.h"
+#include "mruby/proc.h"
+#include "mruby/string.h"
#ifdef ENABLE_STDIO
typedef struct _RiteFILE
diff --git a/src/numeric.c b/src/numeric.c
index 78c23b27b..084243291 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -4,23 +4,22 @@
** See Copyright Notice in mruby.h
*/
-#include "mruby.h"
-#include "mruby/numeric.h"
-#include "mruby/string.h"
-#include "mruby/array.h"
-
-#include <float.h>
-#include <math.h>
#include <assert.h>
-#include <stdlib.h>
-
+#include <float.h>
#if defined(__FreeBSD__) && __FreeBSD__ < 4
-#include <floatingpoint.h>
+# include <floatingpoint.h>
#endif
-
#ifdef HAVE_IEEEFP_H
-#include <ieeefp.h>
+# include <ieeefp.h>
#endif
+#include <limits.h>
+#include <math.h>
+#include <stdlib.h>
+
+#include "mruby.h"
+#include "mruby/array.h"
+#include "mruby/numeric.h"
+#include "mruby/string.h"
#ifdef MRB_USE_FLOAT
#define floor(f) floorf(f)
diff --git a/src/object.c b/src/object.c
index a77903e19..bd88459ae 100644
--- a/src/object.c
+++ b/src/object.c
@@ -5,9 +5,9 @@
*/
#include "mruby.h"
-#include "mruby/string.h"
#include "mruby/class.h"
#include "mruby/numeric.h"
+#include "mruby/string.h"
#include "error.h"
int
diff --git a/src/parse.y b/src/parse.y
index 4826f4336..e8533e092 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -17,16 +17,15 @@
#define YYFREE(o) mrb_free(p->mrb, (o))
#define YYSTACK_USE_ALLOCA 0
+#include <ctype.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
#include "mruby.h"
#include "mruby/compile.h"
#include "mruby/proc.h"
#include "node.h"
-#include <errno.h>
-#include <ctype.h>
-#include <string.h>
-#include <stdlib.h>
-
#define YYLEX_PARAM p
typedef mrb_ast_node node;
diff --git a/src/pool.c b/src/pool.c
index d775669a5..77ac8a69f 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -4,9 +4,9 @@
** See Copyright Notice in mruby.h
*/
-#include "mruby.h"
#include <stddef.h>
#include <string.h>
+#include "mruby.h"
/* configuration section */
/* allocated memory address should be multiple of POOL_ALIGNMENT */
diff --git a/src/proc.c b/src/proc.c
index c4d7ec3ea..c32ce9c7a 100644
--- a/src/proc.c
+++ b/src/proc.c
@@ -5,8 +5,8 @@
*/
#include "mruby.h"
-#include "mruby/proc.h"
#include "mruby/class.h"
+#include "mruby/proc.h"
#include "opcode.h"
static mrb_code call_iseq[] = {
diff --git a/src/state.c b/src/state.c
index e84674447..adc7da06b 100644
--- a/src/state.c
+++ b/src/state.c
@@ -4,12 +4,12 @@
** See Copyright Notice in mruby.h
*/
+#include <stdlib.h>
+#include <string.h>
#include "mruby.h"
+#include "mruby/class.h"
#include "mruby/irep.h"
#include "mruby/variable.h"
-#include "mruby/class.h"
-#include <stdlib.h>
-#include <string.h>
void mrb_init_heap(mrb_state*);
void mrb_init_core(mrb_state*);
diff --git a/src/string.c b/src/string.c
index 4f19663d7..3b57edf54 100644
--- a/src/string.c
+++ b/src/string.c
@@ -4,19 +4,22 @@
** See Copyright Notice in mruby.h
*/
-#include "mruby.h"
-
+#include <ctype.h>
+#ifndef SIZE_MAX
+ /* Some versions of VC++
+ * has SIZE_MAX in stdint.h
+ */
+# include <limits.h>
+#endif
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
-#include "mruby/string.h"
-#include "mruby/class.h"
-#include <ctype.h>
-#include <limits.h>
-#include "mruby/range.h"
+#include "mruby.h"
#include "mruby/array.h"
#include "mruby/class.h"
#include "mruby/numeric.h"
+#include "mruby/range.h"
+#include "mruby/string.h"
#include "re.h"
const char mrb_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
diff --git a/src/symbol.c b/src/symbol.c
index 2612e0d15..55bb4885a 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -4,13 +4,12 @@
** See Copyright Notice in mruby.h
*/
+#include <ctype.h>
+#include <limits.h>
+#include <string.h>
#include "mruby.h"
#include "mruby/khash.h"
-#include <string.h>
-
#include "mruby/string.h"
-#include <ctype.h>
-#include <limits.h>
/* ------------------------------------------------------ */
typedef struct symbol_name {
diff --git a/src/variable.c b/src/variable.c
index 3f9aacc0a..941aaf83e 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -5,12 +5,12 @@
*/
#include "mruby.h"
+#include "mruby/array.h"
#include "mruby/class.h"
+#include "mruby/proc.h"
+#include "mruby/string.h"
#include "mruby/variable.h"
#include "error.h"
-#include "mruby/array.h"
-#include "mruby/string.h"
-#include "mruby/proc.h"
typedef int (iv_foreach_func)(mrb_state*,mrb_sym,mrb_value,void*);
diff --git a/src/vm.c b/src/vm.c
index 336d6476c..596e34961 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -4,24 +4,24 @@
** See Copyright Notice in mruby.h
*/
+#include <string.h>
+#include <setjmp.h>
+#include <stddef.h>
+#include <stdarg.h>
#include "mruby.h"
-#include "opcode.h"
-#include "mruby/irep.h"
-#include "mruby/variable.h"
-#include "mruby/proc.h"
#include "mruby/array.h"
-#include "mruby/string.h"
-#include "mruby/hash.h"
-#include "mruby/range.h"
#include "mruby/class.h"
+#include "mruby/hash.h"
+#include "mruby/irep.h"
#include "mruby/numeric.h"
+#include "mruby/proc.h"
+#include "mruby/range.h"
+#include "mruby/string.h"
+#include "mruby/variable.h"
#include "error.h"
+#include "opcode.h"
#include "value_array.h"
-#include <string.h>
-#include <setjmp.h>
-#include <stddef.h>
-#include <stdarg.h>
#define SET_TRUE_VALUE(r) MRB_SET_VALUE(r, MRB_TT_TRUE, value.i, 1)
#define SET_FALSE_VALUE(r) MRB_SET_VALUE(r, MRB_TT_FALSE, value.i, 1)
diff --git a/tools/mrbc/mrbc.c b/tools/mrbc/mrbc.c
index e74d4bb80..b8c1cf286 100644
--- a/tools/mrbc/mrbc.c
+++ b/tools/mrbc/mrbc.c
@@ -1,10 +1,10 @@
-#include "mruby.h"
-#include "mruby/proc.h"
-#include "mruby/dump.h"
-#include "mruby/compile.h"
#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
+#include <string.h>
+#include "mruby.h"
+#include "mruby/compile.h"
+#include "mruby/dump.h"
+#include "mruby/proc.h"
#define RITEBIN_EXT ".mrb"
#define C_EXT ".c"
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-15 15:29:07 +0000