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 912df4c..43a414d 100644 (file)
--- a/src/include/modpriv.h
+++ b/src/include/modpriv.h
@@ -2,22 +2,38 @@
  * accessed from anywhere else.
  *
  * Version: $Id$ */
+#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"
-#else
+#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_dlclose(_x)
 #define lt_dlexit(_x)
-#define lt_dlerror(foo) "Internal error"
 #define lt_dlsetsearchpath(_x)
 #endif
 
@@ -30,6 +46,8 @@ typedef struct module_entry_t {
        lt_dlhandle             handle;
 } module_entry_t;
 
+typedef struct fr_module_hup_t fr_module_hup_t;
+
 /*
  *     Per-instance data structure, to correlate the modules
  *     with the instance names (may NOT be the module names!),
@@ -43,9 +61,16 @@ typedef struct module_instance_t {
        pthread_mutex_t         *mutex;
 #endif
        CONF_SECTION            *cs;
-       void                    *old_insthandle[16];
+       int                     dead;
+       fr_module_hup_t         *mh;
 } module_instance_t;
 
 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 */