* 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.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

7 files changed, 22 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 78d260b45..1ed9b0419 100644
--- a/ChangeLog
+++ b/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>
 
 	* lib/ostruct.rb: a patch from Florian Gross <florgro@gmail.com>
diff --git a/Makefile.in b/Makefile.in
index 6612bc992..9dde68840 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,6 +43,7 @@ LDSHARED = @LIBRUBY_LDSHARED@
 DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) @ARCH_FLAG@
 SOLIBS = @SOLIBS@
 MAINLIBS = @MAINLIBS@
+MINIOBJS = @MINIOBJS@
 
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
 RUBY_SO_NAME=@RUBY_SO_NAME@
diff --git a/bignum.c b/bignum.c
index 33969c400..043e79936 100644
--- a/bignum.c
+++ b/bignum.c
@@ -42,11 +42,11 @@ static VALUE
 bignew_1(klass, len, sign)
     VALUE klass;
     long len;
-    char sign;
+    int sign;
 {
     NEWOBJ(big, struct RBignum);
     OBJSETUP(big, klass, T_BIGNUM);
-    big->sign = sign;
+    big->sign = (char)sign;
     big->len = len;
     big->digits = ALLOC_N(BDIGIT, len);
 
@@ -1112,7 +1112,7 @@ bigsub(x, y)
 static VALUE
 bigadd(x, y, sign)
     VALUE x, y;
-    char sign;
+    int sign;
 {
     VALUE z;
     BDIGIT_DBL num;
diff --git a/configure.in b/configure.in
index 35fd46e7f..336d1c2d1 100644
--- a/configure.in
+++ b/configure.in
@@ -1356,6 +1356,7 @@ case "$target_os" in
 	    LIBRUBY='lib$(RUBY_SO_NAME).a'
 	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
 	fi
+	MINIOBJS=dmydln.o
 	;;
     hpux*)
 	case "$YACC" in
@@ -1364,6 +1365,7 @@ case "$target_os" in
 	    YACC="$YACC -Nl40000 -Nm40000"
 	    ;;
 	esac
+	MINIOBJS=dmydln.o
 	;;
     *)
 	;;
@@ -1396,6 +1398,7 @@ AC_SUBST(COMMON_LIBS)
 AC_SUBST(COMMON_MACROS)
 AC_SUBST(COMMON_HEADERS)
 AC_SUBST(EXPORT_PREFIX)
+AC_SUBST(MINIOBJS)
 
 MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
 MAKEFILES="`echo $MAKEFILES`"
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index b366b2096..03208df11 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -1,5 +1,3 @@
-MINIOBJS = dmydln.o
-
 include Makefile
 
 ENABLE_SHARED=@ENABLE_SHARED@
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb
index c982aa64d..17fb9f2d1 100644
--- a/ext/digest/sha2/extconf.rb
+++ b/ext/digest/sha2/extconf.rb
@@ -17,12 +17,6 @@ have_header("inttypes.h")
 
 have_header("unistd.h")
 
-if try_cpp(<<SRC, $defs.join(' '))
-#include "defs.h"
-#ifdef NO_UINT64_T
-  #error ** Cannot find a 64bit integer type - skipping the SHA2 module.
-#endif
-SRC
-then
+if have_type("uint64_t", "defs.h", $defs.join(' '))
   create_makefile("digest/sha2")
 end
diff --git a/missing/vsnprintf.c b/missing/vsnprintf.c
index d7d9e0be4..6afdfa189 100644
--- a/missing/vsnprintf.c
+++ b/missing/vsnprintf.c
@@ -95,7 +95,7 @@
 # endif
 #endif
 
-#if defined(__hpux) && !defined(__GNUC__)
+#if defined(__hpux) && !defined(__GNUC__) && !defined(__STDC__)
 #define const
 #endif