Skip to content

Commit 596cfde

Browse files
committed
Revise c-variadics changes editorially
1 parent 679dabc commit 596cfde

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/items/external-blocks.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,16 +190,15 @@ unsafe extern "C" {
190190
> The `safe` qualifier should not be used on a function in an `extern` block unless that function guarantees that it will not access the variadic arguments at all. Passing an unexpected number of arguments or arguments of unexpected type to a variadic function may lead to [undefined behavior][undefined].
191191
192192
r[items.extern.variadic.conventions]
193-
Variadic parameters can only be specified with `extern` blocks with the following ABI strings:
193+
Variadic parameters can only be specified within `extern` blocks with the following ABI strings or their corresponding [`-unwind` variants][items.fn.extern.unwind]:
194+
194195
- `"aapcs"`
195196
- `"C"`
196197
- `"cdecl"`
197198
- `"efiapi"`
198199
- `"sysv64"`
199200
- `"win64"`
200201

201-
This also includes the corresponding [`-unwind` variants][items.fn.extern.unwind].
202-
203202
r[items.extern.attributes]
204203
## Attributes on extern blocks
205204

src/types/function-pointer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ The `unsafe` qualifier indicates that the type's value is an [unsafe
5050
function], and the `extern` qualifier indicates it is an [extern function].
5151

5252
r[type.fn-pointer.constraint-variadic]
53-
For the function to be variadic, its `extern` ABI must be on the [list of ABIs that allow variadic calls][items.extern.variadic.conventions].
53+
For the function to be variadic, its `extern` ABI must be one of those listed in [items.extern.variadic.conventions].
5454

5555
r[type.fn-pointer.attributes]
5656
## Attributes on function pointer parameters

0 commit comments

Comments
 (0)