Merge pull request #285 from edk0/ratelimits

[solanum.git] / include / modules.h

diff --git a/include/modules.h b/include/modules.h
index b2ff535bfb3a007f3aafab2d71042d7aa89c6b68..bfc502f11b85287c9ef390c129d00a452ee71c77 100644 (file)
--- a/include/modules.h
+++ b/include/modules.h
@@ -25,7 +25,7 @@
 #ifndef INCLUDED_modules_h
 #define INCLUDED_modules_h
 #include "serno.h"
-#include "config.h"
+#include "defaults.h"
 #include "setup.h"
 #include "parse.h"
 
@@ -42,10 +42,11 @@ struct module
        const char *version;
        const char *description;
        lt_dlhandle address;
-       int core;
-       int origin;
+       int core;       /* This is int for backwards compat reasons */
+       int origin;     /* Ditto */
        int mapi_version;
        void *mapi_header; /* actually struct mapi_mheader_av<mapi_version> */
+       rb_dlink_node node;
 };
 
 #define MAPI_MAGIC_HDR 0x4D410000
@@ -121,19 +122,26 @@ struct mapi_mheader_av2
 void mod_add_path(const char *path);
 void mod_clear_paths(void);
 
+/* cap-notify utilities */
+extern void mod_remember_clicaps(void);
+extern void mod_notify_clicaps(void);
+
 /* load a module */
 extern void load_module(char *path);
 
 /* load all modules */
-extern void load_all_modules(int warn);
+extern void load_all_modules(bool warn);
 
 /* load core modules */
-extern void load_core_modules(int);
+extern void load_core_modules(bool);
+
+extern bool unload_one_module(const char *, bool);
+extern bool load_one_module(const char *, int, bool);
+extern bool load_a_module(const char *, bool, int, bool);
+extern struct module *findmodule_byname(const char *);
+extern void init_modules(void);
 
-extern int unload_one_module(const char *, int);
-extern int load_one_module(const char *, int, int);
-extern int load_a_module(const char *, int, int, int);
-extern int findmodule_byname(const char *);
-extern void modules_init(void);
+extern rb_dlink_list module_list;
+extern rb_dlink_list mod_paths;
 
 #endif /* INCLUDED_modules_h */