From 8f58e5a3ec0e4a15fc8ae0911cc864f5dbf86c6e Mon Sep 17 00:00:00 2001
From: dimitri staessens <dimitri.staessens@ugent.be>
Date: Fri, 18 Aug 2017 15:56:55 +0200
Subject: build: Revise the build system

This revises the build system to have configuration per system
component. System settings can now be set using cmake.

The standard compliance defines were removed from configuration header
and are set in the sources where needed. Also some small code
refactors, such as moving the data for shims out of the ipcp structure
to the respective shims were performed.
---
 src/ipcpd/ipcp.h | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/ipcpd/ipcp.h')

diff --git a/src/ipcpd/ipcp.h b/src/ipcpd/ipcp.h
index 422670d7..cd18d198 100644
--- a/src/ipcpd/ipcp.h
+++ b/src/ipcpd/ipcp.h
@@ -20,16 +20,14 @@
  * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
-#ifndef IPCPD_IPCP_H
-#define IPCPD_IPCP_H
+#ifndef OUROBOROS_IPCPD_IPCP_H
+#define OUROBOROS_IPCPD_IPCP_H
 
-#include <ouroboros/config.h>
 #include <ouroboros/hash.h>
 #include <ouroboros/ipcp.h>
+#include <ouroboros/qoscube.h>
 #include <ouroboros/sockets.h>
 
-#include "shim-data.h"
-
 #include <pthread.h>
 #include <time.h>
 #include <signal.h>
@@ -80,8 +78,6 @@ struct ipcp {
         struct ipcp_ops *  ops;
         int                irmd_fd;
 
-        struct shim_data * shim_data;
-
         enum ipcp_state    state;
         pthread_rwlock_t   state_lock;
         pthread_mutex_t    state_mtx;
@@ -136,4 +132,4 @@ uint8_t *       ipcp_hash_dup(const uint8_t * hash);
 void            ipcp_hash_str(char            buf[],
                               const uint8_t * hash);
 
-#endif
+#endif /* OUROBOROS_IPCPD_IPCP_H */
-- 
cgit v1.2.3