aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorFrancois-Xavier Coudert <fxcoudert@gcc.gnu.org>2010-08-31 14:26:47 +0000
committerFrançois-Xavier Coudert <fxcoudert@gcc.gnu.org>2010-08-31 14:26:47 +0000
commit6cea734df595b4e9bf7d6a0b497d88af932a5290 (patch)
treededa4dc20df4c12f13b2cd63331350c1db62298f /gcc
parent74a3d2c3aae2f04b2630898a1d41d3922ded71ce (diff)
downloadgcc-6cea734df595b4e9bf7d6a0b497d88af932a5290.zip
gcc-6cea734df595b4e9bf7d6a0b497d88af932a5290.tar.gz
gcc-6cea734df595b4e9bf7d6a0b497d88af932a5290.tar.bz2
extend.texi: Fix documentation of the return value of __builtin_choose_expr.
* doc/extend.texi: Fix documentation of the return value of __builtin_choose_expr. From-SVN: r163675
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/doc/extend.texi2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4f92137..4d1737a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-31 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
+
+ * doc/extend.texi: Fix documentation of the return value of
+ __builtin_choose_expr.
+
2010-08-31 Nathan Froyd <froydnj@codesourcery.com>
* config/v850/v850-protos.h (function_arg): Delete.
diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index a12d21b..de6a30d 100644
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -7137,7 +7137,7 @@ depending on the arguments' types. For example:
You can use the built-in function @code{__builtin_choose_expr} to
evaluate code depending on the value of a constant expression. This
built-in function returns @var{exp1} if @var{const_exp}, which is an
-integer constant expression, is nonzero. Otherwise it returns 0.
+integer constant expression, is nonzero. Otherwise it returns @var{exp2}.
This built-in function is analogous to the @samp{? :} operator in C,
except that the expression returned has its type unaltered by promotion