Skip to content

Commit c67cfc8

Browse files
committed
more uniform wording
1 parent 09cc7d7 commit c67cfc8

14 files changed

+36
-47
lines changed

docs/c-runtime-library/reference/ctime-ctime32-ctime64-wctime-wctime32-wctime64.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ These functions validate their parameters. If *`sourceTime`* is a null pointer,
6262

6363
By default, this function's global state is scoped to the application. To change this behavior, see [Global state in the CRT](../global-state.md).
6464

65-
> [!Note]
66-
> Starting with Windows SDK version 10.0.xxxxx.xxxx and Visual Studio 2026 or later, the following functions are no longer declared as `static inline` (internal linkage). Instead, they are now declared as `inline` (external linkage).\
65+
>> [!Note]
66+
> When you use Windows SDK version 10.0.xxxxx.xxxx and Visual Studio 2026 or later together, the following functions are no longer declared as `static inline` (internal linkage). Instead, they are declared as `inline` (external linkage).\
6767
> To return to the previous behavior, `#define _STATIC_INLINE_UCRT_FUNCTIONS=1` before including any CRT headers. By default, `_STATIC_INLINE_UCRT_FUNCTIONS` is set to 0.\
6868
> This change increases UCRT conformance with the C++ standard, while also improving compatibility with C++ modules.\
6969
> This applies to the following functions: `ctime`, `_wctime`

docs/c-runtime-library/reference/ctime-s-ctime32-s-ctime64-s-wctime-s-wctime32-s-wctime64-s.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ The debug library versions of these functions first fill the buffer with 0xFE. T
125125
By default, this function's global state is scoped to the application. To change this behavior, see [Global state in the CRT](../global-state.md).
126126

127127
> [!Note]
128-
> Starting with Windows SDK version 10.0.xxxxx.xxxx and Visual Studio 2026 or later, the following functions are no longer declared as `static inline` (internal linkage). Instead, they are now declared as `inline` (external linkage).\
128+
> When you use Windows SDK version 10.0.xxxxx.xxxx and Visual Studio 2026 or later together, the following functions are no longer declared as `static inline` (internal linkage). Instead, they are declared as `inline` (external linkage).\
129129
> To return to the previous behavior, `#define _STATIC_INLINE_UCRT_FUNCTIONS=1` before including any CRT headers. By default, `_STATIC_INLINE_UCRT_FUNCTIONS` is set to 0.\
130130
> This change increases UCRT conformance with the C++ standard, while also improving compatibility with C++ modules.\
131131
> This applies to the following functions: `ctime_s`, `_wctime_s`

docs/c-runtime-library/reference/difftime-difftime32-difftime64.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,9 @@ These functions validate their parameters. If either of the parameters is zero o
4646
By default, this function's global state is scoped to the application. To change this behavior, see [Global state in the CRT](../global-state.md).
4747
4848
> [!Note]
49-
> Starting in Visual Studio 2025 and the Windows SDK 26000, this function changes from declaring the function (or functions for multi-function pages) with `static inline` to `inline`.\
50-
> You can opt-out of the change for your project by defining `_STATIC_INLINE_UCRT_FUNCTIONS=1`.\
51-
> You can adopt the change early by defining `_STATIC_INLINE_UCRT_FUNCTIONS=0`.\
52-
> This change improves conformance and helps avoid One Definition Rule (ODR) violations, especially when using modules.\
49+
> If you use Windows SDK version 10.0.xxxxx.xxxx and Visual Studio 2026 or later together, the following functions are no longer declared as `static inline` (internal linkage). Instead, they are declared as `inline` (external linkage).\
50+
> To return to the previous behavior, `#define _STATIC_INLINE_UCRT_FUNCTIONS=1` before including any CRT headers. By default, `_STATIC_INLINE_UCRT_FUNCTIONS` is set to 0.\
51+
> This change increases UCRT conformance with the C++ standard, while also improving compatibility with C++ modules.\
5352
> This applies to the following function: `difftime`
5453
5554
## Requirements

docs/c-runtime-library/reference/futime-futime32-futime64.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The **`_futime`** routine sets the modification date and the access time on the
5252
By default, this function's global state is scoped to the application. To change this behavior, see [Global state in the CRT](../global-state.md).
5353

