diff options
| author | kan <kan@FreeBSD.org> | 2005-06-03 04:02:20 +0000 |
|---|---|---|
| committer | kan <kan@FreeBSD.org> | 2005-06-03 04:02:20 +0000 |
| commit | 17d0aa6eb2050531034d5fd72e59df4a5ebdd64e (patch) | |
| tree | dc04596dd574786e48bfdb08626f8333c6aa3e3c /contrib/gcc/c.opt | |
| parent | ff647fd5f2288c34f81130b9002d20a025a5a388 (diff) | |
| download | FreeBSD-src-17d0aa6eb2050531034d5fd72e59df4a5ebdd64e.zip FreeBSD-src-17d0aa6eb2050531034d5fd72e59df4a5ebdd64e.tar.gz | |
Merge conflicts for GCC 3.4.4.
Diffstat (limited to 'contrib/gcc/c.opt')
| -rw-r--r-- | contrib/gcc/c.opt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/gcc/c.opt b/contrib/gcc/c.opt index 5343289..0568463 100644 --- a/contrib/gcc/c.opt +++ b/contrib/gcc/c.opt @@ -407,7 +407,7 @@ Give strings the type \"array of char\" ansi C ObjC C++ ObjC++ -A synonym for -std=c89. In a future version of GCC it will become synonymous with -std=c99 instead +A synonym for -std=c89 (for C) or -std=c++98 (for C++). d C ObjC C++ ObjC++ Joined @@ -790,7 +790,7 @@ Deprecated in favor of -std=gnu99 std=iso9899:1990 C ObjC -Deprecated in favor of -std=c89 +Conform to the ISO 1990 C standard std=iso9899:199409 C ObjC @@ -798,11 +798,11 @@ Conform to the ISO 1990 C standard as amended in 1994 std=iso9899:1999 C ObjC -Deprecated in favor of -std=c99 +Conform to the ISO 1999 C standard std=iso9899:199x C ObjC -Deprecated in favor of -std=c99 +Deprecated in favor of -std=iso9899:1999 traditional-cpp C ObjC C++ ObjC++ |
