Skip to content

Commit 66affbf

Browse files
author
Colin Robertson
committed
Undo more
1 parent 275dcd4 commit 66affbf

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

docs/cpp/initializers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ int main() {
165165
}
166166
```
167167
168-
For more information about initialization of global static objects, see [Additional Startup Considerations](../cpp/additional-startup-considerations.md).
168+
For more information about initialization of global static objects, see [main function and command-line arguments](main-function-command-line-args.md).
169169
170170
### Value initialization
171171
@@ -532,4 +532,4 @@ References that are not qualified with either the **const** or **volatile** keyw
532532

533533
### Initialization of external variables
534534

535-
Declarations of automatic, static, and external variables can contain initializers. However, declarations of external variables can contain initializers only if the variables are not declared as **extern**.
535+
Declarations of automatic, static, and external variables can contain initializers. However, declarations of external variables can contain initializers only if the variables are not declared as **extern**.

docs/cpp/main-function-command-line-args.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ If no return value is specified, the compiler supplies a return value of zero. A
4242
The arguments for `main` or `wmain` allow convenient command-line parsing of arguments and, optionally, access to environment variables. The types for `argc` and `argv` are defined by the language. The names `argc`, `argv`, and `envp` are traditional, but you can name them whatever you like.
4343

4444
```cpp
45-
int main(int argc, char *argv[], char *envp[]);
46-
int wmain(int argc, wchar_t *argv[], wchar_t *envp[]);
45+
int main( int argc, char* argv[], char* envp[]);
46+
int wmain( int argc, wchar_t* argv[], wchar_t* envp[]);
4747
```
4848
4949
The argument definitions are as follows:
@@ -155,7 +155,7 @@ The following table shows example input and expected output, demonstrating the r
155155
156156
**Microsoft Specific**
157157
158-
You can use wildcards — the question mark (?) and asterisk (*) — to specify filename and path arguments on the command line.
158+
You can use wildcards — the question mark (?) and asterisk (*) — to specify filename and path arguments on the command-line.
159159
160160
Command-line arguments are handled by a routine called `_setargv` (or `_wsetargv` in the wide-character environment), which by default does not expand wildcards into separate strings in the `argv` string array. For more information on enabling wildcard expansion, refer to [Expanding Wildcard Arguments](../c-language/expanding-wildcard-arguments.md).
161161

0 commit comments

Comments
 (0)