diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-14 04:47:57 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-14 04:47:57 +0000 |
commit | 8b6cb6994c2d2e5a9be49f8a4c78542e86abddda (patch) | |
tree | 3d149f42dc504c7bd1ec4e0666308d3d0208ac7c | |
parent | e9ac3573f0025893957d785aa6f0ce361411c8e0 (diff) |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14226 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | common.mk | 4 | ||||
-rw-r--r-- | ext/json/ext/generator/generator.c | 2 | ||||
-rw-r--r-- | regint.h | 2 | ||||
-rw-r--r-- | st.c | 12 |
5 files changed, 18 insertions, 10 deletions
@@ -1,3 +1,11 @@ +Fri Dec 14 13:47:54 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@ruby-lang.org> * configure.in (RUBY_CHECK_VARTYPE): check if a variable is defined @@ -121,8 +121,8 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) @$(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 diff --git a/ext/json/ext/generator/generator.c b/ext/json/ext/generator/generator.c index 5239cc31d4..6bc37e38cb 100644 --- a/ext/json/ext/generator/generator.c +++ b/ext/json/ext/generator/generator.c @@ -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 { \ @@ -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 @@ -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 { |