summaryrefslogtreecommitdiff
path: root/src/tools/oping
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-08-18 15:56:55 +0200
committerdimitri staessens <dimitri.staessens@ugent.be>2017-08-21 10:25:19 +0200
commit8f58e5a3ec0e4a15fc8ae0911cc864f5dbf86c6e (patch)
tree0535742162921dc0d19c16f5b02d2f1c8f4fc493 /src/tools/oping
parenteefae235dd7af96eef3dc4f82f706170c379d260 (diff)
downloadouroboros-8f58e5a3ec0e4a15fc8ae0911cc864f5dbf86c6e.tar.gz
ouroboros-8f58e5a3ec0e4a15fc8ae0911cc864f5dbf86c6e.zip
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.
Diffstat (limited to 'src/tools/oping')
-rw-r--r--src/tools/oping/CMakeLists.txt2
-rw-r--r--src/tools/oping/oping.c1
-rw-r--r--src/tools/oping/oping_client.c4
-rw-r--r--src/tools/oping/oping_server.c4
4 files changed, 3 insertions, 8 deletions
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>