utf-array-short-wchar.c, [...]: Use __CHAR16_TYPE__ and __CHAR32_TYPE__ typedefs.

	* gcc.dg/utf-array-short-wchar.c, gcc.dg/utf-cvt.c,
	gcc.dg/utf-inc-init.c, gcc.dg/utf16-1.c, gcc.dg/utf16-2.c,
	gcc.dg/utf16-3.c, gcc.dg/utf16-4.c, gcc.dg/utf32-1.c,
	gcc.dg/utf32-2.c, gcc.dg/utf32-3.c, gcc.dg/utf32-4.c: Use
	__CHAR16_TYPE__ and __CHAR32_TYPE__ typedefs.

From-SVN: r141656

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c4963d051a865e13a3e4938b115ca221fc291973..d7a3469a61750e76b1f03cdbcdad080afce6aa5e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-06  Joseph Myers  <joseph@codesourcery.com>
+
+       * gcc.dg/utf-array-short-wchar.c, gcc.dg/utf-cvt.c,
+       gcc.dg/utf-inc-init.c, gcc.dg/utf16-1.c, gcc.dg/utf16-2.c,
+       gcc.dg/utf16-3.c, gcc.dg/utf16-4.c, gcc.dg/utf32-1.c,
+       gcc.dg/utf32-2.c, gcc.dg/utf32-3.c, gcc.dg/utf32-4.c: Use
+       __CHAR16_TYPE__ and __CHAR32_TYPE__ typedefs.
+
 2008-11-06  Richard Guenther  <rguenther@suse.de>
 
        * gcc.dg/torture/pr37969.c: New testcase.

diff --git a/gcc/testsuite/gcc.dg/utf-array-short-wchar.c b/gcc/testsuite/gcc.dg/utf-array-short-wchar.c
index 7d8c319d99a203c1460662c4b2ecc2310b307b8c..b63051018623ace22fc8a14b552bc3813e8b28f8 100644 (file)
--- a/gcc/testsuite/gcc.dg/utf-array-short-wchar.c
+++ b/gcc/testsuite/gcc.dg/utf-array-short-wchar.c
@@ -5,8 +5,8 @@
 
 #include <wchar.h>
 
-typedef short unsigned int     char16_t;
-typedef unsigned int           char32_t;
+typedef __CHAR16_TYPE__ char16_t;
+typedef __CHAR32_TYPE__ char32_t;
 
 const char     s_0[]   = "ab";
 const char     s_1[]   = u"ab";        /* { dg-error "from wide string" } */

diff --git a/gcc/testsuite/gcc.dg/utf-cvt.c b/gcc/testsuite/gcc.dg/utf-cvt.c
index 6a69310ceeb6be91464b2d90191f2696c129e0bc..4c82dda2f7d4d9b845780bd8d834c71c8b588e6e 100644 (file)
--- a/gcc/testsuite/gcc.dg/utf-cvt.c
+++ b/gcc/testsuite/gcc.dg/utf-cvt.c
@@ -4,8 +4,8 @@
 /* { dg-excess-errors "short and int are 16bit" { target { "avr-*-*" } } } */
 /* { dg-options "-std=gnu99 -Wall -Wconversion -Wsign-conversion" } */
 
-typedef short unsigned int     char16_t;
-typedef unsigned int           char32_t;
+typedef __CHAR16_TYPE__ char16_t;
+typedef __CHAR32_TYPE__ char32_t;
 
 extern void f_c (char);
 extern void fsc (signed char);

diff --git a/gcc/testsuite/gcc.dg/utf-inc-init.c b/gcc/testsuite/gcc.dg/utf-inc-init.c
index 17d59f3782fde433d0ce71e239236488cb09890a..66e035e2f336ef0ee4a7112411f87f62d317c882 100644 (file)
--- a/gcc/testsuite/gcc.dg/utf-inc-init.c
+++ b/gcc/testsuite/gcc.dg/utf-inc-init.c
@@ -4,8 +4,8 @@
 /* { dg-options "-std=gnu99" } */
 
 typedef __SIZE_TYPE__ size_t;
-typedef short unsigned int char16_t;
-typedef unsigned int char32_t;
+typedef __CHAR16_TYPE__ char16_t;
+typedef __CHAR32_TYPE__ char32_t;
 
 extern int memcmp (const void *, const void *, size_t);
 extern void abort (void);

diff --git a/gcc/testsuite/gcc.dg/utf16-1.c b/gcc/testsuite/gcc.dg/utf16-1.c
index b2c65c0c034148fc4f27d47ea288b6353cf42e64..f2343d2a9458cc7a5e49be707f7194e4d090e631 100644 (file)
--- a/gcc/testsuite/gcc.dg/utf16-1.c
+++ b/gcc/testsuite/gcc.dg/utf16-1.c
@@ -3,7 +3,7 @@
 /* { dg-do run } */
 /* { dg-options "-std=gnu99 -Wall -Werror" } */
 
-typedef short unsigned int char16_t;
+typedef __CHAR16_TYPE__ char16_t;
 
 extern void abort (void);
 

