From: Joseph Myers Date: Thu, 6 Nov 2008 22:16:38 +0000 (+0000) Subject: utf-array-short-wchar.c, [...]: Use __CHAR16_TYPE__ and __CHAR32_TYPE__ typedefs. X-Git-Tag: releases/gcc-4.4.0~1775 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad914b4ea86a50ecaf357d1f171df3671e9a3a9d;p=thirdparty%2Fgcc.git 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 c4963d051a86..d7a3469a6175 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 7d8c319d99a2..b63051018623 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 6a69310ceeb6..4c82dda2f7d4 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 17d59f3782fd..66e035e2f336 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 b2c65c0c0341..f2343d2a9458 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 ad99a1a7a11b..7fc5ef1ab6b0 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 d5e31b205fcc..ed2eb408bdb0 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 86597b370e1c..61cb10a1ac30 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 300fd462f26b..5fd45bd67afc 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 0c2853715a00..5672a2021e0c 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 49991d088257..3d4dc3084653 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 8a2dbdff6b2a..aa7f66a36851 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" } */