From 2748f58dcee9ed31c8732b16b5cd0b4ffe7f1c38 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 2 Dec 2011 22:14:30 +0000
Subject: [PATCH] * configure.in (UNIVERSAL_INTS): include short int.  fix for 
  test/mkmf.

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

diff --git a/ChangeLog b/ChangeLog
index 30ccdbe1fb..8f618c46a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec  3 07:14:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (UNIVERSAL_INTS): include short int.  fix for
+	  test/mkmf.
+
 Fri Dec  2 15:48:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/bigdecimal/bigdecimal.c (VpAllocReal): reduce extra frac.
diff --git a/configure.in b/configure.in
index e594eea0bf..46462785d5 100644
--- a/configure.in
+++ b/configure.in
@@ -2892,7 +2892,7 @@ if test "${universal_binary-no}" = yes ; then
 	    RUBY_DEFINE_IF([defined __${archs}__], RUBY_PLATFORM_CPU, ["${cpu}"])
 	done
     fi
-    ints='long int'
+    ints='long int short'
     test "$ac_cv_type_long_long" = yes && ints="'long long' $ints"
     AC_SUBST(UNIVERSAL_ARCHNAMES, "${universal_archnames}")
     AC_SUBST(UNIVERSAL_INTS, "${ints}")