diff --git a/include/villas/nodes/ethercat.hpp b/include/villas/nodes/ethercat.hpp index d4bafdda3..8a1e55a84 100644 --- a/include/villas/nodes/ethercat.hpp +++ b/include/villas/nodes/ethercat.hpp @@ -41,14 +41,12 @@ #include #include -// Include hard-coded Ethercat Bus configuration +/* Include hard-coded Ethercat Bus configuration */ #include -#ifdef __cplusplus extern "C" { -#endif - -#include + #include +} #define DEFAULT_ETHERCAT_QUEUE_LENGTH (DEFAULT_QUEUE_LENGTH * 64) #define DEFAULT_ETHERCAT_SAMPLE_LENGTH DEFAULT_SAMPLE_LENGTH @@ -116,9 +114,4 @@ int ethercat_read(struct vnode *n, struct sample *smps[], unsigned cnt, unsigned /** @see node_type::write */ int ethercat_write(struct vnode *n, struct sample *smps[], unsigned cnt, unsigned *release); - /** @} */ - -#ifdef __cplusplus -} -#endif diff --git a/include/villas/super_node.hpp b/include/villas/super_node.hpp index 4451be1d8..3ce2c193e 100644 --- a/include/villas/super_node.hpp +++ b/include/villas/super_node.hpp @@ -27,7 +27,7 @@ #ifdef WITH_GRAPHVIZ extern "C" { - #include + #include } #endif diff --git a/lib/api/requests/graph.cpp b/lib/api/requests/graph.cpp index c3eafbc19..97416945d 100644 --- a/lib/api/requests/graph.cpp +++ b/lib/api/requests/graph.cpp @@ -20,11 +20,9 @@ * along with this program. If not, see . *********************************************************************************/ -#ifdef WITH_GRAPHVIZ extern "C" { - #include + #include } -#endif #include #include diff --git a/lib/nodes/rtp.cpp b/lib/nodes/rtp.cpp index 46c536999..41940a050 100644 --- a/lib/nodes/rtp.cpp +++ b/lib/nodes/rtp.cpp @@ -30,13 +30,13 @@ #include extern "C" { - #include - #include - #include - #include - #include - #include - #undef ALIGN_MASK + #include + #include + #include + #include + #include + #include + #undef ALIGN_MASK } #include