From ad0e8beb8cd96c23a37acb4841d3ef41fbd8cc08 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 2 Mar 2015 05:44:59 +0000
Subject: configure.in: remove extra unsigned

* configure.in (RUBY_REPLACE_TYPE): restore unsigned type from
  cached variable only if the target type is not available.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49803 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog    |  5 +++++
 configure.in | 16 +++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8e85676791..f5035efebc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar  2 14:44:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_REPLACE_TYPE): restore unsigned type from
+	  cached variable only if the target type is not available.
+
 Mon Mar  2 13:04:27 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* signal.c (sig_signame): return nil if the argument is a valid
diff --git a/configure.in b/configure.in
index 3ae38da6e0..4f2d1b7a68 100644
--- a/configure.in
+++ b/configure.in
@@ -1475,11 +1475,17 @@ AC_DEFUN([RUBY_REPLACE_TYPE], [dnl
 	  [
 	    t=INT])
 	rb_cv_[$1]_convertible=${u}${t}])
-    AS_CASE(["${rb_cv_[$1]_convertible}"],
-	    [*LL], [n="long long"],
-	    [*LONG], [n="long"],
-	    [n="int"])
-    AS_CASE("${rb_cv_[$1]_convertible}", [U*], [u=+1 n="unsigned $n"], [u=-1])
+    if test "${AS_TR_SH(ac_cv_type_[$1])}" = "yes"; then
+	n="$1"
+    else
+	AS_CASE(["${rb_cv_[$1]_convertible}"],
+		[*LL], [n="long long"],
+		[*LONG], [n="long"],
+		[n="int"])
+	AS_CASE(["${rb_cv_[$1]_convertible}"],
+		[U*], [n="unsigned $n"])
+    fi
+    AS_CASE("${rb_cv_[$1]_convertible}", [U*], [u=+1], [u=-1])
     AC_DEFINE_UNQUOTED(rb_[$1], $n)
     AC_DEFINE_UNQUOTED([SIGNEDNESS_OF_]AS_TR_CPP($1), $u)
     AC_DEFINE_UNQUOTED([$3]2NUM[(v)], [${rb_cv_[$1]_convertible}2NUM(v)])
-- 
cgit v1.2.3