Skip to content

Commit 23bdf06

Browse files
committed
merge cleanup
1 parent 2fa0146 commit 23bdf06

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ endif()
107107
if (APPLE)
108108
# Apple comboned, include based on arch
109109
set(CPU_ARCH "combined")
110-
set(ASM_EXT "all_macho_gas.S")
110+
set(ASM_EXT "all_macho_gas.S")
111111
elseif (ANDROID OR RPI)
112112
# Android (Arm/x86_64/Arm64)
113113
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR RPI)
@@ -176,7 +176,6 @@ if ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_C_COMPILER_ID MATCHES "GNU")
176176
endif()
177177
add_compile_options("$<$<CONFIG:Debug>:-D_DEBUG>")
178178
add_compile_options("$<$<CONFIG:Release>:-DNDEBUG>")
179-
180179
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
181180
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -fno-exceptions")
182181
sx_remove_compile_options(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" "-fexceptions -frtti")

tests/test-jobs.c

+3-8
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,8 @@ static void job_fib_fn(int index, void* user) {
4848
int main(int argc, char* argv[]) {
4949
const sx_alloc* alloc = sx_alloc_malloc();
5050
sx_job_context* ctx = sx_job_create_context(
51-
alloc,
52-
&(sx_job_context_desc){
53-
.num_threads = -1,
54-
.thread_init_cb = thread_init,
55-
.thread_shutdown_cb = thread_shutdown
56-
}
57-
);
51+
alloc, &(sx_job_context_desc){ .thread_init_cb = thread_init,
52+
.thread_shutdown_cb = thread_shutdown });
5853
if (!ctx) {
5954
puts("Error: sx_job_create_context failed!");
6055
return -1;
@@ -85,7 +80,7 @@ int main(int argc, char* argv[]) {
8580
};
8681

8782
puts("Dispatching jobs ...");
88-
sx_job_t jhandle = sx_job_dispatch(ctx, jobs, 3, 0);
83+
sx_job_t jhandle = sx_job_dispatch(ctx, jobs, 3, 0);
8984

9085
puts("Waiting ...");
9186
sx_job_wait_and_del(ctx, jhandle);

0 commit comments

Comments
 (0)