diff --git a/gcc/testsuite/gcc.dg/utf16-2.c b/gcc/testsuite/gcc.dg/utf16-2.c
index ad99a1a7a11bdb656437a51af6e5ccbd78d10cc9..7fc5ef1ab6b041f4c1c70d04cd135cd7aa909a13 100644 (file)
--- a/gcc/testsuite/gcc.dg/utf16-2.c
+++ b/gcc/testsuite/gcc.dg/utf16-2.c
@@ -3,7 +3,7 @@
 /* { dg-do run } */
 /* { dg-options "-std=gnu99 -Wall -Werror" } */
 
-typedef short unsigned int char16_t;
+typedef __CHAR16_TYPE__ char16_t;
 
 extern void abort (void);
 

diff --git a/gcc/testsuite/gcc.dg/utf16-3.c b/gcc/testsuite/gcc.dg/utf16-3.c
index d5e31b205fcc5e1514a9cf522edcee46317fa602..ed2eb408bdb07533e164b18f9337996737b0295d 100644 (file)
--- a/gcc/testsuite/gcc.dg/utf16-3.c
+++ b/gcc/testsuite/gcc.dg/utf16-3.c
@@ -3,7 +3,7 @@
 /* { dg-do run } */
 /* { dg-options "-std=gnu99 -Wall -Werror" } */
 
-typedef short unsigned int char16_t;
+typedef __CHAR16_TYPE__ char16_t;
 
 extern void abort (void);
 

diff --git a/gcc/testsuite/gcc.dg/utf16-4.c b/gcc/testsuite/gcc.dg/utf16-4.c
index 86597b370e1ccacaa5a931456ecc6c706527dc6f..61cb10a1ac304297894505c0a5cf330725c578a5 100644 (file)
--- a/gcc/testsuite/gcc.dg/utf16-4.c
+++ b/gcc/testsuite/gcc.dg/utf16-4.c
@@ -3,7 +3,7 @@
 /* { dg-do compile } */
 /* { dg-options "-std=gnu99" } */
 
-typedef short unsigned int char16_t;
+typedef __CHAR16_TYPE__ char16_t;
 
 char16_t       c0 = u'';               /* { dg-error "empty character" } */
 char16_t       c1 = u'ab';             /* { dg-warning "constant too long" } */

diff --git a/gcc/testsuite/gcc.dg/utf32-1.c b/gcc/testsuite/gcc.dg/utf32-1.c
index 300fd462f26b1e0c060ec6632e638ddb619923c9..5fd45bd67afc0bc18c464be1a82632be58f7e9bd 100644 (file)
--- a/gcc/testsuite/gcc.dg/utf32-1.c
+++ b/gcc/testsuite/gcc.dg/utf32-1.c
@@ -4,7 +4,7 @@
 /* { dg-xfail-run-if "PR36470" { "avr-*-*" } { "*" } { "" } } */
 /* { dg-options "-std=gnu99 -Wall -Werror" } */
 
-typedef unsigned int char32_t;
+typedef __CHAR32_TYPE__ char32_t;
 
 extern void abort (void);
 

diff --git a/gcc/testsuite/gcc.dg/utf32-2.c b/gcc/testsuite/gcc.dg/utf32-2.c
index 0c2853715a00d350fc42263d34190f891b69105c..5672a2021e0c331ca44f3c3882a888c53289ef09 100644 (file)
--- a/gcc/testsuite/gcc.dg/utf32-2.c
+++ b/gcc/testsuite/gcc.dg/utf32-2.c
@@ -4,7 +4,7 @@
 /* { dg-xfail-run-if "PR36470" { "avr-*-*" } { "*" } { "" } } */
 /* { dg-options "-std=gnu99 -Wall -Werror" } */
 
-typedef unsigned int char32_t;
+typedef __CHAR32_TYPE__ char32_t;
 
 extern void abort (void);
 

diff --git a/gcc/testsuite/gcc.dg/utf32-3.c b/gcc/testsuite/gcc.dg/utf32-3.c
index 49991d0882570da16720cbc938fe2e8fc43c8130..3d4dc30846532a5c3c939fad6e058120a38a5f40 100644 (file)
--- a/gcc/testsuite/gcc.dg/utf32-3.c
+++ b/gcc/testsuite/gcc.dg/utf32-3.c
@@ -4,7 +4,7 @@
 /* { dg-xfail-run-if "PR36470" { "avr-*-*" } { "*" } { "" } } */
 /* { dg-options "-std=gnu99 -Wall -Werror" } */
 
-typedef unsigned int char32_t;
+typedef __CHAR32_TYPE__ char32_t;
 
 extern void abort (void);
 

diff --git a/gcc/testsuite/gcc.dg/utf32-4.c b/gcc/testsuite/gcc.dg/utf32-4.c
index 8a2dbdff6b2a11db2f6f23887ed21fce8eda929c..aa7f66a36851761f15a7163c7566341f3261f1c1 100644 (file)
--- a/gcc/testsuite/gcc.dg/utf32-4.c
+++ b/gcc/testsuite/gcc.dg/utf32-4.c
@@ -3,7 +3,7 @@
 /* { dg-do compile } */
 /* { dg-options "-std=gnu99" } */
 
-typedef unsigned int char32_t;
+typedef __CHAR32_TYPE__ char32_t;
 
 char32_t       c0 = U'';               /* { dg-error "empty character" } */
 char32_t       c1 = U'ab';             /* { dg-warning "constant too long" } */