summaryrefslogtreecommitdiffhomepage
path: root/c.html.markdown
diff options
context:
space:
mode:
authorven <vendethiel@hotmail.fr>2015-10-15 09:09:40 +0200
committerven <vendethiel@hotmail.fr>2015-10-15 09:09:40 +0200
commitadc81a0bc55e5a32e455c773fe3949b4c7af83f9 (patch)
tree67490c1c7133f823f3ceb88831581eb8b4cd286d /c.html.markdown
parent51c506712ede8b3c4c18ea74ec19c6e97ce9e726 (diff)
parent328ceb1a94f0fc6736e001ad0e7b6646173ca207 (diff)
Merge pull request #1480 from eltonvs/master
Translation fixes and extra information
Diffstat (limited to 'c.html.markdown')
-rw-r--r--c.html.markdown4
1 files changed, 3 insertions, 1 deletions
diff --git a/c.html.markdown b/c.html.markdown
index 3339032f..fb77ca50 100644
--- a/c.html.markdown
+++ b/c.html.markdown
@@ -232,7 +232,7 @@ int main (int argc, char** argv)
0 || 1; // => 1 (Logical or)
0 || 0; // => 0
- // Conditional expression ( ? : )
+ // Conditional ternary expression ( ? : )
int e = 5;
int f = 10;
int z;
@@ -302,6 +302,8 @@ int main (int argc, char** argv)
for (i = 0; i <= 5; i++) {
; // use semicolon to act as the body (null statement)
}
+ // Or
+ for (i = 0; i <= 5; i++);
// branching with multiple choices: switch()
switch (a) {