From 5a576028607c4bd7b46e8b1d2726329355d4bc03 Mon Sep 17 00:00:00 2001
From: dearblue <dearblue@users.osdn.me>
Date: Sat, 21 Aug 2021 15:42:57 +0900
Subject: Organize the include of header files

- `#include <math.h>` is done in `mruby.h`.
  Eliminate the need to worry about the `MRB_NO_FLOAT` macro.

- Include mruby header files before standard header files.
  If the standard header file is already placed before `mruby.h`, the standard header file added in the future tends to be placed before `mruby.h`.

This change should some reduce the chances of macros that must be defined becoming undefined in C++ or including problematic header files in a particular mruby build configuration.
---
 src/dump.c    | 4 ++--
 src/load.c    | 4 ++--
 src/numeric.c | 6 +-----
 src/string.c  | 3 ---
 src/vm.c      | 3 ---
 5 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/dump.c b/src/dump.c
index 94d5cf74d..4327cb375 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -4,12 +4,12 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include <string.h>
-#include <math.h>
+#include <mruby.h>
 #include <mruby/dump.h>
 #include <mruby/string.h>
 #include <mruby/irep.h>
 #include <mruby/debug.h>
+#include <string.h>
 
 #ifndef MRB_NO_FLOAT
 #include <mruby/endian.h>
diff --git a/src/load.c b/src/load.c
index 83e06f1f8..b5b069fcf 100644
--- a/src/load.c
+++ b/src/load.c
@@ -4,8 +4,7 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include <string.h>
-#include <math.h>
+#include <mruby.h>
 #include <mruby/dump.h>
 #include <mruby/irep.h>
 #include <mruby/proc.h>
@@ -14,6 +13,7 @@
 #include <mruby/error.h>
 #include <mruby/data.h>
 #include <mruby/endian.h>
+#include <string.h>
 
 #if SIZE_MAX < UINT32_MAX
 # error size_t must be at least 32 bits wide
diff --git a/src/numeric.c b/src/numeric.c
index 5fbf9c586..c159c717a 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -4,17 +4,13 @@
 ** See Copyright Notice in mruby.h
 */
 
-#ifndef MRB_NO_FLOAT
-#include <math.h>
-#endif
-#include <string.h>
-
 #include <mruby.h>
 #include <mruby/array.h>
 #include <mruby/numeric.h>
 #include <mruby/string.h>
 #include <mruby/class.h>
 #include <mruby/presym.h>
+#include <string.h>
 
 #ifndef MRB_NO_FLOAT
 #ifdef MRB_USE_FLOAT32
diff --git a/src/string.c b/src/string.c
index 97e115a19..30d1bcab3 100644
--- a/src/string.c
+++ b/src/string.c
@@ -15,9 +15,6 @@
 #include <mruby/string.h>
 #include <mruby/numeric.h>
 #include <mruby/presym.h>
-#ifndef MRB_NO_FLOAT
-#include <math.h>
-#endif
 #include <string.h>
 
 typedef struct mrb_shared_string {
diff --git a/src/vm.c b/src/vm.c
index 57531797c..50ad3b31d 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -20,9 +20,6 @@
 #include <mruby/throw.h>
 #include <mruby/dump.h>
 #include <mruby/presym.h>
-#ifndef MRB_NO_FLOAT
-#include <math.h>
-#endif
 
 #ifdef MRB_NO_STDIO
 #if defined(__cplusplus)
-- 
cgit v1.2.3