preparing to do unix fna

[frescor/fna.git] / include / frsh_fna.h

diff --git a/include/frsh_fna.h b/include/frsh_fna.h
index bcf505663e22f15c634094898aa031c33b71b480..4c2af91c0fa00cf19368847e7b4bb9da6a703f5e 100644 (file)
--- a/include/frsh_fna.h
+++ b/include/frsh_fna.h
@@ -72,7 +72,7 @@
 #include <stdbool.h> /* for bool */
 #include "fna_configuration.h"
 
-#ifdef RTEP
+#ifdef RTEP_FNA_ENABLED
    #include "rtep.h"
 #endif
 
@@ -123,11 +123,10 @@
  *   FNA_ERR_BAD_ARGUMENT: if pointers are NULL \n
  *
  **/
-#ifdef RTEP
-int frsh_rtep_map_network_address
-      (const frsh_resource_id_t resource_id,
-       const rtep_station_id_t in_address,
-       frsh_network_address_t *out_address);
+#ifdef RTEP_FNA_ENABLED
+int frsh_rtep_map_network_address(const frsh_resource_id_t resource_id,
+                                  const rtep_station_id_t in_address,
+                                  frsh_network_address_t *out_address);
 #endif
 
 /**
@@ -150,11 +149,10 @@ int frsh_rtep_map_network_address
  *   FNA_ERR_BAD_ARGUMENT: if pointers are NULL \n
  *
  **/
-#ifdef RTEP
-int frsh_rtep_map_stream_id
-      (const frsh_resource_id_t resource_id,
-       const rtep_channel_t in_stream,
-       frsh_stream_id_t *out_stream);
+#ifdef RTEP_FNA_ENABLED
+int frsh_rtep_map_stream_id(const frsh_resource_id_t resource_id,
+                            const rtep_channel_t in_stream,
+                            frsh_stream_id_t *out_stream);
 #endif
 
 /*@}*/
@@ -196,7 +194,7 @@ int frsh_rtep_map_stream_id
  *   FNA_ERR_REJECTED_CONTRACT : if the renegotiation fails \n
  *
  **/
-#ifdef RTEP
+#ifdef RTEP_FNA_ENABLED
 int frsh_rtep_negotiation_messages_vres_renegotiate
       (const frsh_resource_id_t resource_id,
        const struct timespec *period);
@@ -220,7 +218,7 @@ int frsh_rtep_negotiation_messages_vres_renegotiate
  *   FNA_ERR_BAD_ARGUMENT: if pointers are NULL \n
  *
  **/
-#ifdef RTEP
+#ifdef RTEP_FNA_ENABLED
 int frsh_rtep_negotiation_messages_vres_get_period
       (const frsh_resource_id_t resource_id,
        struct timespec *period);
@@ -250,7 +248,7 @@ int frsh_rtep_negotiation_messages_vres_get_period
  *   FNA_ERR_BAD_ARGUMENT: if pointers are NULL \n
  *
  **/
-#ifdef RTEP
+#ifdef RTEP_FNA_ENABLED
 int frsh_rtep_service_thread_vres_renegotiate
    (const frsh_resource_id_t resource_id,
     const struct timespec *budget,
@@ -276,7 +274,7 @@ int frsh_rtep_service_thread_vres_renegotiate
  *   FNA_ERR_BAD_ARGUMENT: if pointers are NULL \n
  *
  **/
-#ifdef RTEP
+#ifdef RTEP_FNA_ENABLED
 int frsh_rtep_service_thread_vres_get_budget_and_period
       (const frsh_resource_id_t resource_id,
        struct timespec *budget,