Skip to content
This repository has been archived by the owner on Nov 18, 2021. It is now read-only.

Commit

Permalink
* Makefile.in, configure.in (MINIOBJS): miniruby on HP-UX can not load
Browse files Browse the repository at this point in the history
  extension libraries.

* bignum.c (bignew_1, bigadd): K&R style argument actually can't be
  defined as char.

* missing/vsnprintf.c: ANSI compiler supports const keyword.

* ext/digest/sha2/extconf.rb: reject platforms which has inttypes.h
  but no 64bit integer.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Sep 6, 2005
1 parent b93482c commit 7e1363a
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 13 deletions.
13 changes: 13 additions & 0 deletions ChangeLog
@@ -1,3 +1,16 @@
Wed Sep 7 08:22:23 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>

* Makefile.in, configure.in (MINIOBJS): miniruby on HP-UX can not load
extension libraries.

* bignum.c (bignew_1, bigadd): K&R style argument actually can't be
defined as char.

* missing/vsnprintf.c: ANSI compiler supports const keyword.

* ext/digest/sha2/extconf.rb: reject platforms which has inttypes.h
but no 64bit integer.

Mon Sep 5 17:03:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org> Mon Sep 5 17:03:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org>


* lib/ostruct.rb: a patch from Florian Gross <florgro@gmail.com> * lib/ostruct.rb: a patch from Florian Gross <florgro@gmail.com>
Expand Down
1 change: 1 addition & 0 deletions Makefile.in
Expand Up @@ -43,6 +43,7 @@ LDSHARED = @LIBRUBY_LDSHARED@
DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@ DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
SOLIBS = @SOLIBS@ SOLIBS = @SOLIBS@
MAINLIBS = @MAINLIBS@ MAINLIBS = @MAINLIBS@
MINIOBJS = @MINIOBJS@


RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@ RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
RUBY_SO_NAME=@RUBY_SO_NAME@ RUBY_SO_NAME=@RUBY_SO_NAME@
Expand Down
6 changes: 3 additions & 3 deletions bignum.c
Expand Up @@ -42,11 +42,11 @@ static VALUE
bignew_1(klass, len, sign) bignew_1(klass, len, sign)
VALUE klass; VALUE klass;
long len; long len;
char sign; int sign;
{ {
NEWOBJ(big, struct RBignum); NEWOBJ(big, struct RBignum);
OBJSETUP(big, klass, T_BIGNUM); OBJSETUP(big, klass, T_BIGNUM);
big->sign = sign; big->sign = (char)sign;
big->len = len; big->len = len;
big->digits = ALLOC_N(BDIGIT, len); big->digits = ALLOC_N(BDIGIT, len);


Expand Down Expand Up @@ -1112,7 +1112,7 @@ bigsub(x, y)
static VALUE static VALUE
bigadd(x, y, sign) bigadd(x, y, sign)
VALUE x, y; VALUE x, y;
char sign; int sign;
{ {
VALUE z; VALUE z;
BDIGIT_DBL num; BDIGIT_DBL num;
Expand Down
3 changes: 3 additions & 0 deletions configure.in
Expand Up @@ -1356,6 +1356,7 @@ case "$target_os" in
LIBRUBY='lib$(RUBY_SO_NAME).a' LIBRUBY='lib$(RUBY_SO_NAME).a'
LIBRUBYARG='-l$(RUBY_SO_NAME)' LIBRUBYARG='-l$(RUBY_SO_NAME)'
fi fi
MINIOBJS=dmydln.o
;; ;;
hpux*) hpux*)
case "$YACC" in case "$YACC" in
Expand All @@ -1364,6 +1365,7 @@ case "$target_os" in
YACC="$YACC -Nl40000 -Nm40000" YACC="$YACC -Nl40000 -Nm40000"
;; ;;
esac esac
MINIOBJS=dmydln.o
;; ;;
*) *)
;; ;;
Expand Down Expand Up @@ -1396,6 +1398,7 @@ AC_SUBST(COMMON_LIBS)
AC_SUBST(COMMON_MACROS) AC_SUBST(COMMON_MACROS)
AC_SUBST(COMMON_HEADERS) AC_SUBST(COMMON_HEADERS)
AC_SUBST(EXPORT_PREFIX) AC_SUBST(EXPORT_PREFIX)
AC_SUBST(MINIOBJS)


MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`" MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
MAKEFILES="`echo $MAKEFILES`" MAKEFILES="`echo $MAKEFILES`"
Expand Down
2 changes: 0 additions & 2 deletions cygwin/GNUmakefile.in
@@ -1,5 +1,3 @@
MINIOBJS = dmydln.o

include Makefile include Makefile


ENABLE_SHARED=@ENABLE_SHARED@ ENABLE_SHARED=@ENABLE_SHARED@
Expand Down
8 changes: 1 addition & 7 deletions ext/digest/sha2/extconf.rb
Expand Up @@ -17,12 +17,6 @@


have_header("unistd.h") have_header("unistd.h")


if try_cpp(<<SRC, $defs.join(' ')) if have_type("uint64_t", "defs.h", $defs.join(' '))
#include "defs.h"
#ifdef NO_UINT64_T
#error ** Cannot find a 64bit integer type - skipping the SHA2 module.
#endif
SRC
then
create_makefile("digest/sha2") create_makefile("digest/sha2")
end end
2 changes: 1 addition & 1 deletion missing/vsnprintf.c
Expand Up @@ -95,7 +95,7 @@
# endif # endif
#endif #endif


#if defined(__hpux) && !defined(__GNUC__) #if defined(__hpux) && !defined(__GNUC__) && !defined(__STDC__)
#define const #define const
#endif #endif


Expand Down

0 comments on commit 7e1363a

Please sign in to comment.