BEE Backport bacula/src/lib/plugins.h

This commit is the result of the squash of the following main commits:

diff --git a/bacula/src/lib/plugins.h b/bacula/src/lib/plugins.h
index 6c46da2d43cef29531d768278e34d1fa7142dd96..b355a959eff7109b88b66442a7ab0959e7d3d153 100644 (file)
--- a/bacula/src/lib/plugins.h
+++ b/bacula/src/lib/plugins.h
@@ -57,6 +57,12 @@ struct bpContext {
   void *pContext;                        /* Plugin private context */
 };
 
+/* Not used anymore, do not remove for compatibility */
+#define bplugin_mode_t int32_t
+
+/* default plugin license */
+#define BPLUGIN_LICENSE "AGPLv3"
+
 extern "C" {
 typedef bRC (*t_loadPlugin)(void *binfo, void *bfuncs, void **pinfo, void **pfuncs);
 typedef bRC (*t_unloadPlugin)(void);
@@ -70,9 +76,6 @@ public:
    void *pinfo;
    void *pfuncs;
    void *pHandle;
-   bool disabled;
-   bool restoreFileStarted;
-   bool createFileCalled;
 };
 
 /* Functions */
@@ -87,4 +90,8 @@ extern void unload_plugins();
 typedef void (dbg_plugin_hook_t)(Plugin *plug, FILE *fp);
 extern void dbg_plugin_add_hook(dbg_plugin_hook_t *fct);
 
+#if BEEF
+#include "bee_lib_plugins.h"
+#endif
+
 #endif /* __PLUGINS_H */