diff -up bacula-5.0.1/src/lib/lockmgr.h.orig bacula-5.0.1/src/lib/lockmgr.h --- bacula-5.0.1/src/lib/lockmgr.h.orig 2010-02-24 16:33:48.000000000 +0100 +++ bacula-5.0.1/src/lib/lockmgr.h 2010-03-02 21:09:13.000000000 +0100 @@ -104,9 +104,11 @@ void lmgr_do_lock(void *m, int prio=0, /* Call just before releasing the lock */ void lmgr_do_unlock(void *m); +#ifndef HAVE_WXCONSOLE /* We use C++ mangling to make integration eaysier */ int pthread_mutex_init(bthread_mutex_t *m, const pthread_mutexattr_t *attr); int pthread_mutex_destroy(bthread_mutex_t *m); +#endif void bthread_mutex_set_priority(bthread_mutex_t *m, int prio); diff -up bacula-5.0.1/src/wx-console/wxbrestorepanel.cpp.orig bacula-5.0.1/src/wx-console/wxbrestorepanel.cpp --- bacula-5.0.1/src/wx-console/wxbrestorepanel.cpp.orig 2010-02-24 16:33:48.000000000 +0100 +++ bacula-5.0.1/src/wx-console/wxbrestorepanel.cpp 2010-03-02 21:10:00.000000000 +0100 @@ -76,6 +76,7 @@ Select parameter to modify (1-11): #include "csprint.h" #include #include +#include #include #include "unmarked.xpm" #include "marked.xpm"