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/tools/oping/CMakeLists.txt | 2 ++
 src/tools/oping/oping.c        | 1 +
 src/tools/oping/oping_client.c | 4 ----
 src/tools/oping/oping_server.c | 4 ----
 4 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/tools/oping')

diff --git a/src/tools/oping/CMakeLists.txt b/src/tools/oping/CMakeLists.txt
index f129a02b..b95add7e 100644
--- a/src/tools/oping/CMakeLists.txt
+++ b/src/tools/oping/CMakeLists.txt
@@ -9,6 +9,8 @@ if(NOT LIBM_LIBRARIES)
   message(FATAL_ERROR "libm not found")
 endif()
 
+mark_as_advanced(LIBM_LIBRARIES)
+
 set(SOURCE_FILES
   # Add source files here
   oping.c
diff --git a/src/tools/oping/oping.c b/src/tools/oping/oping.c
index be87343e..13132815 100644
--- a/src/tools/oping/oping.c
+++ b/src/tools/oping/oping.c
@@ -21,6 +21,7 @@
  */
 
 #define _POSIX_C_SOURCE 199506L
+#define __XSI_VISIBLE   500
 
 #include <ouroboros/fqueue.h>
 #include <ouroboros/dev.h>
diff --git a/src/tools/oping/oping_client.c b/src/tools/oping/oping_client.c
index d0fc2d66..db0ef199 100644
--- a/src/tools/oping/oping_client.c
+++ b/src/tools/oping/oping_client.c
@@ -24,10 +24,6 @@
 #include <ouroboros/fcntl.h>
 #include <ouroboros/time_utils.h>
 
-#ifdef __FreeBSD__
-#define __XSI_VISIBLE 500
-#endif
-
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/time.h>
diff --git a/src/tools/oping/oping_server.c b/src/tools/oping/oping_server.c
index 3a7f061c..57d1fd7c 100644
--- a/src/tools/oping/oping_server.c
+++ b/src/tools/oping/oping_server.c
@@ -20,10 +20,6 @@
  * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
-#ifdef __FreeBSD__
-#define __XSI_VISIBLE 500
-#endif
-
 #include <stdlib.h>
 #include <signal.h>
 #include <arpa/inet.h>
-- 
cgit v1.2.3