X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Finclude%2Fmodcall.h;h=9a95565d538c4bc3025d13894efef3104fae0a43;hb=e2eaf9194b16fdd15ebf274aafd05edc9fefb4bb;hp=adb472f594bf9298a72dfe8a1936f4e84e338419;hpb=d9acda4858a4a87a70db4356dac4c52e61cdf5d9;p=freeradius.git

diff --git a/src/include/modcall.h b/src/include/modcall.h
index adb472f..9a95565 100644
--- a/src/include/modcall.h
+++ b/src/include/modcall.h
@@ -1,10 +1,17 @@
+#ifndef FR_MODCALL_H
+#define FR_MODCALL_H
+
 /* modcall.h: the outside interface to the module-calling tree. Includes
  * functions to build the tree from the config file, and to call it by
  * feeding it REQUESTs.
  *
  * Version: $Id$ */
 
-#include "conffile.h" /* Need CONF_* definitions */
+#include <freeradius-devel/conffile.h> /* Need CONF_* definitions */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
  *	For each authorize/authtype/etc, we have an ordered
@@ -17,18 +24,24 @@ int modcall(int component, modcallable *c, REQUEST *request);
 
 /* Parse a module-method's config section (e.g. authorize{}) into a tree that
  * may be called with modcall() */
-modcallable *compile_modgroup(int component, CONF_SECTION *cs,
-		const char *filename);
+modcallable *compile_modgroup(modcallable *parent,
+			      int component, CONF_SECTION *cs);
 
 /* Create a single modcallable node that references a module instance. This
  * may be a CONF_SECTION containing action specifiers like "notfound = return"
  * or a simple CONF_PAIR, in which case the default actions are used. */
-modcallable *compile_modsingle(int component, CONF_ITEM *ci,
-		const char *filename, const char **modname);
+modcallable *compile_modsingle(modcallable *parent, int component, CONF_ITEM *ci,
+			       const char **modname);
 
 /* Add an entry to the end of a modgroup, creating it first if necessary */
 void add_to_modcallable(modcallable **parent, modcallable *this,
-		int component, char *name);
+			int component, const char *name);
 
 /* Free a tree returned by compile_modgroup or compile_modsingle */
 void modcallable_free(modcallable **pc);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif