Merge pull request #4954 from dearblue/nostdio

Improve configuration guard

mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c

@@ -5,7 +5,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include <ctype.h>
 
 #include <mruby.h>

mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h

@@ -7,7 +7,11 @@
 #define MRDBCONF_H
 
 #ifndef MRB_ENABLE_DEBUG_HOOK
-# error Need 'MRB_ENABLE_DEBUG_HOOK' configuration in your 'build_config.rb'
+# error mruby-bin-debugger need 'MRB_ENABLE_DEBUG_HOOK' configuration in your 'build_config.rb'
+#endif
+
+#ifdef MRB_DISABLE_STDIO
+# error mruby-bin-debugger conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb'
 #endif
 
 /* configuration options: */

mrbgems/mruby-bin-mirb/tools/mirb/mirb.c

@@ -7,6 +7,11 @@
 */
 
 #include <mruby.h>
+
+#ifdef MRB_DISABLE_STDIO
+# error mruby-bin-mirb conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb'
+#endif
+
 #include <mruby/array.h>
 #include <mruby/proc.h>
 #include <mruby/compile.h>
@@ -17,7 +22,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include <ctype.h>
 
 #include <signal.h>

mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c

-#include <stdio.h>
+#include <mruby.h>
+
+#ifdef MRB_DISABLE_STDIO
+# error mruby-bin-mrbc conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb'
+#endif
+
 #include <stdlib.h>
 #include <string.h>
-#include <mruby.h>
 #include <mruby/compile.h>
 #include <mruby/dump.h>
 #include <mruby/proc.h>

mrbgems/mruby-bin-mruby/tools/mruby/mruby.c

-#include <stdio.h>
+#include <mruby.h>
+
+#ifdef MRB_DISABLE_STDIO
+# error mruby-bin-mruby conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb'
+#endif
+
 #include <stdlib.h>
 #include <string.h>
-#include <mruby.h>
 #include <mruby/array.h>
 #include <mruby/compile.h>
 #include <mruby/dump.h>

mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c

-#include <stdio.h>
+#include <mruby.h>
+
+#ifdef MRB_DISABLE_STDIO
+# error mruby-bin-strip conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb'
+#endif
+
 #include <stdlib.h>
 #include <string.h>
-#include <mruby.h>
 #include <mruby/irep.h>
 #include <mruby/dump.h>
 

mrbgems/mruby-io/include/mruby/ext/io.h

@@ -5,6 +5,12 @@
 #ifndef MRUBY_IO_H
 #define MRUBY_IO_H
 
+#include <mruby.h>
+
+#ifdef MRB_DISABLE_STDIO
+# error IO and File conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb'
+#endif
+
 #if defined(__cplusplus)
 extern "C" {
 #endif

mrbgems/mruby-io/src/file_test.c

@@ -28,7 +28,6 @@
 #include <fcntl.h>
 
 #include <errno.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

mrbgems/mruby-io/src/io.c

@@ -55,7 +55,6 @@ typedef mrb_int pid_t;
 #include <fcntl.h>
 
 #include <errno.h>
-#include <stdio.h>
 #include <string.h>
 
 #define OPEN_ACCESS_MODE_FLAGS (O_RDONLY | O_WRONLY | O_RDWR)

mrbgems/mruby-io/test/mruby_io_test.c

@@ -56,7 +56,6 @@ mkdtemp(char *temp)
 #endif
 
 #include <sys/stat.h>
-#include <stdio.h>
 #include <stdlib.h>
 
 #include "mruby.h"

mrbgems/mruby-pack/src/pack.c

@@ -2,7 +2,12 @@
  ** pack.c - Array#pack, String#unpack
  */
 
-#include "mruby.h"
+#include <mruby.h>
+
+#ifdef MRB_DISABLE_STDIO
+# error pack/unpack conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb'
+#endif
+
 #include "mruby/error.h"
 #include "mruby/array.h"
 #include "mruby/class.h"
@@ -13,7 +18,6 @@
 #include <ctype.h>
 #include <errno.h>
 #include <limits.h>
-#include <stdio.h>
 #include <string.h>
 
 struct tmpl {

mrbgems/mruby-print/src/print.c

 #include <mruby.h>
+
+#ifdef MRB_DISABLE_STDIO
+# error print conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb'
+#endif
+
 #include <mruby/string.h>
-#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #if defined(_WIN32)

mrbgems/mruby-socket/test/sockettest.c

-#include <stdio.h>
 #include <stdlib.h>
 
 #include "mruby.h"

mrbgems/mruby-sprintf/src/sprintf.c

@@ -6,8 +6,11 @@
 
 #include <mruby.h>
 
+#ifdef MRB_DISABLE_STDIO
+# error sprintf conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb'
+#endif
+
 #include <limits.h>
-#include <stdio.h>
 #include <string.h>
 #include <mruby/string.h>
 #include <mruby/hash.h>

mrbgems/mruby-time/src/time.c

@@ -14,9 +14,7 @@
 #include <mruby/numeric.h>
 #include <mruby/time.h>
 
-#ifndef MRB_DISABLE_STDIO
-#include <stdio.h>
-#else
+#ifdef MRB_DISABLE_STDIO
 #include <string.h>
 #endif