From e276041be5adcaf99a5ad154a1bb8915f1ca03bd Mon Sep 17 00:00:00 2001 From: sangorrin Date: Mon, 7 Apr 2008 15:58:28 +0000 Subject: [PATCH] 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 --- tests/tests_rtep_fna/Makefile | 3 ++- tests/tests_rtep_fna/test_c_rtep_fna.c | 4 +--- tests/tests_rtep_fna/test_c_rtep_fna_measurement.c | 4 +--- tests/tests_rtep_fna/test_c_rtep_fna_with_frsh.c | 4 +--- tests/tests_rtep_fna/test_c_rtep_frsh_fna.c | 4 +--- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/tests/tests_rtep_fna/Makefile b/tests/tests_rtep_fna/Makefile index 3c03214..3682859 100755 --- 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 c9e162d..3f5daec 100644 --- 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 // for printf #include // 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 2581bd1..fb3e9d3 100644 --- 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 // for assert #include // 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 97f5995..ea59771 100644 --- 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 // for printf #include // 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 b7da0f2..ba8ee26 100644 --- 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 // for printf #include // 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 () -- 2.39.2