diff options
| author | dimitri staessens <dimitri.staessens@ugent.be> | 2017-08-21 09:11:38 +0000 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-08-21 09:11:38 +0000 |
| commit | 5b242e7207483860143d3c84438134430ac1448f (patch) | |
| tree | a04a750b802436a4e244d8224b800a2f26071091 /src/ipcpd/ipcp.c | |
| parent | afe8b6f496dd4e0e3aaaa5dec0d6fb32253a49f7 (diff) | |
| parent | 8f58e5a3ec0e4a15fc8ae0911cc864f5dbf86c6e (diff) | |
| download | ouroboros-5b242e7207483860143d3c84438134430ac1448f.tar.gz ouroboros-5b242e7207483860143d3c84438134430ac1448f.zip | |
Merged in dstaesse/ouroboros/be-build (pull request #557)
build: Revise the build system
Diffstat (limited to 'src/ipcpd/ipcp.c')
| -rw-r--r-- | src/ipcpd/ipcp.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c index 368c6eb8..300c22f4 100644 --- a/src/ipcpd/ipcp.c +++ b/src/ipcpd/ipcp.c @@ -20,9 +20,13 @@ * Foundation, Inc., http://www.fsf.org/about/contact/. */ +#define _POSIX_C_SOURCE 200112L +#define __XSI_VISIBLE 500 + +#include "config.h" + #define OUROBOROS_PREFIX "ipcpd/ipcp" -#include <ouroboros/config.h> #include <ouroboros/hash.h> #include <ouroboros/logs.h> #include <ouroboros/time_utils.h> @@ -533,7 +537,6 @@ int ipcp_init(int argc, ipcpi.irmd_fd = -1; ipcpi.state = IPCP_NULL; - ipcpi.shim_data = NULL; ipcpi.sock_path = ipcp_sock_path(getpid()); if (ipcpi.sock_path == NULL) @@ -597,20 +600,10 @@ int ipcp_init(int argc, ipcpi.alloc_id = -1; ipcpi.csockfd = -1; - if (type != IPCP_NORMAL) { - ipcpi.shim_data = shim_data_create(); - if (ipcpi.shim_data == NULL) { - ret = -ENOMEM; - goto fail_shim_data; - } - } - pthread_condattr_destroy(&cattr); return 0; - fail_shim_data: - pthread_cond_destroy(&ipcpi.acc_cond); fail_acc_cond: pthread_cond_destroy(&ipcpi.cmd_cond); fail_cmd_cond: @@ -702,8 +695,6 @@ void ipcp_fini() free(ipcpi.sock_path); - shim_data_destroy(ipcpi.shim_data); - pthread_cond_destroy(&ipcpi.state_cond); pthread_mutex_destroy(&ipcpi.state_mtx); pthread_cond_destroy(&ipcpi.alloc_cond); |