nobu	2008-01-15 01:19:02 +0900 (Tue, 15 Jan 2008)

  New Revision: 15052

  Added files:
    trunk/dmyencoding.c
  Modified files:
    trunk/ChangeLog
    trunk/bcc32/Makefile.sub
    trunk/common.mk
    trunk/configure.in
    trunk/encoding.c
    trunk/win32/Makefile.sub

  Log:
    * 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.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15052&r2=15051&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/Makefile.sub?r1=15052&r2=15051&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bcc32/Makefile.sub?r1=15052&r2=15051&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=15052&r2=15051&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/dmyencoding.c?revision=15052&view=markup
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/dmyencoding.c?r1=15052&r2=15051&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=15052&r2=15051&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=15052&r2=15051&diff_format=u

Index: encoding.c
===================================================================
--- encoding.c	(revision 15051)
+++ encoding.c	(revision 15052)
@@ -943,7 +943,9 @@
 VALUE
 rb_locale_charmap(VALUE klass)
 {
-#ifdef HAVE_LANGINFO_H
+#if defined NO_LOCALE_CHARMAP
+    return Qnil;
+#elif defined HAVE_LANGINFO_H
     char *codeset;
     codeset = nl_langinfo(CODESET);
     return rb_str_new2(codeset);
Index: configure.in
===================================================================
--- configure.in	(revision 15051)
+++ configure.in	(revision 15052)
@@ -1608,7 +1608,7 @@
     *)
 	;;
 esac
-MINIOBJS="$MINIDLNOBJ"
+MINIOBJS="$MINIDLNOBJ dmyencoding.o"
 
 case "$build_os" in
   *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15051)
+++ ChangeLog	(revision 15052)
@@ -1,3 +1,14 @@
+Tue Jan 15 01:19:00 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* io.c (appendline): specifying limit should not generate broken
Index: common.mk
===================================================================
--- common.mk	(revision 15051)
+++ common.mk	(revision 15052)
@@ -24,7 +24,6 @@
 		class.$(OBJEXT) \
 		compar.$(OBJEXT) \
 		dir.$(OBJEXT) \
-		encoding.$(OBJEXT) \
 		enum.$(OBJEXT) \
 		enumerator.$(OBJEXT) \
 		error.$(OBJEXT) \
@@ -77,6 +76,7 @@
 		$(MISSING)
 
 OBJS          = dln.$(OBJEXT) \
+		encoding.$(OBJEXT) \
 		prelude.$(OBJEXT) \
 		$(COMMONOBJS)
 
@@ -428,6 +428,10 @@
   {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
   {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}dln.h
 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 \
   {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
   {$(VPATH)}intern.h {$(VPATH)}st.h {$(VPATH)}encoding.h \
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 15051)
+++ win32/Makefile.sub	(revision 15052)
@@ -257,7 +257,7 @@
 !if !defined(WINMAINOBJ)
 WINMAINOBJ    = winmain.$(OBJEXT)
 !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)
 
 !ifndef COMMON_LIBS
Index: dmyencoding.c
===================================================================
--- dmyencoding.c	(revision 0)
+++ dmyencoding.c	(revision 15052)
@@ -0,0 +1,2 @@
+#define NO_LOCALE_CHARMAP 1
+#include "encoding.c"

Property changes on: dmyencoding.c
___________________________________________________________________
Name: svn:eol-style
   + LF
Name: svn:keywords
   + Author Date Id Revision

Index: bcc32/Makefile.sub
===================================================================
--- bcc32/Makefile.sub	(revision 15051)
+++ bcc32/Makefile.sub	(revision 15052)
@@ -200,7 +200,7 @@
 INSTALLED_LIST= .installed.list
 
 WINMAINOBJ    = winmain.$(OBJEXT)
-MINIOBJS      = dmydln.$(OBJEXT) miniprelude.$(OBJEXT)
+MINIOBJS      = dmydln.$(OBJEXT) dmyencoding.$(OBJEXT) miniprelude.$(OBJEXT)
 
 arch_hdrdir = $(EXTOUT)/include/$(arch)
 hdrdir = $(srcdir)/include

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/