1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* common.mk (OBJS): moved encoding.o from COMMONOBJS.

Browse Source 
* common.mk (dmyencoding.o): added.  [ruby-dev:33099]

* configure.in, {win,bcc}32/Makefile.sub (MINIOBJS): added
  dmyencoding.o.

* dmyencoding.c (rb_locale_charmap): returns nil for miniruby.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-01-14 16:19:02 +00:00
parent fa246559d2
commit 2e8965863d
7 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Tue Jan 15 01:19:00 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (OBJS): moved encoding.o from COMMONOBJS.
* common.mk (dmyencoding.o): added. [ruby-dev:33099]
* configure.in, {win,bcc}32/Makefile.sub (MINIOBJS): added
dmyencoding.o.
* dmyencoding.c (rb_locale_charmap): returns nil for miniruby.
Tue Jan 15 00:05:50 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Tue Jan 15 00:05:50 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (appendline): specifying limit should not generate broken * io.c (appendline): specifying limit should not generate broken

2
bcc32/Makefile.sub
View File

@ -200,7 +200,7 @@ ASMEXT = asm
INSTALLED_LIST= .installed.list INSTALLED_LIST= .installed.list
WINMAINOBJ = winmain.$(OBJEXT) WINMAINOBJ = winmain.$(OBJEXT)
MINIOBJS = dmydln.$(OBJEXT) miniprelude.$(OBJEXT) MINIOBJS = dmydln.$(OBJEXT) dmyencoding.$(OBJEXT) miniprelude.$(OBJEXT)
arch_hdrdir = $(EXTOUT)/include/$(arch) arch_hdrdir = $(EXTOUT)/include/$(arch)
hdrdir = $(srcdir)/include hdrdir = $(srcdir)/include

6
common.mk
View File

@ -24,7 +24,6 @@ COMMONOBJS = array.$(OBJEXT) \
class.$(OBJEXT) \ class.$(OBJEXT) \
compar.$(OBJEXT) \ compar.$(OBJEXT) \
dir.$(OBJEXT) \ dir.$(OBJEXT) \
encoding.$(OBJEXT) \
enum.$(OBJEXT) \ enum.$(OBJEXT) \
enumerator.$(OBJEXT) \ enumerator.$(OBJEXT) \
error.$(OBJEXT) \ error.$(OBJEXT) \
@ -77,6 +76,7 @@ COMMONOBJS = array.$(OBJEXT) \
$(MISSING) $(MISSING)
OBJS = dln.$(OBJEXT) \ OBJS = dln.$(OBJEXT) \
encoding.$(OBJEXT) \
prelude.$(OBJEXT) \ prelude.$(OBJEXT) \
$(COMMONOBJS) $(COMMONOBJS)
@ -428,6 +428,10 @@ dmydln.$(OBJEXT): {$(VPATH)}dmydln.c {$(VPATH)}dln.c {$(VPATH)}ruby.h \
{$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \ {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
{$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}dln.h {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}dln.h
dmyext.$(OBJEXT): {$(VPATH)}dmyext.c dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
dmyencoding.$(OBJEXT): {$(VPATH)}dmyencoding.c {$(VPATH)}encoding.c {$(VPATH)}ruby.h \
{$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
{$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}encoding.h \
{$(VPATH)}oniguruma.h {$(VPATH)}regenc.h {$(VPATH)}encdb.h
encoding.$(OBJEXT): {$(VPATH)}encoding.c {$(VPATH)}ruby.h \ encoding.$(OBJEXT): {$(VPATH)}encoding.c {$(VPATH)}ruby.h \
{$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \ {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
{$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}encoding.h \ {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}encoding.h \

2
configure.in
View File

@ -1608,7 +1608,7 @@ case "$target_os" in
*) *)
;; ;;
esac esac
MINIOBJS="$MINIDLNOBJ" MINIOBJS="$MINIDLNOBJ dmyencoding.o"
case "$build_os" in case "$build_os" in
*msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;; *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;

2
dmyencoding.c Normal file
View File

@ -0,0 +1,2 @@
#define NO_LOCALE_CHARMAP 1
#include "encoding.c"

4
encoding.c
View File

@ -943,7 +943,9 @@ rb_enc_set_default_external(VALUE encoding)
VALUE VALUE
rb_locale_charmap(VALUE klass) rb_locale_charmap(VALUE klass)
{ {
#ifdef HAVE_LANGINFO_H #if defined NO_LOCALE_CHARMAP
return Qnil;
#elif defined HAVE_LANGINFO_H
char *codeset; char *codeset;
codeset = nl_langinfo(CODESET); codeset = nl_langinfo(CODESET);
return rb_str_new2(codeset); return rb_str_new2(codeset);

2
win32/Makefile.sub
View File

@ -257,7 +257,7 @@ REVISION_UP =
!if !defined(WINMAINOBJ) !if !defined(WINMAINOBJ)
WINMAINOBJ = winmain.$(OBJEXT) WINMAINOBJ = winmain.$(OBJEXT)
!endif !endif
MINIOBJS = dmydln.$(OBJEXT) miniprelude.$(OBJEXT) MINIOBJS = dmydln.$(OBJEXT) dmyencoding.$(OBJEXT) miniprelude.$(OBJEXT)
LIBOBJS = acosh.obj crypt.obj erf.obj strlcpy.obj strlcat.obj win32.obj $(LIBOBJS) LIBOBJS = acosh.obj crypt.obj erf.obj strlcpy.obj strlcat.obj win32.obj $(LIBOBJS)
!ifndef COMMON_LIBS !ifndef COMMON_LIBS