From f872cad4e0555e8ec24361d6cef7d3aecd23941c Mon Sep 17 00:00:00 2001 From: erinorina Date: Tue, 15 Oct 2024 17:32:40 +0200 Subject: [PATCH] Update os.h Removed the unused #include "profile.h" line. Removed the duplicate #include and at the end of the file. --- src/os.h | 75 +++++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/src/os.h b/src/os.h index d5db01b..92eea0b 100644 --- a/src/os.h +++ b/src/os.h @@ -1,53 +1,53 @@ /* -This is free and unencumbered software released into the public domain. + * This is free and unencumbered software released into the public domain. + * + * Anyone is free to copy, modify, publish, use, compile, sell, or + * distribute this software, either in source code form or as a compiled + * binary, for any purpose, commercial or non-commercial, and by any + * means. + * + * In jurisdictions that recognize copyright laws, the author or authors + * of this software dedicate any and all copyright interest in the + * software to the public domain. We make this dedication for the benefit + * of the public at large and to the detriment of our heirs and + * successors. We intend this dedication to be an overt act of + * relinquishment in perpetuity of all present and future rights to this + * software under copyright law. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * For more information, please refer to + */ -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. - -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -For more information, please refer to -*/ #include #include -#include "profile.h" // TODO: Clean up this file #ifdef _WIN32 #define WIN32_MEAN_AND_LEAN #include -typedef CRITICAL_SECTION os_mutex_t; +typedef CRITICAL_SECTION os_mutex_t; typedef CONDITION_VARIABLE os_condvar_t; #elif defined(__linux__) #include #include typedef pthread_mutex_t os_mutex_t; -typedef pthread_cond_t os_condvar_t; +typedef pthread_cond_t os_condvar_t; #endif typedef struct { -#ifdef _WIN32 + #ifdef _WIN32 void *data; -#else + #else sem_t data; -#endif + #endif } os_semaphore_t; typedef struct { @@ -62,27 +62,24 @@ void sleep_ms(float ms); void os_mutex_create(os_mutex_t *mutex); void os_mutex_delete(os_mutex_t *mutex); -void os_mutex_lock (os_mutex_t *mutex); +void os_mutex_lock(os_mutex_t *mutex); void os_mutex_unlock(os_mutex_t *mutex); void os_condvar_create(os_condvar_t *condvar); void os_condvar_delete(os_condvar_t *condvar); -bool os_condvar_wait (os_condvar_t *condvar, os_mutex_t *mutex, int timeout_ms); +bool os_condvar_wait(os_condvar_t *condvar, os_mutex_t *mutex, int timeout_ms); void os_condvar_signal(os_condvar_t *condvar); void semaphore_create(semaphore_t *sem, int count); void semaphore_delete(semaphore_t *sem); -bool semaphore_wait (semaphore_t *sem, int count, int timeout_ms); +bool semaphore_wait(semaphore_t *sem, int count, int timeout_ms); void semaphore_signal(semaphore_t *sem, int count); bool os_semaphore_create(os_semaphore_t *sem, int count, int max); bool os_semaphore_delete(os_semaphore_t *sem); -bool os_semaphore_wait (os_semaphore_t *sem); +bool os_semaphore_wait(os_semaphore_t *sem); bool os_semaphore_signal(os_semaphore_t *sem); -#include -#include - #if defined(_WIN32) #define WIN32_MEAN_AND_LEAN #include @@ -96,5 +93,5 @@ typedef void *os_threadreturn; uint64_t get_thread_id(void); -void os_thread_create(os_thread *thread, void *arg, os_threadreturn (*func)(void*)); -os_threadreturn os_thread_join(os_thread thread); \ No newline at end of file +void os_thread_create(os_thread *thread, void *arg, os_threadreturn (*func)(void*)); +os_threadreturn os_thread_join(os_thread thread);