| 1 |
diff -up bacula-5.0.1/src/lib/lockmgr.h.orig bacula-5.0.1/src/lib/lockmgr.h |
| 2 |
--- bacula-5.0.1/src/lib/lockmgr.h.orig 2010-02-24 16:33:48.000000000 +0100 |
| 3 |
+++ bacula-5.0.1/src/lib/lockmgr.h 2010-03-02 21:09:13.000000000 +0100 |
| 4 |
@@ -104,9 +104,11 @@ void lmgr_do_lock(void *m, int prio=0, |
| 5 |
/* Call just before releasing the lock */ |
| 6 |
void lmgr_do_unlock(void *m); |
| 7 |
|
| 8 |
+#ifndef HAVE_WXCONSOLE |
| 9 |
/* We use C++ mangling to make integration eaysier */ |
| 10 |
int pthread_mutex_init(bthread_mutex_t *m, const pthread_mutexattr_t *attr); |
| 11 |
int pthread_mutex_destroy(bthread_mutex_t *m); |
| 12 |
+#endif |
| 13 |
|
| 14 |
void bthread_mutex_set_priority(bthread_mutex_t *m, int prio); |
| 15 |
|
| 16 |
diff -up bacula-5.0.1/src/wx-console/wxbrestorepanel.cpp.orig bacula-5.0.1/src/wx-console/wxbrestorepanel.cpp |
| 17 |
--- bacula-5.0.1/src/wx-console/wxbrestorepanel.cpp.orig 2010-02-24 16:33:48.000000000 +0100 |
| 18 |
+++ bacula-5.0.1/src/wx-console/wxbrestorepanel.cpp 2010-03-02 21:10:00.000000000 +0100 |
| 19 |
@@ -76,6 +76,7 @@ Select parameter to modify (1-11): |
| 20 |
#include "csprint.h" |
| 21 |
#include <wx/choice.h> |
| 22 |
#include <wx/datetime.h> |
| 23 |
+#include <wx/imaglist.h> |
| 24 |
#include <wx/timer.h> |
| 25 |
#include "unmarked.xpm" |
| 26 |
#include "marked.xpm" |
Parent Directory
| 
Revision Log
| 
Revision Graph
