no elif

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

diff --git a/include/frsh_fna.h b/include/frsh_fna.h
index 49041142f48edf6aee9724cc95009fec0cc3997f..bcf505663e22f15c634094898aa031c33b71b480 100644 (file)
--- a/include/frsh_fna.h
+++ b/include/frsh_fna.h
@@ -66,21 +66,14 @@
 #ifndef _FRSH_FNA_H_
 #define _FRSH_FNA_H_
 
-/* for frsh_resource_id_t */
-#include "frsh_core_types.h"
-/* for frsh_network_address_t, frsh_stream_id_t */
-#include "frsh_distributed_types.h"
-/* for timespec */
-#include <time.h>
-/* for bool */
-#include <stdbool.h>
+#include "frsh_core_types.h" /* for frsh_resource_id_t */
+#include "frsh_distributed_types.h" /* network_address_t, stream_id_t */
+#include <time.h> /* for timespec */
+#include <stdbool.h> /* for bool */
+#include "fna_configuration.h"
 
 #ifdef RTEP
-/* for rtep_priority_t, rtep_channel_t, rtep_station_id_t,
-rtep_server_id_t, rtep_mutex_id_t, rtep_budget_t */
    #include "rtep.h"
-#elif OTHER
-   ...
 #endif
 
 /**
@@ -135,8 +128,6 @@ 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);
-#elif OTHER
-   ...
 #endif
 
 /**
@@ -164,8 +155,6 @@ 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);
-#elif OTHER
-   ...
 #endif
 
 /*@}*/
@@ -211,8 +200,6 @@ int frsh_rtep_map_stream_id
 int frsh_rtep_negotiation_messages_vres_renegotiate
       (const frsh_resource_id_t resource_id,
        const struct timespec *period);
-#elif OTHER
-   ...
 #endif
 
 /**
@@ -237,8 +224,6 @@ int frsh_rtep_negotiation_messages_vres_renegotiate
 int frsh_rtep_negotiation_messages_vres_get_period
       (const frsh_resource_id_t resource_id,
        struct timespec *period);
-#elif OTHER
-   ...
 #endif
 
 /**
@@ -271,8 +256,6 @@ int frsh_rtep_service_thread_vres_renegotiate
     const struct timespec *budget,
     const struct timespec *period,
     bool *accepted);
-#elif OTHER
-   ...
 #endif
 
 /**
@@ -298,8 +281,6 @@ int frsh_rtep_service_thread_vres_get_budget_and_period
       (const frsh_resource_id_t resource_id,
        struct timespec *budget,
        struct timespec *period);
-#elif OTHER
-   ...
 #endif
 
 /*@}*/