diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-08-31 14:29:32 +0200 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-08-31 14:29:32 +0200 |
| commit | 857c014a40a75eda574af8b2002b1c794bc0975c (patch) | |
| tree | 721c6c6a7b394dc758ffa12bb3a1261d9817207f /src/ipcpd | |
| parent | 1071824054828b9be36f50416f858c49c9acd701 (diff) | |
| parent | 63b63e0f6ab9f743fc34623bb1caa9852227f046 (diff) | |
| download | ouroboros-857c014a40a75eda574af8b2002b1c794bc0975c.tar.gz ouroboros-857c014a40a75eda574af8b2002b1c794bc0975c.zip | |
Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be
Diffstat (limited to 'src/ipcpd')
| -rw-r--r-- | src/ipcpd/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/ipcpd/ipcp.c | 2 | ||||
| -rw-r--r-- | src/ipcpd/normal/cdap_request.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/ipcpd/CMakeLists.txt b/src/ipcpd/CMakeLists.txt index bb482ed9..43af7a25 100644 --- a/src/ipcpd/CMakeLists.txt +++ b/src/ipcpd/CMakeLists.txt @@ -7,4 +7,6 @@ set(IPCP_SOURCES add_subdirectory(local) add_subdirectory(normal) add_subdirectory(shim-udp) -add_subdirectory(shim-eth-llc) +if(NOT APPLE) + add_subdirectory(shim-eth-llc) +endif() diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c index 87bf9e51..12111a51 100644 --- a/src/ipcpd/ipcp.c +++ b/src/ipcpd/ipcp.c @@ -48,7 +48,9 @@ struct ipcp * ipcp_instance_create() pthread_rwlock_init(&i->state_lock, NULL); pthread_mutex_init(&i->state_mtx, NULL); pthread_condattr_init(&cattr); +#ifndef __APPLE__ pthread_condattr_setclock(&cattr, PTHREAD_COND_CLOCK); +#endif pthread_cond_init(&i->state_cond, &cattr); return i; diff --git a/src/ipcpd/normal/cdap_request.c b/src/ipcpd/normal/cdap_request.c index cdbbb833..5839360b 100644 --- a/src/ipcpd/normal/cdap_request.c +++ b/src/ipcpd/normal/cdap_request.c @@ -48,7 +48,9 @@ struct cdap_request * cdap_request_create(enum cdap_opcode code, creq->result = -1; pthread_condattr_init(&cattr); +#ifndef __APPLE__ pthread_condattr_setclock(&cattr, PTHREAD_COND_CLOCK); +#endif pthread_cond_init(&creq->cond, &cattr); pthread_mutex_init(&creq->lock, NULL); |