Skip to content

Commit e9f26c2

Browse files
author
Colin Robertson
authored
Merge pull request #1744 from MicrosoftDocs/master637103911291859886
Fix git push error for protected CLA branch
2 parents 3fc2d4a + 3ee06ec commit e9f26c2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

docs/assembler/masm/comm.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ Communal variables are allocated by the linker, and can't be initialized. This m
1919

2020
Each *definition* has the following form:
2121

22-
*langtype*⟧ ⟦**NEAR** | **FAR**_label_**:**_type_**:**_count_
22+
*language-type*⟧ ⟦**NEAR** | **FAR**_label_**:**_type_**:**_count_
2323

24-
The optional *langtype* sets the naming conventions for the name that follows. It overrides any language specified by the **.MODEL** directive. The optional **NEAR** or **FAR** override the current memory model. The *label* is the name of the variable. The *type* can be any type specifier ([BYTE](../../assembler/masm/byte-masm.md), [WORD](../../assembler/masm/word.md), and so on) or an integer specifying the number of bytes. The optional *count* specifies the number of elements in the declared data object; the default is one.
24+
The optional *language-type* sets the naming conventions for the name that follows. It overrides any language specified by the **.MODEL** directive. The optional **NEAR** or **FAR** override the current memory model. The *label* is the name of the variable. The *type* can be any type specifier ([BYTE](../../assembler/masm/byte-masm.md), [WORD](../../assembler/masm/word.md), and so on) or an integer specifying the number of bytes. The optional *count* specifies the number of elements in the declared data object. The default *count* is one.
2525

2626
## Example
2727

@@ -33,4 +33,4 @@ COMM FAR ByteArray:BYTE:512
3333

3434
## See also
3535

36-
[Directives Reference](../../assembler/masm/directives-reference.md)
36+
[Directives reference](directives-reference.md)

docs/cppcx/wrl/windows-runtime-cpp-template-library-wrl.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Uses the `HttpRequest` class that's defined in [Walkthrough: Connecting Using Ta
6767
[Creating a Windows Runtime DLL component with C++ sample](https://code.msdn.microsoft.com/windowsapps/Creating-a-Windows-Runtime-6c399797)<br/>
6868
Shows how to use the Windows Runtime C++ Template Library to create an in-process DLL component and consume it from C++/CX, JavaScript, and C#.
6969

70-
[DirectX marble maze game sample](https://code.msdn.microsoft.com/windowsapps/DirectX-Marble-Maze-Game-e4806345)<br/>
70+
[DirectX marble maze game sample](https://docs.microsoft.com/samples/microsoft/windows-appsample-marble-maze/directx-marble-maze-game-sample/)<br/>
7171
Demonstrates how to use the Windows Runtime C++ Template Library to manage the lifetime of COM components such as DirectX and Media Foundation in the context of a complete 3-D game.
7272

7373
[Sending toast notifications from desktop apps sample](https://code.msdn.microsoft.com/windowsdesktop/Sending-toast-notifications-71e230a2)<br/>

0 commit comments

Comments
 (0)