From: Joern Rennecke <joern.rennecke@embecosm.com>
Date: Mon, 26 Aug 2013 16:39:25 +0000 (+0000)
Subject: avr-stdint.h (INT16_TYPE): Change default to "int".
X-Git-Tag: releases/gcc-4.9.0~4425
X-Git-Url: https://gcc.gnu.org/git/?a=commitdiff_plain;h=907555cee37c75c7b82b173b158379d9f4c547a4;p=gcc.git

avr-stdint.h (INT16_TYPE): Change default to "int".

        * config/avr/avr-stdint.h (INT16_TYPE): Change default to "int".
        (UINT16_TYPE): Change default to "unsigned int".

From-SVN: r202005
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f296c376cbcc..c735059f2352 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-26  Joern Rennecke  <joern.rennecke@embecosm.com>
+
+	* config/avr/avr-stdint.h (INT16_TYPE): Change default to "int".
+	(UINT16_TYPE): Change default to "unsigned int".
+
 2013-08-26  Jan Hubicka  <jh@suse.cz>
 
 	* cgraph.c (cgraph_propagate_frequency): Do not assume that virtual
diff --git a/gcc/config/avr/avr-stdint.h b/gcc/config/avr/avr-stdint.h
index 8e7278f389a1..4137b0689a53 100644
--- a/gcc/config/avr/avr-stdint.h
+++ b/gcc/config/avr/avr-stdint.h
@@ -34,11 +34,11 @@ along with GCC; see the file COPYING3.  If not see
 #define SIG_ATOMIC_TYPE "char"
 
 #define INT8_TYPE "signed char"
-#define INT16_TYPE (INT_TYPE_SIZE == 16 ? "short int" : "long int")
+#define INT16_TYPE (INT_TYPE_SIZE == 16 ? "int" : "long int")
 #define INT32_TYPE (INT_TYPE_SIZE == 16 ? "long int" : "long long int")
 #define INT64_TYPE (INT_TYPE_SIZE == 16 ? "long long int" : 0)
 #define UINT8_TYPE "unsigned char"
-#define UINT16_TYPE (INT_TYPE_SIZE == 16 ? "short unsigned int" : "long unsigned int")
+#define UINT16_TYPE (INT_TYPE_SIZE == 16 ? "unsigned int" : "long unsigned int")
 #define UINT32_TYPE (INT_TYPE_SIZE == 16 ? "long unsigned int" : "long long unsigned int")
 #define UINT64_TYPE (INT_TYPE_SIZE == 16 ? "long long unsigned int" : 0)