diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-01-23 22:32:17 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-01-23 22:32:17 +0900 |
| commit | 410d58a5556e359c481f215a32f3f15286605e20 (patch) | |
| tree | 8556428507b28ddf08ef008da54f312501cecb2c /src/init_ext.c | |
| parent | 538bbfc15f75b9fbde553d2466d4e39c50e5785a (diff) | |
| parent | 10c264d4bb2b97d625522abc4d9b517f408db462 (diff) | |
| download | mruby-410d58a5556e359c481f215a32f3f15286605e20.tar.gz mruby-410d58a5556e359c481f215a32f3f15286605e20.zip | |
resolve conflict
Diffstat (limited to 'src/init_ext.c')
| -rw-r--r-- | src/init_ext.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/init_ext.c b/src/init_ext.c deleted file mode 100644 index 96ee34da1..000000000 --- a/src/init_ext.c +++ /dev/null @@ -1,16 +0,0 @@ -/* -** init_ext.c - initialize extend libraries -** -** See Copyright Notice in mruby.h -*/ - -#include "mruby.h" - -void -mrb_init_ext(mrb_state *mrb) -{ -#ifdef INCLUDE_SOCKET - extern void mrb_init_socket(mrb_state *mrb); - mrb_init_socket(mrb); -#endif -} |