mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
e9ac3573f0
commit
8b6cb6994c
5 changed files with 18 additions and 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
|
||||
|
|
|
@ -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 { \
|
||||
|
|
2
regint.h
2
regint.h
|
@ -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
|
||||
|
||||
|
|
12
st.c
12
st.c
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue