Skip to content

Commit 0a6ea97

Browse files
authored
Merge pull request #16281 from mikeash/warning-fix-libcshims-metadata
[Runtime] Fix warnings for inconsistent nullability annotation on _stdlib_getEnviron.
2 parents 9cd07e9 + 022253e commit 0a6ea97

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

stdlib/public/SwiftShims/LibcShims.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ int _stdlib_ioctlPtr(int fd, unsigned long int request, void* ptr);
130130
// Environment
131131
#if defined(__APPLE__) || defined(__FreeBSD__)
132132
SWIFT_RUNTIME_STDLIB_INTERNAL
133-
char * _Nullable *_stdlib_getEnviron();
133+
char * _Nullable * _Null_unspecified _stdlib_getEnviron();
134134
#endif
135135

136136
// System error numbers <errno.h>

stdlib/public/stubs/LibcShims.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ int swift::_stdlib_ioctlPtr(int fd, unsigned long int request, void* ptr) {
181181

182182
#if defined(__FreeBSD__)
183183
SWIFT_RUNTIME_STDLIB_INTERNAL
184-
char * _Nullable *swift::_stdlib_getEnviron() {
184+
char * _Nullable * _Null_unspecified swift::_stdlib_getEnviron() {
185185
extern char **environ;
186186
return environ;
187187
}

0 commit comments

Comments
 (0)