summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-04-19 13:42:37 +0200
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-04-19 13:42:37 +0200
commit468729f048f1cdafa7a83ba388bfe2e26588d776 (patch)
tree77dbbaad88cff0122d27c84b83b8deff092bc4ae
parentc0b2bb854f42ed5975a5c08465fd0012c9e5ce8c (diff)
parent34b8b6e39ec45080c89b62994cf3ba8d32e666a1 (diff)
downloadouroboros-468729f048f1cdafa7a83ba388bfe2e26588d776.tar.gz
ouroboros-468729f048f1cdafa7a83ba388bfe2e26588d776.zip
Merged in dstaesse/ouroboros/be-move-flow (pull request #58)
lib: moved flow header and source to ipcpd
-rw-r--r--include/ouroboros/CMakeLists.txt1
-rw-r--r--src/ipcpd/CMakeLists.txt1
-rw-r--r--src/ipcpd/flow.c (renamed from src/lib/flow.c)2
-rw-r--r--src/ipcpd/flow.h (renamed from include/ouroboros/flow.h)0
-rw-r--r--src/ipcpd/ipcp-data.c1
-rw-r--r--src/ipcpd/ipcp-data.h2
-rw-r--r--src/ipcpd/shim-udp/main.c2
-rw-r--r--src/lib/CMakeLists.txt1
8 files changed, 4 insertions, 6 deletions
diff --git a/include/ouroboros/CMakeLists.txt b/include/ouroboros/CMakeLists.txt
index fb4884b7..cfa299ca 100644
--- a/include/ouroboros/CMakeLists.txt
+++ b/include/ouroboros/CMakeLists.txt
@@ -10,7 +10,6 @@ set(HEADER_FILES
dev.h
dif_config.h
du_buff.h
- flow.h
instance_name.h
ipcp.h
irm.h
diff --git a/src/ipcpd/CMakeLists.txt b/src/ipcpd/CMakeLists.txt
index 6311e3dc..5a924ffe 100644
--- a/src/ipcpd/CMakeLists.txt
+++ b/src/ipcpd/CMakeLists.txt
@@ -1,5 +1,6 @@
set(IPCP_SOURCES
# Add source files here
+ ${CMAKE_CURRENT_SOURCE_DIR}/flow.c
${CMAKE_CURRENT_SOURCE_DIR}/ipcp.c
${CMAKE_CURRENT_SOURCE_DIR}/ipcp-data.c
)
diff --git a/src/lib/flow.c b/src/ipcpd/flow.c
index da0ca148..c436733b 100644
--- a/src/lib/flow.c
+++ b/src/ipcpd/flow.c
@@ -21,7 +21,7 @@
*/
#include <stdlib.h>
-#include <ouroboros/flow.h>
+#include "flow.h"
#define OUROBOROS_PREFIX "ipcpd/flow"
diff --git a/include/ouroboros/flow.h b/src/ipcpd/flow.h
index 000de5ad..000de5ad 100644
--- a/include/ouroboros/flow.h
+++ b/src/ipcpd/flow.h
diff --git a/src/ipcpd/ipcp-data.c b/src/ipcpd/ipcp-data.c
index 17649b42..2ed20943 100644
--- a/src/ipcpd/ipcp-data.c
+++ b/src/ipcpd/ipcp-data.c
@@ -22,7 +22,6 @@
*/
#include "ipcp-data.h"
-#include <ouroboros/flow.h>
#include <ouroboros/shm_du_map.h>
#include <ouroboros/list.h>
#include <ouroboros/utils.h>
diff --git a/src/ipcpd/ipcp-data.h b/src/ipcpd/ipcp-data.h
index d51f3730..a8db44f7 100644
--- a/src/ipcpd/ipcp-data.h
+++ b/src/ipcpd/ipcp-data.h
@@ -27,11 +27,11 @@
#include <ouroboros/common.h>
#include <ouroboros/instance_name.h>
#include <ouroboros/list.h>
-#include <ouroboros/flow.h>
#include <sys/types.h>
#include <pthread.h>
#include "ipcp-ops.h"
+#include "flow.h"
struct ipcp_data {
instance_name_t * iname;
diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c
index 45620ee9..df731490 100644
--- a/src/ipcpd/shim-udp/main.c
+++ b/src/ipcpd/shim-udp/main.c
@@ -23,9 +23,9 @@
#include <ouroboros/config.h>
#include "ipcp.h"
+#include "flow.h"
#include <ouroboros/shm_du_map.h>
#include <ouroboros/list.h>
-#include <ouroboros/flow.h>
#include <ouroboros/utils.h>
#include <ouroboros/ipcp.h>
#include <ouroboros/dif_config.h>
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index c2d1bcc7..4922e07c 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -28,7 +28,6 @@ set(SOURCE_FILES
da.c
dev.c
du_buff.c
- flow.c
instance_name.c
ipcp.c
irm.c