From b3d4ab0cd852e8067e6d3f3b525c136ad54e8af4 Mon Sep 17 00:00:00 2001 From: dearblue Date: Sun, 8 Mar 2020 20:49:22 +0900 Subject: Improve conflict error message of mruby-bin-debugger; ref 87d1b2a91 --- mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mrbgems/mruby-bin-debugger/tools/mrdb') diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h index de2f90144..2b445182b 100644 --- a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h +++ b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h @@ -7,7 +7,7 @@ #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 /* configuration options: */ -- cgit v1.2.3 From cc1db2d1172de6187467372ad6f175eccdd97d59 Mon Sep 17 00:00:00 2001 From: dearblue Date: Sun, 8 Mar 2020 21:17:12 +0900 Subject: Remove unnecessary 'stdio.h'; ref #4947 'stdio.h' is included in 'mruby.h' ('mrbconf.h'). However, keep 'stdio.h' used by mruby-test. --- mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c | 1 - mrbgems/mruby-bin-mirb/tools/mirb/mirb.c | 1 - mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c | 1 - mrbgems/mruby-bin-mruby/tools/mruby/mruby.c | 1 - mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c | 1 - mrbgems/mruby-io/src/file_test.c | 1 - mrbgems/mruby-io/src/io.c | 1 - mrbgems/mruby-io/test/mruby_io_test.c | 1 - mrbgems/mruby-pack/src/pack.c | 1 - mrbgems/mruby-print/src/print.c | 1 - mrbgems/mruby-socket/test/sockettest.c | 1 - mrbgems/mruby-sprintf/src/sprintf.c | 1 - mrbgems/mruby-time/src/time.c | 4 +--- 13 files changed, 1 insertion(+), 15 deletions(-) (limited to 'mrbgems/mruby-bin-debugger/tools/mrdb') diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c index d2fa4c856..8fab3c2e8 100644 --- a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c +++ b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdb.c @@ -5,7 +5,6 @@ #include #include -#include #include #include diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c index ac6276dc2..954c44951 100644 --- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c +++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c @@ -17,7 +17,6 @@ #include #include -#include #include #include diff --git a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c index 716b79c88..bda8c7b65 100644 --- a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c +++ b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c index f3593aa48..25780738e 100644 --- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c +++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c b/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c index fb78b0c3b..cb7428f9c 100644 --- a/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c +++ b/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/mrbgems/mruby-io/src/file_test.c b/mrbgems/mruby-io/src/file_test.c index aadd1ac1c..d75cbd598 100644 --- a/mrbgems/mruby-io/src/file_test.c +++ b/mrbgems/mruby-io/src/file_test.c @@ -28,7 +28,6 @@ #include #include -#include #include #include diff --git a/mrbgems/mruby-io/src/io.c b/mrbgems/mruby-io/src/io.c index 41d6b6120..8b0dcb244 100644 --- a/mrbgems/mruby-io/src/io.c +++ b/mrbgems/mruby-io/src/io.c @@ -55,7 +55,6 @@ typedef mrb_int pid_t; #include #include -#include #include #define OPEN_ACCESS_MODE_FLAGS (O_RDONLY | O_WRONLY | O_RDWR) diff --git a/mrbgems/mruby-io/test/mruby_io_test.c b/mrbgems/mruby-io/test/mruby_io_test.c index 581472eaa..44b8acebb 100644 --- a/mrbgems/mruby-io/test/mruby_io_test.c +++ b/mrbgems/mruby-io/test/mruby_io_test.c @@ -56,7 +56,6 @@ mkdtemp(char *temp) #endif #include -#include #include #include "mruby.h" diff --git a/mrbgems/mruby-pack/src/pack.c b/mrbgems/mruby-pack/src/pack.c index 73b6ce635..ca21f7629 100644 --- a/mrbgems/mruby-pack/src/pack.c +++ b/mrbgems/mruby-pack/src/pack.c @@ -13,7 +13,6 @@ #include #include #include -#include #include struct tmpl { diff --git a/mrbgems/mruby-print/src/print.c b/mrbgems/mruby-print/src/print.c index f7f99fc77..04c7c82c6 100644 --- a/mrbgems/mruby-print/src/print.c +++ b/mrbgems/mruby-print/src/print.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #if defined(_WIN32) diff --git a/mrbgems/mruby-socket/test/sockettest.c b/mrbgems/mruby-socket/test/sockettest.c index e9247d030..02eb1e1a8 100644 --- a/mrbgems/mruby-socket/test/sockettest.c +++ b/mrbgems/mruby-socket/test/sockettest.c @@ -1,4 +1,3 @@ -#include #include #include "mruby.h" diff --git a/mrbgems/mruby-sprintf/src/sprintf.c b/mrbgems/mruby-sprintf/src/sprintf.c index 6e4d8fd7e..f8d88e57e 100644 --- a/mrbgems/mruby-sprintf/src/sprintf.c +++ b/mrbgems/mruby-sprintf/src/sprintf.c @@ -7,7 +7,6 @@ #include #include -#include #include #include #include diff --git a/mrbgems/mruby-time/src/time.c b/mrbgems/mruby-time/src/time.c index 5ce43e465..5cd4abe6d 100644 --- a/mrbgems/mruby-time/src/time.c +++ b/mrbgems/mruby-time/src/time.c @@ -14,9 +14,7 @@ #include #include -#ifndef MRB_DISABLE_STDIO -#include -#else +#ifdef MRB_DISABLE_STDIO #include #endif -- cgit v1.2.3 From 67606170e3ca001ecd6885dac957f4bbdb094bad Mon Sep 17 00:00:00 2001 From: dearblue Date: Sun, 8 Mar 2020 21:34:23 +0900 Subject: Add configuration guard for `MRB_DISABLE_STDIO` ref #4576 and ref #4947 * Need MRBAPI functions without `MRB_DISABLE_STDIO`: * mrbgems/mruby-bin-debugger * mrbgems/mruby-bin-mirb * mrbgems/mruby-bin-mrbc * mrbgems/mruby-bin-mruby * mrbgems/mruby-bin-strip * Need `stdio.h`: * mrbgems/mruby-io * mrbgems/mruby-print * Need `snprintf()` in `stdio.h`: * mrbgems/mruby-pack * mrbgems/mruby-sprintf --- mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h | 4 ++++ mrbgems/mruby-bin-mirb/tools/mirb/mirb.c | 5 +++++ mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c | 7 ++++++- mrbgems/mruby-bin-mruby/tools/mruby/mruby.c | 7 ++++++- mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c | 7 ++++++- mrbgems/mruby-io/include/mruby/ext/io.h | 6 ++++++ mrbgems/mruby-pack/src/pack.c | 7 ++++++- mrbgems/mruby-print/src/print.c | 5 +++++ mrbgems/mruby-sprintf/src/sprintf.c | 4 ++++ 9 files changed, 48 insertions(+), 4 deletions(-) (limited to 'mrbgems/mruby-bin-debugger/tools/mrdb') diff --git a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h index 2b445182b..080b0616b 100644 --- a/mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h +++ b/mrbgems/mruby-bin-debugger/tools/mrdb/mrdbconf.h @@ -10,6 +10,10 @@ # 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: */ /* maximum size for command buffer */ #define MAX_COMMAND_LINE 1024 diff --git a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c index 954c44951..fb973207f 100644 --- a/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c +++ b/mrbgems/mruby-bin-mirb/tools/mirb/mirb.c @@ -7,6 +7,11 @@ */ #include + +#ifdef MRB_DISABLE_STDIO +# error mruby-bin-mirb conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb' +#endif + #include #include #include diff --git a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c index bda8c7b65..bdc3925b0 100644 --- a/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c +++ b/mrbgems/mruby-bin-mrbc/tools/mrbc/mrbc.c @@ -1,6 +1,11 @@ +#include + +#ifdef MRB_DISABLE_STDIO +# error mruby-bin-mrbc conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb' +#endif + #include #include -#include #include #include #include diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c index 25780738e..e5c8f3466 100644 --- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c +++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c @@ -1,6 +1,11 @@ +#include + +#ifdef MRB_DISABLE_STDIO +# error mruby-bin-mruby conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb' +#endif + #include #include -#include #include #include #include diff --git a/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c b/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c index cb7428f9c..3d05238d2 100644 --- a/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c +++ b/mrbgems/mruby-bin-strip/tools/mruby-strip/mruby-strip.c @@ -1,6 +1,11 @@ +#include + +#ifdef MRB_DISABLE_STDIO +# error mruby-bin-strip conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb' +#endif + #include #include -#include #include #include diff --git a/mrbgems/mruby-io/include/mruby/ext/io.h b/mrbgems/mruby-io/include/mruby/ext/io.h index c4eccb936..38ed0f222 100644 --- a/mrbgems/mruby-io/include/mruby/ext/io.h +++ b/mrbgems/mruby-io/include/mruby/ext/io.h @@ -5,6 +5,12 @@ #ifndef MRUBY_IO_H #define MRUBY_IO_H +#include + +#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 diff --git a/mrbgems/mruby-pack/src/pack.c b/mrbgems/mruby-pack/src/pack.c index ca21f7629..a5cd7efed 100644 --- a/mrbgems/mruby-pack/src/pack.c +++ b/mrbgems/mruby-pack/src/pack.c @@ -2,7 +2,12 @@ ** pack.c - Array#pack, String#unpack */ -#include "mruby.h" +#include + +#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" diff --git a/mrbgems/mruby-print/src/print.c b/mrbgems/mruby-print/src/print.c index 04c7c82c6..66d070f60 100644 --- a/mrbgems/mruby-print/src/print.c +++ b/mrbgems/mruby-print/src/print.c @@ -1,4 +1,9 @@ #include + +#ifdef MRB_DISABLE_STDIO +# error print conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb' +#endif + #include #include #include diff --git a/mrbgems/mruby-sprintf/src/sprintf.c b/mrbgems/mruby-sprintf/src/sprintf.c index f8d88e57e..558d57173 100644 --- a/mrbgems/mruby-sprintf/src/sprintf.c +++ b/mrbgems/mruby-sprintf/src/sprintf.c @@ -6,6 +6,10 @@ #include +#ifdef MRB_DISABLE_STDIO +# error sprintf conflicts 'MRB_DISABLE_STDIO' configuration in your 'build_config.rb' +#endif + #include #include #include -- cgit v1.2.3