Skip to content

Commit b960127

Browse files
author
ts
committed
Load mmap-0.2.0 into trunk.
git-svn-id: file:///home/knu/repos/ts/mmap/trunk@22 20c87e7c-833f-de11-9cfd-0015170b777a
1 parent 4e1f0c3 commit b960127

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

Changes

+4
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,7 @@
4949

5050
* String#slice! was modified in 1.6.8
5151
* added ::new(IO)
52+
53+
--- 0.2.0
54+
55+
* adapted for 1.8.0

extconf.rb

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
require "mkmf"
2+
3+
$stat_lib = if CONFIG.key?("LIBRUBYARG_STATIC")
4+
$LDFLAGS += " -L#{CONFIG['libdir']}"
5+
CONFIG["LIBRUBYARG_STATIC"]
6+
else
7+
"-lruby"
8+
end
9+
$static ||= nil
10+
211
create_makefile "mmap"
12+
313
begin
414
make = open("Makefile", "a")
515
make.puts "\ntest: $(DLLIB)"
@@ -12,7 +22,7 @@
1222
1323
unknown: $(DLLIB)
1424
\t@echo "main() {}" > /tmp/a.c
15-
\t$(CC) -static /tmp/a.c $(OBJS) $(CPPFLAGS) $(DLDFLAGS) -lruby #{CONFIG["LIBS"]} $(LIBS) $(LOCAL_LIBS)
25+
\t$(CC) -static /tmp/a.c $(OBJS) $(CPPFLAGS) $(DLDFLAGS) #$stat_lib #{CONFIG["LIBS"]} $(LIBS) $(LOCAL_LIBS)
1626
\t@-rm /tmp/a.c a.out
1727
1828
%.html: %.rd

mmap.c

+7-4
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,8 @@ mm_i_options(arg, obj)
312312

313313
#if RUBY_VERSION_CODE >= 172
314314
static VALUE
315-
mm_s_alloc(argc, argv, obj)
316-
int argc;
317-
VALUE *argv, obj;
315+
mm_s_alloc(obj)
316+
VALUE obj;
318317
{
319318
VALUE res;
320319
mm_mmap *t_mm;
@@ -1719,7 +1718,11 @@ Init_mmap()
17191718
rb_include_module(mm_cMap, rb_mEnumerable);
17201719

17211720
#if RUBY_VERSION_CODE >= 172
1722-
rb_define_singleton_method(mm_cMap, "allocate", mm_s_alloc, -1);
1721+
#if RUBY_VERSION_CODE >= 180
1722+
rb_define_alloc_func(mm_cMap, mm_s_alloc);
1723+
#else
1724+
rb_define_singleton_method(mm_cMap, "allocate", mm_s_alloc, 0);
1725+
#endif
17231726
#else
17241727
rb_define_singleton_method(mm_cMap, "new", mm_s_new, -1);
17251728
#endif

0 commit comments

Comments
 (0)