Skip to content

Commit b6d5f3b

Browse files
authored
Fix void in headers (#18913)
* Fix C function declarations to state (void). * Fix emscripten_trace_*() no-op definition macros to behave well as statements in macro expansion.
1 parent 7eacfcc commit b6d5f3b

File tree

6 files changed

+35
-35
lines changed

6 files changed

+35
-35
lines changed

system/include/AL/alc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ extern ALCboolean alcCloseDevice(ALCdevice *device);
6161
extern ALCboolean alcIsExtensionPresent(ALCdevice *device, const ALCchar *extname);
6262
extern ALCboolean alcMakeContextCurrent(ALCcontext *context);
6363
extern ALCcontext *alcCreateContext(ALCdevice *device, const ALCint *attrlist);
64-
extern ALCcontext *alcGetCurrentContext();
64+
extern ALCcontext *alcGetCurrentContext(void);
6565
extern ALCdevice *alcCaptureOpenDevice(const ALCchar *devicename, ALCuint frequency, ALCenum format, ALCsizei buffersize);
6666
extern ALCdevice *alcGetContextsDevice(ALCcontext *context);
6767
extern ALCdevice *alcOpenDevice(const ALCchar *devicename);

system/include/emscripten/emmalloc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ void *emmalloc_calloc(size_t num, size_t size);
8484

8585
// mallinfo() returns information about current emmalloc allocation state. This function
8686
// is very slow, only good for debugging. Avoid calling it for "routine" diagnostics.
87-
struct mallinfo mallinfo();
88-
struct mallinfo emmalloc_mallinfo();
87+
struct mallinfo mallinfo(void);
88+
struct mallinfo emmalloc_mallinfo(void);
8989

9090
// malloc_trim() returns unused dynamic memory back to the WebAssembly heap. Returns 1 if it
9191
// actually freed any memory, and 0 if not. Note: this function does not release memory back to

system/include/emscripten/eventloop.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ void emscripten_set_immediate_loop(EM_BOOL (*cb)(void *user_data), void *user_da
2626
int emscripten_set_interval(void (*cb)(void *user_data) __attribute__((nonnull)), double interval_ms, void *user_data);
2727
void emscripten_clear_interval(int id);
2828

29-
void emscripten_runtime_keepalive_push();
30-
void emscripten_runtime_keepalive_pop();
31-
EM_BOOL emscripten_runtime_keepalive_check();
29+
void emscripten_runtime_keepalive_push(void);
30+
void emscripten_runtime_keepalive_pop(void);
31+
EM_BOOL emscripten_runtime_keepalive_check(void);
3232

3333
#ifdef __cplusplus
3434
}

system/include/emscripten/proxying.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ extern "C" {
2727
typedef struct em_proxying_queue em_proxying_queue;
2828

2929
// Create and destroy proxying queues.
30-
em_proxying_queue* em_proxying_queue_create();
30+
em_proxying_queue* em_proxying_queue_create(void);
3131
void em_proxying_queue_destroy(em_proxying_queue* q);
3232

3333
// Get the queue used for proxying low-level runtime work. Work on this queue
3434
// may be processed at any time inside system functions, so it must be
3535
// nonblocking and safe to run at any time, similar to a native signal handler.
36-
em_proxying_queue* emscripten_proxy_get_system_queue();
36+
em_proxying_queue* emscripten_proxy_get_system_queue(void);
3737

3838
// Execute all the tasks enqueued for the current thread on the given queue. New
3939
// tasks that are enqueued concurrently with this execution will be executed as

system/include/emscripten/trace.h

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -68,31 +68,31 @@ void emscripten_trace_close(void);
6868

6969
#else
7070

71-
#define emscripten_trace_configure(collector_url, application)
72-
#define emscripten_trace_configure_for_google_wtf()
73-
#define emscripten_trace_configure_for_test()
74-
#define emscripten_trace_set_enabled(enabled)
75-
#define emscripten_trace_set_session_username(username)
76-
#define emscripten_trace_record_frame_start()
77-
#define emscripten_trace_record_frame_end()
78-
#define emscripten_trace_mark(message)
79-
#define emscripten_trace_log_message(channel, message)
80-
#define emscripten_trace_report_error(error)
81-
#define emscripten_trace_record_allocation(address, size)
82-
#define emscripten_trace_record_reallocation(old_address, new_address, size)
83-
#define emscripten_trace_record_free(address)
84-
#define emscripten_trace_annotate_address_type(address, type)
85-
#define emscripten_trace_associate_storage_size(address, size)
86-
#define emscripten_trace_report_memory_layout()
87-
#define emscripten_trace_report_off_heap_data()
88-
#define emscripten_trace_enter_context(name)
89-
#define emscripten_trace_exit_context()
90-
#define emscripten_trace_task_start(task_id, taskname)
91-
#define emscripten_trace_task_associate_data(key, value);
92-
#define emscripten_trace_task_suspend(explanation);
93-
#define emscripten_trace_task_resume(task_id, explanation);
94-
#define emscripten_trace_task_end();
95-
#define emscripten_trace_close()
71+
#define emscripten_trace_configure(collector_url, application) ((void)0)
72+
#define emscripten_trace_configure_for_google_wtf() ((void)0)
73+
#define emscripten_trace_configure_for_test() ((void)0)
74+
#define emscripten_trace_set_enabled(enabled) ((void)0)
75+
#define emscripten_trace_set_session_username(username) ((void)0)
76+
#define emscripten_trace_record_frame_start() ((void)0)
77+
#define emscripten_trace_record_frame_end() ((void)0)
78+
#define emscripten_trace_mark(message) ((void)0)
79+
#define emscripten_trace_log_message(channel, message) ((void)0)
80+
#define emscripten_trace_report_error(error) ((void)0)
81+
#define emscripten_trace_record_allocation(address, size) ((void)0)
82+
#define emscripten_trace_record_reallocation(old_address, new_address, size) ((void)0)
83+
#define emscripten_trace_record_free(address) ((void)0)
84+
#define emscripten_trace_annotate_address_type(address, type) ((void)0)
85+
#define emscripten_trace_associate_storage_size(address, size) ((void)0)
86+
#define emscripten_trace_report_memory_layout() ((void)0)
87+
#define emscripten_trace_report_off_heap_data() ((void)0)
88+
#define emscripten_trace_enter_context(name) ((void)0)
89+
#define emscripten_trace_exit_context() ((void)0)
90+
#define emscripten_trace_task_start(task_id, taskname) ((void)0)
91+
#define emscripten_trace_task_associate_data(key, value) ((void)0)
92+
#define emscripten_trace_task_suspend(explanation) ((void)0)
93+
#define emscripten_trace_task_resume(task_id, explanation) ((void)0)
94+
#define emscripten_trace_task_end() ((void)0)
95+
#define emscripten_trace_close() ((void)0)
9696

9797
#endif
9898

system/include/emscripten/val.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ void _emval_decref(EM_VAL value);
5252

5353
void _emval_run_destructors(EM_DESTRUCTORS handle);
5454

55-
EM_VAL _emval_new_array();
55+
EM_VAL _emval_new_array(void);
5656
EM_VAL _emval_new_array_from_memory_view(EM_VAL mv);
57-
EM_VAL _emval_new_object();
57+
EM_VAL _emval_new_object(void);
5858
EM_VAL _emval_new_cstring(const char*);
5959
EM_VAL _emval_new_u8string(const char*);
6060
EM_VAL _emval_new_u16string(const char16_t*);

0 commit comments

Comments
 (0)