5454
> [!Note]
55-
> Starting with Windows SDK version 10.0.xxxxx.xxxx and Visual Studio 2026 or later, the following functions are no longer declared as `static inline` (internal linkage). Instead, they are now declared as `inline` (external linkage).\
55+
> If you use Windows SDK version 10.0.xxxxx.xxxx and Visual Studio 2026 or later together, the following functions are no longer declared as `static inline` (internal linkage). Instead, they are declared as `inline` (external linkage).\
5656
> To return to the previous behavior, `#define _STATIC_INLINE_UCRT_FUNCTIONS=1` before including any CRT headers. By default, `_STATIC_INLINE_UCRT_FUNCTIONS` is set to 0.\
5757
> This change increases UCRT conformance with the C++ standard, while also improving compatibility with C++ modules.\
5858
> This applies to the following function: `_futime`

docs/c-runtime-library/reference/gmtime-gmtime32-gmtime64.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,9 @@ The **`_gmtime32`** function breaks down the *`sourceTime`* value and stores it
5757
By default, this function's global state is scoped to the application. To change this behavior, see [Global state in the CRT](../global-state.md).
5858
5959
> [!Note]
60-
> Starting in Visual Studio 2025 and the Windows SDK 26000, this function changes from declaring the function (or functions for multi-function pages) with `static inline` to `inline`.\
61-
> You can opt-out of the change for your project by defining `_STATIC_INLINE_UCRT_FUNCTIONS=1`.\
62-
> You can adopt the change early by defining `_STATIC_INLINE_UCRT_FUNCTIONS=0`.\
63-
> This change improves conformance and helps avoid One Definition Rule (ODR) violations, especially when using modules.\
60+
> When you use Windows SDK version 10.0.xxxxx.xxxx and Visual Studio 2026 or later together, the following functions are no longer declared as `static inline` (internal linkage). Instead, they are declared as `inline` (external linkage).\
61+
> To return to the previous behavior, `#define _STATIC_INLINE_UCRT_FUNCTIONS=1` before including any CRT headers. By default, `_STATIC_INLINE_UCRT_FUNCTIONS` is set to 0.\
62+
> This change increases UCRT conformance with the C++ standard, while also improving compatibility with C++ modules.\
6463
> This applies to the following function: `gmtime`
6564
6665
## Requirements

docs/c-runtime-library/reference/gmtime-s-gmtime32-s-gmtime64-s.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,9 @@ Each of the structure fields is of type **`int`**, as shown in the following tab
7777
By default, this function's global state is scoped to the application. To change this behavior, see [Global state in the CRT](../global-state.md).
7878

7979
> [!Note]
80-
> Starting in Visual Studio 2025 and the Windows SDK 26000, this function changes from declaring the function (or functions for multi-function pages) with `static inline` to `inline`.\
81-
> You can opt-out of the change for your project by defining `_STATIC_INLINE_UCRT_FUNCTIONS=1`.\
82-
> You can adopt the change early by defining `_STATIC_INLINE_UCRT_FUNCTIONS=0`.\
83-
> This change improves conformance and helps avoid One Definition Rule (ODR) violations, especially when using modules.\
80+
> When you use Windows SDK version 10.0.xxxxx.xxxx and Visual Studio 2026 or later together, the following functions are no longer declared as `static inline` (internal linkage). Instead, they are declared as `inline` (external linkage).\
81+
> To return to the previous behavior, `#define _STATIC_INLINE_UCRT_FUNCTIONS=1` before including any CRT headers. By default, `_STATIC_INLINE_UCRT_FUNCTIONS` is set to 0.\
82+
> This change increases UCRT conformance with the C++ standard, while also improving compatibility with C++ modules.\
8483
> This applies to the following function: `gmtime_s`
8584
8685
## Requirements

docs/c-runtime-library/reference/localtime-localtime32-localtime64.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,9 @@ These functions validate their parameters. If *`sourceTime`* is a null pointer,
7373
By default, this function's global state is scoped to the application. To change this behavior, see [Global state in the CRT](../global-state.md).
7474
7575
> [!Note]
76-
> Starting in Visual Studio 2025 and the Windows SDK 26000, this function changes from declaring the function (or functions for multi-function pages) with `static inline` to `inline`.\
77-
> You can opt-out of the change for your project by defining `_STATIC_INLINE_UCRT_FUNCTIONS=1`.\
78-
> You can adopt the change early by defining `_STATIC_INLINE_UCRT_FUNCTIONS=0`.\
79-
> This change improves conformance and helps avoid One Definition Rule (ODR) violations, especially when using modules.\
76+
> When you use Windows SDK version 10.0.xxxxx.xxxx and Visual Studio 2026 or later together, the following functions are no longer declared as `static inline` (internal linkage). Instead, they are declared as `inline` (external linkage).\
77+
> To return to the previous behavior, `#define _STATIC_INLINE_UCRT_FUNCTIONS=1` before including any CRT headers. By default, `_STATIC_INLINE_UCRT_FUNCTIONS` is set to 0.\
78+
> This change increases UCRT conformance with the C++ standard, while also improving compatibility with C++ modules.\
8079
> This applies to the following function: `localtime`
8180
8281
## Requirements

