From 08771defc6bec4eedb0d90f5819212121530e6ad Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 15 Jan 2003 06:29:05 +0000 Subject: [PATCH] * configure.in (ARCHFILE): set even unless --enable-shared on AIX. [ruby-talk:61466] * marshal.c (math.h): should be included after ruby.h on AIX. [ruby-talk:61366] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3342 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ configure.in | 2 +- marshal.c | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3121d66aa3..917755c710 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Jan 15 15:18:38 2003 moumar + + * configure.in (ARCHFILE): set even unless --enable-shared on + AIX. [ruby-talk:61466] + + * marshal.c (math.h): should be included after ruby.h on AIX. + [ruby-talk:61366] + Tue Jan 14 21:47:56 2003 Nobuyoshi Nakada * eval.c (rb_f_require): do not search adding .rb/.so suffixes if diff --git a/configure.in b/configure.in index a4a86010a0..da620ec081 100644 --- a/configure.in +++ b/configure.in @@ -805,6 +805,7 @@ if test "$with_dln_a_out" != yes; then XLDFLAGS='-Wl,-bE:ruby.imp' DLDFLAGS='-brtl -eInit_$(TARGET) -bI:$(topdir)/ruby.imp -bM:SRE -T512 -H512 -lc' LDFLAGS="-brtl" + test $GCC = yes || ARCHFILE="ruby.imp" rb_cv_dlopen=yes ;; human*) DLDFLAGS='' @@ -1091,7 +1092,6 @@ if test "$enable_shared" = 'yes'; then else LIBRUBY_LDSHARED='/usr/ccs/bin/ld' LIBRUBY_DLDFLAGS='-bE:ruby.imp -bM:SRE -bnoentry' - ARCHFILE="ruby.imp" fi LIBRUBYARG_SHARED='-L${libdir} -Wl,lib$(RUBY_SO_NAME).so' SOLIBS='-lm -lc' diff --git a/marshal.c b/marshal.c index 1ea320fb5b..b324e059d5 100644 --- a/marshal.c +++ b/marshal.c @@ -10,13 +10,13 @@ **********************************************************************/ -#include - #include "ruby.h" #include "rubyio.h" #include "st.h" #include "util.h" +#include + #define BITSPERSHORT (2*CHAR_BIT) #define SHORTMASK ((1<