Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add explicit void type parameter to C functions without parameters #775

Merged
merged 1 commit into from
Aug 1, 2024
Merged

Add explicit void type parameter to C functions without parameters #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Sources/_FoundationCShims/include/platform_shims.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@
#include <security.h>
#endif

INTERNAL char * _Nullable * _Nullable _platform_shims_get_environ();
INTERNAL char * _Nullable * _Nullable _platform_shims_get_environ(void);

INTERNAL void _platform_shims_lock_environ();
INTERNAL void _platform_shims_unlock_environ();
INTERNAL void _platform_shims_lock_environ(void);
INTERNAL void _platform_shims_unlock_environ(void);

#if __has_include(<mach/vm_page_size.h>)
#include <mach/vm_page_size.h>
INTERNAL vm_size_t _platform_shims_vm_size();
INTERNAL vm_size_t _platform_shims_vm_size(void);
#endif

#if __has_include(<mach/mach.h>)
#include <mach/mach.h>
INTERNAL mach_port_t _platform_mach_task_self();
INTERNAL mach_port_t _platform_mach_task_self(void);
#endif

#if __has_include(<libkern/OSThermalNotification.h>)
Expand All @@ -65,7 +65,7 @@ typedef enum {
} _platform_shims_OSThermalPressureLevel;


INTERNAL const char * _Nonnull _platform_shims_kOSThermalNotificationPressureLevelName();
INTERNAL const char * _Nonnull _platform_shims_kOSThermalNotificationPressureLevelName(void);
#endif

#endif /* CSHIMS_PLATFORM_SHIMS */
16 changes: 8 additions & 8 deletions Sources/_FoundationCShims/platform_shims.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ extern char **environ;

#if __has_include(<libc_private.h>)
#import <libc_private.h>
void _platform_shims_lock_environ() {
void _platform_shims_lock_environ(void) {
environ_lock_np();
}

void _platform_shims_unlock_environ() {
void _platform_shims_unlock_environ(void) {
environ_unlock_np();
}
#else
void _platform_shims_lock_environ() { /* noop */ }
void _platform_shims_unlock_environ() { /* noop */ }
void _platform_shims_lock_environ(void) { /* noop */ }
void _platform_shims_unlock_environ(void) { /* noop */ }
#endif

char ** _platform_shims_get_environ() {
char ** _platform_shims_get_environ(void) {
#if __has_include(<crt_externs.h>)
return *_NSGetEnviron();
#elif defined(_WIN32)
Expand All @@ -48,20 +48,20 @@ char ** _platform_shims_get_environ() {
}

#if __has_include(<libkern/OSThermalNotification.h>)
const char * _platform_shims_kOSThermalNotificationPressureLevelName() {
const char * _platform_shims_kOSThermalNotificationPressureLevelName(void) {
return kOSThermalNotificationPressureLevelName;
}
#endif

#if __has_include(<mach/vm_page_size.h>)
vm_size_t _platform_shims_vm_size() {
vm_size_t _platform_shims_vm_size(void) {
// This shim exists because vm_page_size is not marked const, and therefore looks like global mutable state to Swift.
return vm_page_size;
}
#endif

#if __has_include(<mach/mach.h>)
mach_port_t _platform_mach_task_self() {
mach_port_t _platform_mach_task_self(void) {
// This shim exists because mach_task_self_ is not marked const, and therefore looks like global mutable state to Swift.
return mach_task_self();
}
Expand Down