From f6892cba239b44f37171b3cbf1296943b767d090 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 6 Sep 2005 23:23:04 +0000
Subject: * 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@9089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                  | 13 +++++++++++++
 Makefile.in                |  1 +
 bignum.c                   |  8 ++++----
 configure.in               |  3 +++
 cygwin/GNUmakefile.in      |  2 --
 ext/digest/sha2/extconf.rb |  8 +-------
 missing/vsnprintf.c        |  2 +-
 7 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fda2c9c111..44f20907c2 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 22:28:46 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (stmt, mlhs_node, lhs, arg, method_call): aref_args might be
diff --git a/Makefile.in b/Makefile.in
index dfa63afd5f..ee0a1275e9 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 38254534ad..7c1d97bcde 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);
 
@@ -1036,7 +1036,7 @@ rb_big_uminus(x)
     return bignorm(z);
 }
 
-static VALUE bigadd _((VALUE,VALUE,char));
+static VALUE bigadd _((VALUE,VALUE,int));
 
 /*
  * call-seq:
@@ -1120,7 +1120,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 d6640845c2..03dc06971a 100644
--- a/configure.in
+++ b/configure.in
@@ -1385,6 +1385,7 @@ case "$target_os" in
 	    LIBRUBY='lib$(RUBY_SO_NAME).a'
 	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
 	fi
+	MINIOBJS=dmydln.o
 	;;
     hpux*)
 	case "$YACC" in
@@ -1393,6 +1394,7 @@ case "$target_os" in
 	    YACC="$YACC -Nl40000 -Nm40000"
 	    ;;
 	esac
+	MINIOBJS=dmydln.o
 	;;
     *)
 	;;
@@ -1425,6 +1427,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 b366b2096f..03208df11c 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 fbc5d6c249..894228deca 100644
--- a/ext/digest/sha2/extconf.rb
+++ b/ext/digest/sha2/extconf.rb
@@ -19,12 +19,6 @@ have_header("unistd.h")
 
 $preload = %w[digest]
 
-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 633864d9b1..4d0cb34131 100644
--- a/missing/vsnprintf.c
+++ b/missing/vsnprintf.c
@@ -101,7 +101,7 @@
 # endif
 #endif
 
-#if defined(__hpux) && !defined(__GNUC__)
+#if defined(__hpux) && !defined(__GNUC__) && !defined(__STDC__)
 #define const
 #endif
 
-- 
cgit v1.2.3