use frsh.h only, headers mess otherwise

git-svn-id: http://www.frescor.org/private/svn/frescor/fna/trunk@1076 35b4ef3e-fd22-0410-ab77-dab3279adceb

diff --git a/tests/tests_rtep_fna/Makefile b/tests/tests_rtep_fna/Makefile
index 3c03214b640de5987a5becb485f97e300a62b9aa..368285976b3a53fb17b6c6a04ba87bf912c9800d 100755 (executable)
--- a/tests/tests_rtep_fna/Makefile
+++ b/tests/tests_rtep_fna/Makefile
@@ -4,4 +4,5 @@ include ../../rules.mk
 CFLAGS += -I$(FNA_PATH)/src_rtep/ -I$(PLATFORM_PATH)/drivers/rt-ep/ \
        $(PLATFORM_PATH)/misc/logger.o $(PLATFORM_PATH)/misc/time_measurement_hwtime.o
 LDFLAGS += -L$(FNA_PATH)/lib -lrtepfna -L$(PLATFORM_PATH)/drivers/rt-ep -lrtep \
-       -L$(FRSH_PATH)/lib -lfrsh -L$(FOSA_PATH)/lib -lfosa_$(PLATFORM) -lm -lfna
+       -L$(FRSH_PATH)/lib -lfrsh -L$(FOSA_PATH)/lib -lfosa_$(PLATFORM) \
+       -L$(UTILS_PATH)/lib -lutils -lm -lfna

diff --git a/tests/tests_rtep_fna/test_c_rtep_fna.c b/tests/tests_rtep_fna/test_c_rtep_fna.c
index c9e162d3f1c1b278e15addf5f489bdb59596b913..3f5daecf6f42328cdf509eb8d0bdf5c21ed61228 100644 (file)
--- a/tests/tests_rtep_fna/test_c_rtep_fna.c
+++ b/tests/tests_rtep_fna/test_c_rtep_fna.c
@@ -70,9 +70,7 @@
 #include <stdio.h> // for printf
 #include <time.h> // for timespec
 
-#include "frsh_core.h" // for frsh_contract_set_xxx
-#include "frsh_core_types.h" // for FRSH_NETWORK_ID_DEFAULT
-#include "frsh_distributed_types.h" // for frsh_network_address_t, frsh_stream_id_t
+#include "frsh.h" // for frsh_contract_set_xxx, FRSH_NETWORK_ID_DEFAULT, frsh_network_address_t, frsh_stream_id_t
 
 #include "fna.h" // for fna_vres_id_t
 #include "frsh_fna.h" // for frsh_rtep_*

diff --git a/tests/tests_rtep_fna/test_c_rtep_fna_measurement.c b/tests/tests_rtep_fna/test_c_rtep_fna_measurement.c
index 2581bd114da281b10816ca98b17dcdbe35da9404..fb3e9d3a8ec1ada22177b38d0ec70d48a3d8bab5 100644 (file)
--- a/tests/tests_rtep_fna/test_c_rtep_fna_measurement.c
+++ b/tests/tests_rtep_fna/test_c_rtep_fna_measurement.c
@@ -69,9 +69,7 @@
 #include <assert.h> // for assert
 #include <time.h> // for timespec
 
-#include "frsh_core.h" // for frsh_contract_set_xxx
-#include "frsh_core_types.h" // for FRSH_NETWORK_ID_DEFAULT
-#include "frsh_distributed_types.h" // for frsh_network_address_t, frsh_stream_id_t
+#include "frsh.h" // for frsh_contract_set_xxx, FRSH_NETWORK_ID_DEFAULT, frsh_network_address_t, frsh_stream_id_t
 
 #include "fna.h" // for fna_vres_id_t
 #include "frsh_fna.h" // for frsh_rtep_*

diff --git a/tests/tests_rtep_fna/test_c_rtep_fna_with_frsh.c b/tests/tests_rtep_fna/test_c_rtep_fna_with_frsh.c
index 97f5995eb4ae359b4daa1e45952afbeb81d6ea76..ea597713dfd614f3c78aba0c775c7cfe502394c9 100644 (file)
--- a/tests/tests_rtep_fna/test_c_rtep_fna_with_frsh.c
+++ b/tests/tests_rtep_fna/test_c_rtep_fna_with_frsh.c
@@ -70,9 +70,7 @@
 #include <stdio.h> // for printf
 #include <time.h> // for timespec
 
-#include "frsh_core.h" // for frsh_contract_set_xxx
-#include "frsh_core_types.h" // for FRSH_RESOURCE_ID_DEFAULT
-#include "frsh_distributed_types.h" // for frsh_network_address_t, frsh_stream_id_t
+#include "frsh.h" // for frsh_contract_set_xxx, FRSH_RESOURCE_ID_DEFAULT, frsh_network_address_t, frsh_stream_id_t
 
 #include "fna.h" // for fna_vres_id_t
 #include "frsh_fna.h" // for frsh_rtep_*

diff --git a/tests/tests_rtep_fna/test_c_rtep_frsh_fna.c b/tests/tests_rtep_fna/test_c_rtep_frsh_fna.c
index b7da0f22dcd25ad62bcd58084a8f7baf70b3fecb..ba8ee26f59c1510bde783c64c143027c9f45e60e 100644 (file)
--- a/tests/tests_rtep_fna/test_c_rtep_frsh_fna.c
+++ b/tests/tests_rtep_fna/test_c_rtep_frsh_fna.c
@@ -74,12 +74,10 @@
 #include <stdio.h> // for printf
 #include <stdbool.h> // for bool
 
-#include "frsh_core_types.h" // for FRSH_RESOURCE_ID_DEFAULT
-#include "frsh_distributed_types.h" // frsh_network_address_t, frsh_stream_id_t
+#include "frsh.h" // for FRSH_RESOURCE_ID_DEFAULT, frsh_network_address_t, frsh_stream_id_t
 
 #include "rtep_fna.h" // for rtep_fna_operations.fna_init
 #include "rtep.h" // for rtep_station_id_t, rtep_channel_t
-
 #include "frsh_fna.h" // for frsh_rtep_*
 
 int main ()