From ad914b4ea86a50ecaf357d1f171df3671e9a3a9d Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 6 Nov 2008 22:16:38 +0000 Subject: [PATCH] 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 --- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/gcc.dg/utf-array-short-wchar.c | 4 ++-- gcc/testsuite/gcc.dg/utf-cvt.c | 4 ++-- gcc/testsuite/gcc.dg/utf-inc-init.c | 4 ++-- gcc/testsuite/gcc.dg/utf16-1.c | 2 +- gcc/testsuite/gcc.dg/utf16-2.c | 2 +- gcc/testsuite/gcc.dg/utf16-3.c | 2 +- gcc/testsuite/gcc.dg/utf16-4.c | 2 +- gcc/testsuite/gcc.dg/utf32-1.c | 2 +- gcc/testsuite/gcc.dg/utf32-2.c | 2 +- gcc/testsuite/gcc.dg/utf32-3.c | 2 +- gcc/testsuite/gcc.dg/utf32-4.c | 2 +- 12 files changed, 22 insertions(+), 14 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c4963d0..d7a3469 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2008-11-06 Joseph Myers + + * 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 * 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 7d8c319..b630510 100644 --- 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 -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 6a69310..4c82dda 100644 --- 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 17d59f3..66e035e 100644 --- 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 b2c65c0..f2343d2 100644 --- 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 ad99a1a..7fc5ef1 100644 --- 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 d5e31b2..ed2eb40 100644 --- 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 86597b3..61cb10a 100644 --- 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 300fd46..5fd45bd 100644 --- 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 0c28537..5672a20 100644 --- 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 49991d0..3d4dc30 100644 --- 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 8a2dbdf..aa7f66a 100644 --- 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" } */ -- 2.7.4