docs/c-runtime-library/reference/localtime-s-localtime32-s-localtime64-s.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,9 @@ If the **`TZ`** environment variable is set, the C run-time library assumes rule
8585
By default, this function's global state is scoped to the application. To change this behavior, see [Global state in the CRT](../global-state.md).
8686

8787
> [!Note]
88-
> Starting in Visual Studio 2025 and the Windows SDK 26000, this function changes from declaring the function (or functions for multi-function pages) with `static inline` to `inline`.\
89-
> You can opt-out of the change for your project by defining `_STATIC_INLINE_UCRT_FUNCTIONS=1`.\
90-
> You can adopt the change early by defining `_STATIC_INLINE_UCRT_FUNCTIONS=0`.\
91-
> This change improves conformance and helps avoid One Definition Rule (ODR) violations, especially when using modules.\
88+
> When you use Windows SDK version 10.0.xxxxx.xxxx and Visual Studio 2026 or later together, the following functions are no longer declared as `static inline` (internal linkage). Instead, they are declared as `inline` (external linkage).\
89+
> To return to the previous behavior, `#define _STATIC_INLINE_UCRT_FUNCTIONS=1` before including any CRT headers. By default, `_STATIC_INLINE_UCRT_FUNCTIONS` is set to 0.\
90+
> This change increases UCRT conformance with the C++ standard, while also improving compatibility with C++ modules.\
9291
> This applies to the following function: `localtime_s`
9392
9493
## Requirements

docs/c-runtime-library/reference/mkgmtime-mkgmtime32-mkgmtime64.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,9 @@ The range of the **`_mkgmtime32`** function is from midnight, January 1, 1970, U
4949
Both **`gmtime`** and **`localtime`** use a common static buffer for the conversion. If you supply this buffer to **`_mkgmtime`**, the previous contents are destroyed.
5050

5151
> [!Note]
52-
> Starting in Visual Studio 2025 and the Windows SDK 26000, this function changes from declaring the function (or functions for multi-function pages) with `static inline` to `inline`.\
53-
> You can opt-out of the change for your project by defining `_STATIC_INLINE_UCRT_FUNCTIONS=1`.\
54-
> You can adopt the change early by defining `_STATIC_INLINE_UCRT_FUNCTIONS=0`.\
55-
> This change improves conformance and helps avoid One Definition Rule (ODR) violations, especially when using modules.\
56-
> This applies to the following function: `_mkgmtime`
52+
> When you use Windows SDK version 10.0.xxxxx.xxxx and Visual Studio 2026 or later together, the following functions are no longer declared as `static inline` (internal linkage). Instead, they are declared as `inline` (external linkage).\
53+
> To return to the previous behavior, `#define _STATIC_INLINE_UCRT_FUNCTIONS=1` before including any CRT headers. By default, `_STATIC_INLINE_UCRT_FUNCTIONS` is set to 0.\
54+
> This change increases UCRT conformance with the C++ standard, while also improving compatibility with C++ modules.\> This applies to the following function: `_mkgmtime`
5755
5856
## Examples
5957

docs/c-runtime-library/reference/mktime-mktime32-mktime64.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@ These functions validate their parameter. If *`timeptr`* is a null pointer, the
6363
By default, this function's global state is scoped to the application. To change this behavior, see [Global state in the CRT](../global-state.md).
6464

6565
> [!Note]
66-
> Starting in Visual Studio 2025 and the Windows SDK 26000, this function changes from declaring the function (or functions for multi-function pages) with `static inline` to `inline`.\
67-
> You can opt-out of the change for your project by defining `_STATIC_INLINE_UCRT_FUNCTIONS=1`.\
68-
> You can adopt the change early by defining `_STATIC_INLINE_UCRT_FUNCTIONS=0`.\
69-
> This change improves conformance and helps avoid One Definition Rule (ODR) violations, especially when using modules.\
66+
> When you use Windows SDK version 10.0.xxxxx.xxxx and Visual Studio 2026 or later together, the following functions are no longer declared as `static inline` (internal linkage). Instead, they are declared as `inline` (external linkage).\
67+
> To return to the previous behavior, `#define _STATIC_INLINE_UCRT_FUNCTIONS=1` before including any CRT headers. By default, `_STATIC_INLINE_UCRT_FUNCTIONS` is set to 0.\
68+
> This change increases UCRT conformance with the C++ standard, while also improving compatibility with C++ modules.\
7069
> This applies to the following function: `mktime`
7170
7271
## Requirements

0 commit comments

Comments
 (0)