Move public interface functions below callbacks

diff --git a/src/include/modules.h b/src/include/modules.h
index c8b9e03761294457abff240d8c2077939a81d24b..c5fc3f3e4e3984b377c56cb92752694e92365433 100644 (file)
--- a/src/include/modules.h
+++ b/src/include/modules.h
@@ -207,20 +207,6 @@ int                virtual_servers_bootstrap(CONF_SECTION *config);
 CONF_SECTION   *virtual_server_find(char const *name);
 void           fr_request_async_bootstrap(REQUEST *request, fr_event_list_t *el); /* for unit_test_module */
 
-/*
- *     In unlang_interpret.c, but here for public consumption.
- */
-void           unlang_push_section(REQUEST *request, CONF_SECTION *cs, rlm_rcode_t default_action);
-
-rlm_rcode_t    unlang_interpret_continue(REQUEST *request);
-
-rlm_rcode_t    unlang_interpret(REQUEST *request, CONF_SECTION *cs, rlm_rcode_t default_action);
-
-rlm_rcode_t    unlang_interpret_synchronous(REQUEST *request, CONF_SECTION *cs, rlm_rcode_t action);
-
-int            unlang_compile(CONF_SECTION *cs, rlm_components_t component);
-int            unlang_compile_subsection(CONF_SECTION *server_cs, char const *name1, char const *name2, rlm_components_t component);
-
 /** A callback when the the timeout occurs
  *
  * Used when a module needs wait for an event.
@@ -281,6 +267,20 @@ typedef rlm_rcode_t (*fr_unlang_resume_callback_t)(REQUEST *request, void *insta
 typedef void (*fr_unlang_action_t)(REQUEST *request, void *instance, void *thread, void *ctx,
                                   fr_state_action_t action);
 
+/*
+ *     In unlang_interpret.c, but here for public consumption.
+ */
+void           unlang_push_section(REQUEST *request, CONF_SECTION *cs, rlm_rcode_t default_action);
+
+rlm_rcode_t    unlang_interpret_continue(REQUEST *request);
+
+rlm_rcode_t    unlang_interpret(REQUEST *request, CONF_SECTION *cs, rlm_rcode_t default_action);
+
+rlm_rcode_t    unlang_interpret_synchronous(REQUEST *request, CONF_SECTION *cs, rlm_rcode_t action);
+
+int            unlang_compile(CONF_SECTION *cs, rlm_components_t component);
+int            unlang_compile_subsection(CONF_SECTION *server_cs, char const *name1, char const *name2, rlm_components_t component);
+
 int            unlang_event_timeout_add(REQUEST *request, fr_unlang_timeout_callback_t callback,
                                         void const *ctx, struct timeval *timeout);