summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/ouroboros/shm_rdrbuff.h16
-rw-r--r--include/ouroboros/wrap/CMakeLists.txt3
-rw-r--r--src/ipcpd/local/main.c2
-rw-r--r--src/lib/shm_rdrbuff.c16
4 files changed, 20 insertions, 17 deletions
diff --git a/include/ouroboros/shm_rdrbuff.h b/include/ouroboros/shm_rdrbuff.h
index 09256c56..6cdaa7bf 100644
--- a/include/ouroboros/shm_rdrbuff.h
+++ b/include/ouroboros/shm_rdrbuff.h
@@ -67,18 +67,18 @@ int shm_rdrbuff_remove(struct shm_rdrbuff * rdrb,
uint8_t * shm_du_buff_head_alloc(struct shm_rdrbuff * rdrb,
- int idx,
- ssize_t size);
+ ssize_t idx,
+ size_t size);
uint8_t * shm_du_buff_tail_alloc(struct shm_rdrbuff * rdrb,
- int idx,
- ssize_t size);
+ ssize_t idx,
+ size_t size);
int shm_du_buff_head_release(struct shm_rdrbuff * rdrb,
- int idx,
- ssize_t size);
+ ssize_t idx,
+ size_t size);
int shm_du_buff_tail_release(struct shm_rdrbuff * rdrb,
- int idx,
- ssize_t size);
+ ssize_t idx,
+ size_t size);
#endif /* OUROBOROS_SHM_RDRBUFF_H */
diff --git a/include/ouroboros/wrap/CMakeLists.txt b/include/ouroboros/wrap/CMakeLists.txt
index 39737bbc..16c86611 100644
--- a/include/ouroboros/wrap/CMakeLists.txt
+++ b/include/ouroboros/wrap/CMakeLists.txt
@@ -1,5 +1,8 @@
find_package(SWIG)
+include_directories(${CMAKE_SOURCE_DIR}/include)
+include_directories(${CMAKE_BINARY_DIR}/include)
+
if (NOT SWIG_FOUND)
message("-- SWIG not found: Bindings for other languages disabled.")
else ()
diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index 4fa7e33f..f1b6dd9e 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -393,7 +393,7 @@ static int ipcp_local_flow_alloc_resp(pid_t n_api,
int response)
{
struct shm_ap_rbuff * rb;
- int in_fd = -1;\
+ int in_fd = -1;
int out_fd = -1;
int ret = -1;
diff --git a/src/lib/shm_rdrbuff.c b/src/lib/shm_rdrbuff.c
index 96f54bd5..93a889ce 100644
--- a/src/lib/shm_rdrbuff.c
+++ b/src/lib/shm_rdrbuff.c
@@ -691,8 +691,8 @@ int shm_rdrbuff_remove(struct shm_rdrbuff * rdrb, ssize_t idx)
}
uint8_t * shm_du_buff_head_alloc(struct shm_rdrbuff * rdrb,
- int idx,
- ssize_t size)
+ ssize_t idx,
+ size_t size)
{
struct shm_du_buff * sdb;
uint8_t * buf;
@@ -729,8 +729,8 @@ uint8_t * shm_du_buff_head_alloc(struct shm_rdrbuff * rdrb,
}
uint8_t * shm_du_buff_tail_alloc(struct shm_rdrbuff * rdrb,
- int idx,
- ssize_t size)
+ ssize_t idx,
+ size_t size)
{
struct shm_du_buff * sdb;
uint8_t * buf;
@@ -767,8 +767,8 @@ uint8_t * shm_du_buff_tail_alloc(struct shm_rdrbuff * rdrb,
}
int shm_du_buff_head_release(struct shm_rdrbuff * rdrb,
- int idx,
- ssize_t size)
+ ssize_t idx,
+ size_t size)
{
struct shm_du_buff * sdb;
@@ -803,8 +803,8 @@ int shm_du_buff_head_release(struct shm_rdrbuff * rdrb,
}
int shm_du_buff_tail_release(struct shm_rdrbuff * rdrb,
- int idx,
- ssize_t size)
+ ssize_t idx,
+ size_t size)
{
struct shm_du_buff * sdb;