mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-25 09:44:02 +00:00
Code Issues Releases Wiki Activity

couple more fixes for apple clang build

Browse source
This commit is contained in:
fgenesis 2024-07-13 19:33:10 +02:00
parent 64c0c649cd
commit 0153c977df
2 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
ExternalLibs/dmon.h
View file

@ -260,13 +260,12 @@ DMON_API_DECL void dmon_unwatch(dmon_watch_id id);
} while (0)
#endif
#ifndef _dmon_make_id
# ifdef __cplusplus
# define _dmon_make_id(id) {id}
# else
# define _dmon_make_id(id) (dmon_watch_id) {id}
# endif
#endif // _dmon_make_id
_DMON_PRIVATE inline dmon_watch_id _dmon_make_id(unsigned id)
{
dmon_watch_id w;
w.id = id;
return w;
}
_DMON_PRIVATE bool _dmon_isrange(char ch, char from, char to)
{
@ -1346,7 +1345,6 @@ typedef struct dmon__state {
int freelist[DMON_MAX_WATCHES];
dmon__fsevent_event* events;
int num_watches;
volatile int modify_watches;
pthread_t thread_handle;
dispatch_semaphore_t thread_sem;
pthread_mutex_t mutex;
@ -1486,14 +1484,14 @@ _DMON_PRIVATE void* _dmon_thread(void* arg)
while (!_dmon.quit) {
int i;
if (_dmon.modify_watches || pthread_mutex_trylock(&_dmon.mutex) != 0) {
if (pthread_mutex_trylock(&_dmon.mutex) != 0) {
nanosleep(&req, &rem);
continue;
}
if (_dmon.num_watches == 0) {
nanosleep(&req, &rem);
pthread_mutex_unlock(&_dmon.mutex);
nanosleep(&req, &rem);
continue;
}
@ -1635,7 +1633,6 @@ DMON_API_IMPL dmon_watch_id dmon_watch(const char* rootdir,
DMON_ASSERT(watch_cb);
DMON_ASSERT(rootdir && rootdir[0]);
__sync_lock_test_and_set(&_dmon.modify_watches, 1);
pthread_mutex_lock(&_dmon.mutex);
DMON_ASSERT(_dmon.num_watches < DMON_MAX_WATCHES);
@ -1675,7 +1672,6 @@ DMON_API_IMPL dmon_watch_id dmon_watch(const char* rootdir,
(root_st.st_mode & S_IRUSR) != S_IRUSR) {
_DMON_LOG_ERRORF("Could not open/read directory: %s", rootdir);
pthread_mutex_unlock(&_dmon.mutex);
__sync_lock_test_and_set(&_dmon.modify_watches, 0);
return _dmon_make_id(0);
}
@ -1690,7 +1686,6 @@ DMON_API_IMPL dmon_watch_id dmon_watch(const char* rootdir,
} else {
_DMON_LOG_ERRORF("symlinks are unsupported: %s. use DMON_WATCHFLAGS_FOLLOW_SYMLINKS", rootdir);
pthread_mutex_unlock(&_dmon.mutex);
__sync_lock_test_and_set(&_dmon.modify_watches, 0);
return _dmon_make_id(0);
}
} else {
@ -1735,7 +1730,6 @@ DMON_API_IMPL dmon_watch_id dmon_watch(const char* rootdir,
CFRelease(cf_dir);
pthread_mutex_unlock(&_dmon.mutex);
__sync_lock_test_and_set(&_dmon.modify_watches, 0);
return _dmon_make_id(id);
}
@ -1745,12 +1739,13 @@ DMON_API_IMPL void dmon_unwatch(dmon_watch_id id)
DMON_ASSERT(id.id > 0);
int index = id.id - 1;
DMON_ASSERT(index < DMON_MAX_WATCHES);
pthread_mutex_lock(&_dmon.mutex);
DMON_ASSERT(_dmon.watches[index]);
DMON_ASSERT(_dmon.num_watches > 0);
if (_dmon.watches[index]) {
__sync_lock_test_and_set(&_dmon.modify_watches, 1);
pthread_mutex_lock(&_dmon.mutex);
_dmon_unwatch(_dmon.watches[index]);
DMON_FREE(_dmon.watches[index]);
@ -1759,10 +1754,9 @@ DMON_API_IMPL void dmon_unwatch(dmon_watch_id id)
--_dmon.num_watches;
int num_freelist = DMON_MAX_WATCHES - _dmon.num_watches;
_dmon.freelist[num_freelist - 1] = index;
pthread_mutex_unlock(&_dmon.mutex);
__sync_lock_test_and_set(&_dmon.modify_watches, 0);
}
pthread_mutex_unlock(&_dmon.mutex);
}
#endif

6
ExternalLibs/tbsp.hh
View file

@ -93,11 +93,7 @@ tbsp::evalRange(p, NP, tmp, knots, cp, NCP, DEGREE, 0.2f, 0.5f);
# define TBSP_ASSERT(x)
#endif
#ifdef _MSC_VER
# define TBSP_RESTRICT __restrict
#else
# define TBSP_RESTRICT restrict
#endif
#define TBSP_RESTRICT __restrict
#ifndef TBSP_HAS_CPP11
# if (__cplusplus > 201103L) || (defined(_MSC_VER) && ((_MSC_VER+0) >= 1900))