usa	2007-08-30 19:42:09 +0900 (Thu, 30 Aug 2007)

  New Revision: 13320

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/regenc.h

  Log:
    * regenc.h: check RUBY_EXTERN before including config.h and defines.h
    
    * common.mk: update header dependency.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13320&r2=13319
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/regenc.h?r1=13320&r2=13319
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=13320&r2=13319

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13319)
+++ ChangeLog	(revision 13320)
@@ -1,3 +1,9 @@
+Thu Aug 30 19:40:33 2007  NAKAMURA Usaku  <usa@r...>
+
+	* regenc.h: check RUBY_EXTERN before including config.h and defines.h
+
+	* common.mk: update header dependency.
+
 Thu Aug 30 14:06:50 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* proc.c (rb_obj_define_method): reverted.  [ruby-talk:266637]
Index: regenc.h
===================================================================
--- regenc.h	(revision 13319)
+++ regenc.h	(revision 13320)
@@ -29,8 +29,10 @@
  * SUCH DAMAGE.
  */
 #ifndef REGINT_H
+#ifndef RUBY_EXTERN
 #include "ruby/config.h"
 #include "ruby/defines.h"
+#endif
 #ifdef ONIG_ESCAPE_UCHAR_COLLISION
 #undef ONIG_ESCAPE_UCHAR_COLLISION
 #endif
Index: common.mk
===================================================================
--- common.mk	(revision 13319)
+++ common.mk	(revision 13320)
@@ -384,7 +384,7 @@
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
   {$(VPATH)}util.h {$(VPATH)}st.h
 ascii.$(OBJEXT): {$(VPATH)}ascii.c {$(VPATH)}regenc.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}config.h
+  {$(VPATH)}oniguruma.h {$(VPATH)}config.h {$(VPATH)}defines.h
 bignum.$(OBJEXT): {$(VPATH)}bignum.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
 class.$(OBJEXT): {$(VPATH)}class.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
@@ -402,7 +402,9 @@
   {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
   {$(VPATH)}dln.h
 dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
-encoding.$(OBJEXT): {$(VPATH)}encoding.c {$(VPATH)}encoding.h 
+encoding.$(OBJEXT): {$(VPATH)}encoding.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
+  {$(VPATH)}defines.h {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h \
+  {$(VPATH)}regenc.h
 enum.$(OBJEXT): {$(VPATH)}enum.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
   {$(VPATH)}node.h {$(VPATH)}util.h
@@ -414,7 +416,7 @@
   {$(VPATH)}vm_core.h {$(VPATH)}id.h {$(VPATH)}node.h {$(VPATH)}debug.h \
   {$(VPATH)}thread_$(THREAD_MODEL).h
 euc_jp.$(OBJEXT): {$(VPATH)}euc_jp.c {$(VPATH)}regenc.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}config.h
+  {$(VPATH)}oniguruma.h {$(VPATH)}config.h {$(VPATH)}defines.h
 eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}eval_error.ci {$(VPATH)}eval_intern.h \
   {$(VPATH)}eval_method.ci {$(VPATH)}eval_safe.ci {$(VPATH)}eval_jump.ci \
   {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}vm_core.h {$(VPATH)}id.h \
@@ -464,7 +466,7 @@
 parse.$(OBJEXT): {$(VPATH)}parse.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
   {$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}oniguruma.h \
-  {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c
+  {$(VPATH)}regenc.h {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c
 prec.$(OBJEXT): {$(VPATH)}prec.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
 proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \
@@ -492,7 +494,7 @@
 regenc.$(OBJEXT): {$(VPATH)}regenc.c {$(VPATH)}regint.h \
   {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h {$(VPATH)}ruby.h \
   {$(VPATH)}defines.h {$(VPATH)}missing.h {$(VPATH)}intern.h \
-  {$(VPATH)}signal.h
+  {$(VPATH)}signal.h {$(VPATH)}config.h
 regerror.$(OBJEXT): {$(VPATH)}regerror.c {$(VPATH)}regint.h \
   {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h {$(VPATH)}config.h \
   {$(VPATH)}ruby.h {$(VPATH)}defines.h {$(VPATH)}missing.h \
@@ -517,7 +519,7 @@
   {$(VPATH)}debug.h {$(VPATH)}vm_opts.h \
   {$(VPATH)}thread_$(THREAD_MODEL).h
 sjis.$(OBJEXT): {$(VPATH)}sjis.c {$(VPATH)}regenc.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}config.h
+  {$(VPATH)}oniguruma.h {$(VPATH)}config.h {$(VPATH)}defines.h
 sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
   {$(VPATH)}re.h {$(VPATH)}regex.h {$(VPATH)}oniguruma.h \
@@ -543,9 +545,9 @@
 time.$(OBJEXT): {$(VPATH)}time.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
 unicode.$(OBJEXT): {$(VPATH)}unicode.c {$(VPATH)}regenc.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}config.h
+  {$(VPATH)}oniguruma.h {$(VPATH)}config.h {$(VPATH)}defines.h
 utf8.$(OBJEXT): {$(VPATH)}utf8.c {$(VPATH)}regenc.h \
-  {$(VPATH)}oniguruma.h {$(VPATH)}config.h
+  {$(VPATH)}oniguruma.h {$(VPATH)}config.h {$(VPATH)}defines.h
 util.$(OBJEXT): {$(VPATH)}util.c {$(VPATH)}ruby.h {$(VPATH)}config.h \
   {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
   {$(VPATH)}util.h

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