diff options
| author | Dimitri Staessens <dimitri.staessens@intec.ugent.be> | 2016-03-30 18:32:33 +0200 |
|---|---|---|
| committer | Dimitri Staessens <dimitri.staessens@intec.ugent.be> | 2016-03-30 18:32:33 +0200 |
| commit | 850cefe748364b0b5154c10ac4d9e2b35600efd6 (patch) | |
| tree | ec127e49cdd695381651cd8a942caaeaef3a11da /include | |
| parent | a7e83f9c190dfbebd891992ed0254435edf48aa4 (diff) | |
| parent | 08941177f030b77fb44238a7e589322d2e0fcaa2 (diff) | |
| download | ouroboros-850cefe748364b0b5154c10ac4d9e2b35600efd6.tar.gz ouroboros-850cefe748364b0b5154c10ac4d9e2b35600efd6.zip | |
Merged in sandervrijders/ouroboros/be-irmd (pull request #48)
lib, irmd: Update communication with IRMd
Diffstat (limited to 'include')
| -rw-r--r-- | include/ouroboros/config.h.in | 9 | ||||
| -rw-r--r-- | include/ouroboros/shm_du_map.h | 4 | ||||
| -rw-r--r-- | include/ouroboros/sockets.h | 1 |
3 files changed, 5 insertions, 9 deletions
diff --git a/include/ouroboros/config.h.in b/include/ouroboros/config.h.in index 0f5c2131..01d7888e 100644 --- a/include/ouroboros/config.h.in +++ b/include/ouroboros/config.h.in @@ -23,9 +23,10 @@ #ifndef OUROBOROS_CONFIG #define OUROBOROS_CONFIG -#define PROJECT_NAME "@CMAKE_PROJECT_NAME@" -#define PROJECT_VERSION "@PACKAGE_VERSION@" -#define INSTALL_DIR "@CMAKE_INSTALL_PREFIX@" -#define BUILD_TYPE "@CMAKE_BUILD_TYPE@" +#define PROJECT_NAME "@CMAKE_PROJECT_NAME@" +#define PROJECT_VERSION "@PACKAGE_VERSION@" +#define INSTALL_DIR "@CMAKE_INSTALL_PREFIX@" +#define BUILD_TYPE "@CMAKE_BUILD_TYPE@" +#define _POSIX_C_SOURCE 199506L #endif diff --git a/include/ouroboros/shm_du_map.h b/include/ouroboros/shm_du_map.h index 68492a91..fb51768d 100644 --- a/include/ouroboros/shm_du_map.h +++ b/include/ouroboros/shm_du_map.h @@ -24,10 +24,6 @@ #ifndef OUROBOROS_SHM_DU_MAP_H #define OUROBOROS_SHM_DU_MAP_H -#ifndef _POSIX_C_SOURCE -#define _POSIX_C_SOURCE 199506L -#endif - #ifndef SHM_DU_BUFF_BLOCK_SIZE #define SHM_DU_BUFF_BLOCK_SIZE sysconf(_SC_PAGESIZE) #endif diff --git a/include/ouroboros/sockets.h b/include/ouroboros/sockets.h index 4c736de2..9904eecd 100644 --- a/include/ouroboros/sockets.h +++ b/include/ouroboros/sockets.h @@ -45,7 +45,6 @@ char * ipcp_sock_path(pid_t pid); int server_socket_open(char * file_name); int client_socket_open(char * file_name); -int send_irm_msg(irm_msg_t * msg); irm_msg_t * send_recv_irm_msg(irm_msg_t * msg); #endif |