More tweaks for job_code_edit on Win32

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6139 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index e77832c2336f7e860b0fcf9636c53d91553565f4..61d248b687178be6f61076a0960344dd8db65676 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -31,6 +31,9 @@
  *   Version $Id$
  */
 
+#ifndef __LIBPROTOS_H
+#define __LIBPROTOS_H
+
 class JCR;
 
 /* attr.c */
@@ -342,3 +345,5 @@ btimer_t *start_thread_timer(JCR *jcr, pthread_t tid, uint32_t wait);
 void stop_thread_timer(btimer_t *wid);
 btimer_t *start_bsock_timer(BSOCK *bs, uint32_t wait);
 void stop_bsock_timer(btimer_t *wid);
+
+#endif /* __LIBPROTOS_H */

diff --git a/bacula/src/lib/runscript.c b/bacula/src/lib/runscript.c
index 0b9db7848d524ca4782eff15a9ad8d304ecad134..1041be32450a222b4eef45eab7a67f92a5025bab 100644 (file)
--- a/bacula/src/lib/runscript.c
+++ b/bacula/src/lib/runscript.c
@@ -37,7 +37,6 @@
 
 #include "bacula.h"
 #include "jcr.h"
-
 #include "runscript.h"
 
 RUNSCRIPT *new_runscript()

diff --git a/bacula/src/lib/runscript.h b/bacula/src/lib/runscript.h
index 27b678b7cc3045439472e088af8904d25d57ce2d..b07e0852a7101bbc78930241a83bdd65ed4507e4 100644 (file)
--- a/bacula/src/lib/runscript.h
+++ b/bacula/src/lib/runscript.h
@@ -35,6 +35,8 @@
 #ifndef __RUNSCRIPT_H_
 #define __RUNSCRIPT_H_ 1
 
+#include "protos.h"
+
 /* Usage:
  *
  * #define USE_RUNSCRIPT
@@ -74,7 +76,7 @@ public:
    /* TODO : drop this with bacula 1.42 */
    bool old_proto;              /* used by old 1.3X protocol */
    job_code_callback_t job_code_callback;
-                               /* Optional callback function passed to edit_job_code */
+                                /* Optional callback function passed to edit_job_code */
 
    bool run(JCR *job, const char *name=""); /* name must contain "Before" or "After" keyword */
    bool can_run_at_level(int JobLevel) { return true;};        /* TODO */

diff --git a/bacula/src/win32/dll/bacula.def b/bacula/src/win32/dll/bacula.def
index 5a0e8217eef31d071a71db6961161b36703b3527..0aabc357ccd16e7bc12cc6fe84a9c4ecc32fd4d5 100644 (file)
--- a/bacula/src/win32/dll/bacula.def
+++ b/bacula/src/win32/dll/bacula.def
@@ -580,6 +580,7 @@ _ZN6rblist6searchEPvPFiS0_S0_E
 _ZN6rblist7destroyEv
  
 ; runscript.o
+_ZN9RUNSCRIPT21set_job_code_callbackEPFPcP3JCRPKcE
 _Z11run_scriptsP3JCRP5alistPKc
 _Z13new_runscriptv
 _Z14copy_runscriptP9RUNSCRIPT