nobu	2007-12-14 13:47:57 +0900 (Fri, 14 Dec 2007)

  New Revision: 14226

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/ext/json/ext/generator/generator.c
    trunk/regint.h
    trunk/st.c

  Log:
    * common.mk (ruby.imp): fix for circular dependency.  a patch from
      Yutaka Kanemoto <kinpoco AT gmail.com> in [ruby-dev:32590].
    
    * regint.h, st.c, ext/json/ext/generator/generator.c: suppress
      warnings on AIX.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/json/ext/generator/generator.c?r1=14226&r2=14225
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14226&r2=14225
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/regint.h?r1=14226&r2=14225
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/st.c?r1=14226&r2=14225
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=14226&r2=14225

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14225)
+++ ChangeLog	(revision 14226)
@@ -1,3 +1,11 @@
+Fri Dec 14 13:47:54 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk (ruby.imp): fix for circular dependency.  a patch from
+	  Yutaka Kanemoto <kinpoco AT gmail.com> in [ruby-dev:32590].
+
+	* regint.h, st.c, ext/json/ext/generator/generator.c: suppress
+	  warnings on AIX.
+
 Fri Dec 14 12:36:35 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (RUBY_CHECK_VARTYPE): check if a variable is defined
Index: st.c
===================================================================
--- st.c	(revision 14225)
+++ st.c	(revision 14226)
@@ -2,12 +2,6 @@
 
 /* static	char	sccsid[] = "@(#) st.c 5.1 89/12/14 Crucible"; */
 
-#include <stdio.h>
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#include <string.h>
-
 #ifdef NOT_RUBY
 #include "regint.h"
 #include "st.h"
@@ -17,6 +11,12 @@
 #include "ruby/st.h"
 #endif
 
+#include <stdio.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#include <string.h>
+
 typedef struct st_table_entry st_table_entry;
 
 struct st_table_entry {
Index: common.mk
===================================================================
--- common.mk	(revision 14225)
+++ common.mk	(revision 14226)
@@ -121,8 +121,8 @@
 	@$(RM) $@
 	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
 
-ruby.imp: $(OBJS)
-	@$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
+ruby.imp: $(COMMONOBJS)
+	@$(NM) -Pgp $(COMMONOBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
 
 install: install-nodoc $(RDOCTARGET)
 install-all: install-nodoc install-doc
Index: regint.h
===================================================================
--- regint.h	(revision 14225)
+++ regint.h	(revision 14226)
@@ -194,7 +194,7 @@
 #include <stdlib.h>
 #endif
 
-#if defined(HAVE_ALLOCA_H) && !defined(__GNUC__)
+#if defined(HAVE_ALLOCA_H) && (defined(_AIX) || !defined(__GNUC__))
 #include <alloca.h>
 #endif
 
Index: ext/json/ext/generator/generator.c
===================================================================
--- ext/json/ext/generator/generator.c	(revision 14225)
+++ ext/json/ext/generator/generator.c	(revision 14226)
@@ -1,9 +1,9 @@
 /* vim: set cin et sw=4 ts=4: */
 
-#include <string.h>
 #include "ruby.h"
 #include "ruby/st.h"
 #include "unicode.h"
+#include <string.h>
 #include <math.h>
 
 #define check_max_nesting(state, depth) do {                                   \

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