Add "extern C {...} to header files for C++ builds.

[freeradius.git] / src / include / modpriv.h

diff --git a/src/include/modpriv.h b/src/include/modpriv.h
index 0aef7ff..43a414d 100644 (file)
--- a/src/include/modpriv.h
+++ b/src/include/modpriv.h
@@ -2,19 +2,51 @@
  * accessed from anywhere else.
  *
  * Version: $Id$ */
-#include "radiusd.h"
-#include "modules.h"
+#ifndef FR_MODPRIV_H
+#define FR_MODPRIV_H
+
+#include <freeradius-devel/radiusd.h>
+#include <freeradius-devel/modules.h>
+
+/*
+ *     Using the native dlopen() API means that we don't want to use libltdl.
+ */
+#ifdef WITH_DLOPEN
+#define WITHOUT_LIBLTDL
+#endif
+
+#ifndef WITHOUT_LIBLTDL
 #include "ltdl.h"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef WITHOUT_LIBLTDL
+typedef void *lt_dlhandle;
+
+lt_dlhandle lt_dlopenext(const char *name);
+void *lt_dlsym(lt_dlhandle handle, const char *symbol);
+int lt_dlclose(lt_dlhandle handle);
+const char *lt_dlerror(void);
+
+#define LTDL_SET_PRELOADED_SYMBOLS(_x)
+#define lt_dlinit(_x) (0)
+#define lt_dlexit(_x)
+#define lt_dlsetsearchpath(_x)
+#endif
 
 /*
  *     Keep track of which modules we've loaded.
  */
-typedef struct module_list_t {
-       struct module_list_t    *next;
+typedef struct module_entry_t {
        char                    name[MAX_STRING_LEN];
-       module_t                *module;
+       const module_t          *module;
        lt_dlhandle             handle;
-} module_list_t;
+} module_entry_t;
+
+typedef struct fr_module_hup_t fr_module_hup_t;
 
 /*
  *     Per-instance data structure, to correlate the modules
@@ -22,13 +54,23 @@ typedef struct module_list_t {
  *     and the per-instance data structures.
  */
 typedef struct module_instance_t {
-       struct module_instance_t *next;
        char                    name[MAX_STRING_LEN];
-       module_list_t           *entry;
+       module_entry_t          *entry;
        void                    *insthandle;
 #ifdef HAVE_PTHREAD_H
        pthread_mutex_t         *mutex;
 #endif
+       CONF_SECTION            *cs;
+       int                     dead;
+       fr_module_hup_t         *mh;
 } module_instance_t;
 
-module_instance_t *find_module_instance(const char *instname);
+module_instance_t *find_module_instance(CONF_SECTION *, const char *instname,
+                                       int do_link);
+int module_hup_module(CONF_SECTION *cs, module_instance_t *node, time_t when);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FR_MODPRIV_H */