Skip to content

Commit 655e96f

Browse files
author
matz
committed
2000-05-09
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@682 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 2a34f89 commit 655e96f

40 files changed

+514
-347
lines changed

‎ChangeLog

+62
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,65 @@
1+
Mon May 8 23:47:39 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
2+
3+
* eval.c (rb_callcc): prev & next should be initialized to zero.
4+
5+
Mon May 8 23:17:36 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
6+
7+
* dln.c (dln_init): remove possible buffer overrun. This is
8+
suggested by Aleksi Niemela <aleksi.niemela@cinnober.com>
9+
10+
* dln.c (init_funcname): ditto.
11+
12+
Sat May 6 23:35:47 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
13+
14+
* parse.y (lhs): should allow `obj.Attr = 5' type expression.
15+
16+
Sat May 6 15:46:08 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
17+
18+
* ext/socket/extconf.rb: add a new configure option to force use
19+
of the WIDE Project's getaddrinfo(): --enbale-wide-getaddrinfo.
20+
21+
Fri May 5 21:19:22 2000 MOROHOSHI Akihiko <moro@remus.dti.ne.jp>
22+
23+
* parse.y (yylex): allow '$1foo' and such.
24+
25+
Fri May 5 03:25:15 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
26+
27+
* regex.c (re_compile_fastmap): charset_not for multibyte
28+
characters excluded too many characters.
29+
30+
Tue May 2 13:23:43 2000 Yukihiro Matsumoto <matz@netlab.co.jp>
31+
32+
* eval.c (rb_thread_schedule): little bit more impartial context
33+
switching.
34+
35+
Tue May 2 09:50:03 2000 Katsuyuki Komatsu <komatsu@sarion.co.jp>
36+
37+
* configure.in: add DLDLIBS to set platform specific library
38+
for extensions.
39+
40+
* ext/extmk.rb.in: use @DLDLIBS@ instead of RUBY_PLATFORM choice.
41+
42+
* lib/mkmf.rb: use CONFIG["DLDLIBS"] instead of RUBY_PLATFORM choice.
43+
44+
* config_s.dj: add @DLDLIBS@.
45+
46+
* win32/config.status: ditto.
47+
48+
* win32/ruby.def: regular maintenance.
49+
50+
Mon May 1 23:42:44 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
51+
52+
* configure.in, eval.c: add DLEXT2. now DLEXT on Cygwin is "so".
53+
54+
* defines.h: use dllimport, dllexport for Cygwin 1.1.x.
55+
56+
* ruby.h: ditto.
57+
58+
* cygwin/GNUmakefile.in: ditto.
59+
60+
* ext/Win32API/Win32API.c: directly "call" in asm statement for
61+
gcc 2.95.x or newer.
62+
163
Sat Apr 29 04:58:12 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
264

365
* array.c (rb_ary_unshift_m): performance improvement.

‎Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ OBJS = array.@OBJEXT@ \
8181
version.@OBJEXT@ \
8282
$(MISSING)
8383

84-
all: miniruby$(EXEEXT) @PREP@ rbconfig.rb
84+
all: miniruby$(EXEEXT) @PREP@ rbconfig.rb $(LIBRUBY)
8585
@@MINIRUBY@ -Xext extmk.rb @EXTSTATIC@
8686

8787
miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) dmyext.@OBJEXT@

‎array.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
99
Copyright (C) 1993-2000 Yukihiro Matsumoto
1010
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
11-
Copyright (C) 2000 Information-technology Promotion Agancy, Japan
11+
Copyright (C) 2000 Information-technology Promotion Agency, Japan
1212
1313
**********************************************************************/
1414

‎config_s.dj

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ s%@LIBRUBY_A@%libruby.a%g
5151
s%@LIBRUBYARG@%libruby.a%g
5252
s%@LIBRUBY_SO@%%g
5353
s%@SOLIBS@%%g
54+
s%@DLDLIBS@%%g
5455
s%@srcdir%.%g
5556
s%@arch@%i386-djgpp%g
5657
s%@sitedir@%${prefix}/lib/ruby/site_ruby%g

‎configure

+37-15
Original file line numberDiff line numberDiff line change
@@ -4529,6 +4529,16 @@ EOF
45294529
cat >> confdefs.h <<\EOF
45304530
#define DLEXT ".dll"
45314531
EOF
4532+
;;
4533+
cygwin*) DLEXT=so
4534+
cat >> confdefs.h <<\EOF
4535+
#define DLEXT ".so"
4536+
EOF
4537+
4538+
DLEXT2=dll
4539+
cat >> confdefs.h <<\EOF
4540+
#define DLEXT2 ".dll"
4541+
EOF
45324542
;;
45334543
*) DLEXT=so
45344544
cat >> confdefs.h <<\EOF
@@ -4572,15 +4582,15 @@ fi
45724582
case "$target_os" in
45734583
human*)
45744584
echo $ac_n "checking for _harderr in -lsignal""... $ac_c" 1>&6
4575-
echo "configure:4576: checking for _harderr in -lsignal" >&5
4585+
echo "configure:4586: checking for _harderr in -lsignal" >&5
45764586
ac_lib_var=`echo signal'_'_harderr | sed 'y%./+-%__p_%'`
45774587
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
45784588
echo $ac_n "(cached) $ac_c" 1>&6
45794589
else
45804590
ac_save_LIBS="$LIBS"
45814591
LIBS="-lsignal $LIBS"
45824592
cat > conftest.$ac_ext <<EOF
4583-
#line 4584 "configure"
4593+
#line 4594 "configure"
45844594
#include "confdefs.h"
45854595
/* Override any gcc2 internal prototype to avoid an error. */
45864596
/* We use char because int might match the return type of a gcc2
@@ -4591,7 +4601,7 @@ int main() {
45914601
_harderr()
45924602
; return 0; }
45934603
EOF
4594-
if { (eval echo configure:4595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4604+
if { (eval echo configure:4605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
45954605
rm -rf conftest*
45964606
eval "ac_cv_lib_$ac_lib_var=yes"
45974607
else
@@ -4619,15 +4629,15 @@ else
46194629
fi
46204630

46214631
echo $ac_n "checking for hmemset in -lhmem""... $ac_c" 1>&6
4622-
echo "configure:4623: checking for hmemset in -lhmem" >&5
4632+
echo "configure:4633: checking for hmemset in -lhmem" >&5
46234633
ac_lib_var=`echo hmem'_'hmemset | sed 'y%./+-%__p_%'`
46244634
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
46254635
echo $ac_n "(cached) $ac_c" 1>&6
46264636
else
46274637
ac_save_LIBS="$LIBS"
46284638
LIBS="-lhmem $LIBS"
46294639
cat > conftest.$ac_ext <<EOF
4630-
#line 4631 "configure"
4640+
#line 4641 "configure"
46314641
#include "confdefs.h"
46324642
/* Override any gcc2 internal prototype to avoid an error. */
46334643
/* We use char because int might match the return type of a gcc2
@@ -4638,7 +4648,7 @@ int main() {
46384648
hmemset()
46394649
; return 0; }
46404650
EOF
4641-
if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4651+
if { (eval echo configure:4652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
46424652
rm -rf conftest*
46434653
eval "ac_cv_lib_$ac_lib_var=yes"
46444654
else
@@ -4668,12 +4678,12 @@ fi
46684678
for ac_func in select gettimeofday
46694679
do
46704680
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
4671-
echo "configure:4672: checking for $ac_func" >&5
4681+
echo "configure:4682: checking for $ac_func" >&5
46724682
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
46734683
echo $ac_n "(cached) $ac_c" 1>&6
46744684
else
46754685
cat > conftest.$ac_ext <<EOF
4676-
#line 4677 "configure"
4686+
#line 4687 "configure"
46774687
#include "confdefs.h"
46784688
/* System header to define __stub macros and hopefully few prototypes,
46794689
which can conflict with char $ac_func(); below. */
@@ -4696,7 +4706,7 @@ $ac_func();
46964706
46974707
; return 0; }
46984708
EOF
4699-
if { (eval echo configure:4700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4709+
if { (eval echo configure:4710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
47004710
rm -rf conftest*
47014711
eval "ac_cv_func_$ac_func=yes"
47024712
else
@@ -4721,15 +4731,15 @@ fi
47214731
done
47224732

47234733
echo $ac_n "checking whether PD libc _dtos18 fail to convert big number""... $ac_c" 1>&6
4724-
echo "configure:4725: checking whether PD libc _dtos18 fail to convert big number" >&5
4734+
echo "configure:4735: checking whether PD libc _dtos18 fail to convert big number" >&5
47254735
if eval "test \"`echo '$''{'rb_cv_missing__dtos18'+set}'`\" = set"; then
47264736
echo $ac_n "(cached) $ac_c" 1>&6
47274737
else
47284738
if test "$cross_compiling" = yes; then
47294739
rb_cv_missing__dtos18=no
47304740
else
47314741
cat > conftest.$ac_ext <<EOF
4732-
#line 4733 "configure"
4742+
#line 4743 "configure"
47334743
#include "confdefs.h"
47344744
47354745
#include <stdio.h>
@@ -4741,7 +4751,7 @@ main ()
47414751
}
47424752
47434753
EOF
4744-
if { (eval echo configure:4745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4754+
if { (eval echo configure:4755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
47454755
then
47464756
rb_cv_missing__dtos18=yes
47474757
else
@@ -4763,15 +4773,15 @@ EOF
47634773

47644774
fi
47654775
echo $ac_n "checking whether PD libc fconvert fail to round""... $ac_c" 1>&6
4766-
echo "configure:4767: checking whether PD libc fconvert fail to round" >&5
4776+
echo "configure:4777: checking whether PD libc fconvert fail to round" >&5
47674777
if eval "test \"`echo '$''{'rb_cv_missing_fconvert'+set}'`\" = set"; then
47684778
echo $ac_n "(cached) $ac_c" 1>&6
47694779
else
47704780
if test "$cross_compiling" = yes; then
47714781
rb_cv_missing_fconvert=no
47724782
else
47734783
cat > conftest.$ac_ext <<EOF
4774-
#line 4775 "configure"
4784+
#line 4785 "configure"
47754785
#include "confdefs.h"
47764786
47774787
#include <stdio.h>
@@ -4784,7 +4794,7 @@ main ()
47844794
}
47854795
47864796
EOF
4787-
if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4797+
if { (eval echo configure:4798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
47884798
then
47894799
rb_cv_missing_fconvert=yes
47904800
else
@@ -4869,6 +4879,15 @@ if test "$target_os" = "beos"; then
48694879
esac
48704880
fi
48714881

4882+
case "$target_os" in
4883+
cygwin*|beos*|openstep*|nextstep*|rhapsody*|macos*|os2_emx*)
4884+
DLDLIBS=""
4885+
;;
4886+
*)
4887+
DLDLIBS="-lc"
4888+
;;
4889+
esac
4890+
48724891
LIBRUBY_LDSHARED=$LDSHARED
48734892
LIBRUBY_DLDFLAGS=$DLDFLAGS
48744893
LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
@@ -4981,6 +5000,7 @@ esac
49815000

49825001

49835002

5003+
49845004
ri_prefix=
49855005
test "$program_prefix" != NONE &&
49865006
ri_prefix=$program_prefix
@@ -5250,6 +5270,7 @@ s%@STATIC@%$STATIC%g
52505270
s%@CCDLFLAGS@%$CCDLFLAGS%g
52515271
s%@LDSHARED@%$LDSHARED%g
52525272
s%@DLEXT@%$DLEXT%g
5273+
s%@DLEXT2@%$DLEXT2%g
52535274
s%@STRIP@%$STRIP%g
52545275
s%@EXTSTATIC@%$EXTSTATIC%g
52555276
s%@setup@%$setup%g
@@ -5264,6 +5285,7 @@ s%@LIBRUBY_ALIASES@%$LIBRUBY_ALIASES%g
52645285
s%@LIBRUBY@%$LIBRUBY%g
52655286
s%@LIBRUBYARG@%$LIBRUBYARG%g
52665287
s%@SOLIBS@%$SOLIBS%g
5288+
s%@DLDLIBS@%$DLDLIBS%g
52675289
s%@arch@%$arch%g
52685290
s%@sitedir@%$sitedir%g
52695291
s%@configure_args@%$configure_args%g

‎configure.in

+15
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@ AC_SUBST(STATIC)dnl
403403
AC_SUBST(CCDLFLAGS)dnl
404404
AC_SUBST(LDSHARED)dnl
405405
AC_SUBST(DLEXT)dnl
406+
AC_SUBST(DLEXT2)dnl
406407

407408
STATIC=
408409

@@ -569,6 +570,10 @@ else
569570
AC_DEFINE(DLEXT, ".bundle");;
570571
os2_emx*) DLEXT=dll
571572
AC_DEFINE(DLEXT, ".dll");;
573+
cygwin*) DLEXT=so
574+
AC_DEFINE(DLEXT, ".so")
575+
DLEXT2=dll
576+
AC_DEFINE(DLEXT2, ".dll");;
572577
*) DLEXT=so
573578
AC_DEFINE(DLEXT, ".so");;
574579
esac
@@ -711,6 +716,15 @@ if test "$target_os" = "beos"; then
711716
esac
712717
fi
713718

719+
case "$target_os" in
720+
cygwin*|beos*|openstep*|nextstep*|rhapsody*|macos*|os2_emx*)
721+
DLDLIBS=""
722+
;;
723+
*)
724+
DLDLIBS="-lc"
725+
;;
726+
esac
727+
714728
LIBRUBY_LDSHARED=$LDSHARED
715729
LIBRUBY_DLDFLAGS=$DLDFLAGS
716730
LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
@@ -819,6 +833,7 @@ AC_SUBST(LIBRUBY_ALIASES)
819833
AC_SUBST(LIBRUBY)
820834
AC_SUBST(LIBRUBYARG)
821835
AC_SUBST(SOLIBS)
836+
AC_SUBST(DLDLIBS)
822837

823838
ri_prefix=
824839
test "$program_prefix" != NONE &&

‎cygwin/GNUmakefile.in

-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ miniruby$(EXEEXT): $(RUBYCWDLL)
66

77
$(RUBYCWDLL): $(OBJS) dmyext.o
88
$(LDSHARED) $(DLDFLAGS) -o $(RUBYCWDLL) --output-lib=$(LIBRUBY_SO) --dllname=$(RUBYCWDLL) -Wl,-e,__cygwin_noncygwin_dll_entry@12 --add-stdcall-alias $(OBJS) dmyext.o
9-
@NM@ --extern-only $(OBJS) dmyext.o | sed -n '/^........ [CD] _\(.*\)$$/s//#define \1 (*__imp_\1)/p' >import.h

‎defines.h

+9-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@
3434
#include "win32/win32.h"
3535
#endif
3636

37+
#if defined __CYGWIN__
38+
# if defined USEIMPORTLIB
39+
# define EXTERN extern __declspec(dllimport)
40+
# else
41+
# define EXTERN extern __declspec(dllexport)
42+
# endif
43+
#endif
44+
3745
#ifndef EXTERN
3846
#define EXTERN extern
3947
#endif
@@ -62,7 +70,7 @@
6270
#undef HAVE_SETITIMER
6371
#endif
6472

65-
#if defined(__CYGWIN__) || defined(DJGPP) || defined(__BOW__)
73+
#if defined(DJGPP) || defined(__BOW__)
6674
#undef HAVE_SETITIMER
6775
#endif
6876

‎dir.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
99
Copyright (C) 1993-2000 Yukihiro Matsumoto
1010
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
11-
Copyright (C) 2000 Information-technology Promotion Agancy, Japan
11+
Copyright (C) 2000 Information-technology Promotion Agency, Japan
1212
1313
**********************************************************************/
1414

0 commit comments

Comments
 (0)