diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-07-11 08:22:18 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-07-11 08:22:18 +0000 |
| commit | 350aee1bdacbc128730a86b22e93001a99b785dd (patch) | |
| tree | ca2c2a97c4a87726d0d70fed72954eea67110189 /ext | |
| parent | 5726b69317a7767c2b303731988f98072c578aca (diff) | |
| download | ruby-350aee1bdacbc128730a86b22e93001a99b785dd.tar.gz ruby-350aee1bdacbc128730a86b22e93001a99b785dd.tar.xz ruby-350aee1bdacbc128730a86b22e93001a99b785dd.zip | |
* string.c (rb_str_slice_bang): if there's no corresponding
substring, slice! should return nil without exception.
* array.c (rb_ary_insert): type fixed.
* string.c (rb_str_split_m): accept separator value nil as well.
* string.c (rb_str_become): was leaking memory.
* class.c (rb_include_module): should not alter other
classes/modules by inclusion. by this fix, local order may not
be preserved for some cases.
* class.c (include_class_new): module may be T_ICLASS; retrieve
original module information.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/dl/depend | 8 | ||||
| -rw-r--r-- | ext/dl/dl.h | 10 |
2 files changed, 16 insertions, 2 deletions
diff --git a/ext/dl/depend b/ext/dl/depend index 7f1c2ecb1..3d62fe342 100644 --- a/ext/dl/depend +++ b/ext/dl/depend @@ -25,9 +25,13 @@ allclean: distclean $(OBJS): ./dlconfig.h -sym.o: call.func +sym.o: dl.h call.func -dl.o: callback.func cbtable.func +dl.o: dl.h callback.func cbtable.func + +ptr.o: dl.h + +handle.o: dl.h call.func: $(srcdir)/mkcall.rb ./dlconfig.rb @echo "Generating call.func" diff --git a/ext/dl/dl.h b/ext/dl/dl.h index 9554ea91b..19ec859f6 100644 --- a/ext/dl/dl.h +++ b/ext/dl/dl.h @@ -15,6 +15,16 @@ #if defined(HAVE_DLFCN_H) # include <dlfcn.h> +# /* some stranger systems may not define all of these */ +#ifndef RTLD_LAZY +#define RTLD_LAZY 0 +#endif +#ifndef RTLD_GLOBAL +#define RTLD_GLOBAL 0 +#endif +#ifndef RTLD_NOW +#define RTLD_NOW 0 +#endif #else # if defined(HAVE_WINDOWS_H) # include <windows.h> |