Apply Riccardo's second patch that cleans up the #include

     file order + a few Win32 particularities to make bat work
     on Win32.

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

diff --git a/bacula/src/qt-console/bat.h b/bacula/src/qt-console/bat.h
index 757237f82bfd70eaac3c5f4abd83af2f819d02b1..afa423c75b3220d3b8536b550d1c5db76821d259 100644 (file)
--- a/bacula/src/qt-console/bat.h
+++ b/bacula/src/qt-console/bat.h
@@ -34,11 +34,17 @@
  *   Kern Sibbald, January 2007
  */
 
-#include "config.h"
+#if defined(HAVE_WIN32)
+#if !defined(_STAT_H)
+#define _STAT_H       /* don't pull in MinGW stat.h */
+#define _STAT_DEFINED /* don't pull in MinGW stat.h */
+#endif
+#endif
+
 #include <QtGui>
 #include <QtCore>
-#include "mainwin.h"
 #include "bacula.h"
+#include "mainwin.h"
 #include "bat_conf.h"
 #include "jcr.h"
 #include "console.h"

diff --git a/bacula/src/qt-console/bat_conf.cpp b/bacula/src/qt-console/bat_conf.cpp
index 30dd4f18c42156212d1189cdbdcda55b24832e2f..407b1fee8335c52f9ddfb0851b8f5063d2b67229 100644 (file)
--- a/bacula/src/qt-console/bat_conf.cpp
+++ b/bacula/src/qt-console/bat_conf.cpp
@@ -69,7 +69,11 @@ RES **res_head = sres_head;
  * then move it to allocated memory when the resource
  * scan is complete.
  */
+#if defined(MSC_VER)
+extern "C" URES res_all; /* visual c mangles variable names */
+#else
 URES res_all;
+#endif
 int32_t res_all_size = sizeof(res_all);
 
 /* Definition of records permitted within each

diff --git a/bacula/src/qt-console/clients/clients.cpp b/bacula/src/qt-console/clients/clients.cpp
index a458c414c738de5936befb9305efe283c808087c..20eabe126066946937807f1f5cf256ffeb9e02d4 100644 (file)
--- a/bacula/src/qt-console/clients/clients.cpp
+++ b/bacula/src/qt-console/clients/clients.cpp
@@ -35,9 +35,9 @@
  *
  */ 
 
+#include "bat.h"
 #include <QAbstractEventDispatcher>
 #include <QMenu>
-#include "bat.h"
 #include "clients/clients.h"
 #include "run/run.h"
 #include "status/clientstat.h"

diff --git a/bacula/src/qt-console/fileset/fileset.cpp b/bacula/src/qt-console/fileset/fileset.cpp
index 20e819260512cefda4db792ff608f9f830560116..60d878f160b91b7b23b6aed60f2af21d1778771e 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.cpp
+++ b/bacula/src/qt-console/fileset/fileset.cpp
@@ -35,9 +35,9 @@
  *
  */ 
 
+#include "bat.h"
 #include <QAbstractEventDispatcher>
 #include <QMenu>
-#include "bat.h"
 #include "fileset/fileset.h"
 #include "util/fmtwidgetitem.h"
 

diff --git a/bacula/src/qt-console/jobgraphs/jobplot.cpp b/bacula/src/qt-console/jobgraphs/jobplot.cpp
index 866975de7e8146183bffed7dd5048de5afb4cada..10c6a07f06c3272ac9d85aabae4c63a0e4155f6b 100644 (file)
--- a/bacula/src/qt-console/jobgraphs/jobplot.cpp
+++ b/bacula/src/qt-console/jobgraphs/jobplot.cpp
@@ -35,8 +35,8 @@
  *
  */ 
 
-#include <QtGui>
 #include "bat.h"
+#include <QtGui>
 #include "util/comboutil.h"
 #include "jobgraphs/jobplot.h"
 

diff --git a/bacula/src/qt-console/joblist/joblist.cpp b/bacula/src/qt-console/joblist/joblist.cpp
index 56078a5d0d8be4f78bd7332a7bdaff8f2357ac63..532507e5afeb0e57ba498cc406b310c2ab36d6c1 100644 (file)
--- a/bacula/src/qt-console/joblist/joblist.cpp
+++ b/bacula/src/qt-console/joblist/joblist.cpp
@@ -31,9 +31,9 @@
  *   Dirk Bartley, March 2007
  */
  
+#include "bat.h"
 #include <QAbstractEventDispatcher>
 #include <QTableWidgetItem>
-#include "bat.h"
 #include "joblist.h"
 #include "restore.h"
 #include "joblog/joblog.h"

diff --git a/bacula/src/qt-console/main.cpp b/bacula/src/qt-console/main.cpp
index 5c1b8bde8a78addda7573968e667e8b4eb6d3b75..ab99bace1bcf61919c2224a1c254370ad6460112 100644 (file)
--- a/bacula/src/qt-console/main.cpp
+++ b/bacula/src/qt-console/main.cpp
@@ -35,9 +35,9 @@
  */ 
 
 
+#include "bat.h"
 #include <QApplication>
 #include <QTranslator>
-#include "bat.h"
 
 MainWin *mainWin;
 QApplication *app;

diff --git a/bacula/src/qt-console/mediaedit/mediaedit.cpp b/bacula/src/qt-console/mediaedit/mediaedit.cpp
index f9914bb5a363d3b263f33ca22b8331577e856458..a1ff69eadc585066feb45bcfbff6263d4df80140 100644 (file)
--- a/bacula/src/qt-console/mediaedit/mediaedit.cpp
+++ b/bacula/src/qt-console/mediaedit/mediaedit.cpp
@@ -31,12 +31,11 @@
  *   Dirk Bartley, March 2007
  */
  
+#include "bat.h"
 #include <QAbstractEventDispatcher>
 #include <QTableWidgetItem>
 #include <QMessageBox>
-#include "bat.h"
 #include "mediaedit.h"
-#include <inttypes.h>
 
 /*
  * A constructor 

diff --git a/bacula/src/qt-console/medialist/medialist.cpp b/bacula/src/qt-console/medialist/medialist.cpp
index bf891fa4c19399d868ce6a8f4b796e5199770c7a..9189f1fcbedf4b583fe0b5e686ff0570006d97a7 100644 (file)
--- a/bacula/src/qt-console/medialist/medialist.cpp
+++ b/bacula/src/qt-console/medialist/medialist.cpp
@@ -35,10 +35,10 @@
  *
  */ 
 
+#include "bat.h"
 #include <QAbstractEventDispatcher>
 #include <QMenu>
 #include <math.h>
-#include "bat.h"
 #include "medialist.h"
 #include "mediaedit/mediaedit.h"
 #include "joblist/joblist.h"

diff --git a/bacula/src/qt-console/pages.cpp b/bacula/src/qt-console/pages.cpp
index 6823c3ec2dc87cb3fa0e705e91a4c341463ff86c..7325e5092d47f8580d73eb0e477ff93fae1c5005 100644 (file)
--- a/bacula/src/qt-console/pages.cpp
+++ b/bacula/src/qt-console/pages.cpp
@@ -31,8 +31,8 @@
  *   Dirk Bartley, March 2007
  */
 
-#include "pages.h"
 #include "bat.h"
+#include "pages.h"
 
 /* A global function */
 bool isWin32Path(QString &fullPath) 

diff --git a/bacula/src/qt-console/status/clientstat.cpp b/bacula/src/qt-console/status/clientstat.cpp
index c215cccefb969b7b542f6e32d30992509906e6e1..e722552895fa1b934bd7cae90acb2fe78afb09de 100644 (file)
--- a/bacula/src/qt-console/status/clientstat.cpp
+++ b/bacula/src/qt-console/status/clientstat.cpp
@@ -31,9 +31,9 @@
  *   Dirk Bartley, March 2007
  */
  
+#include "bat.h"
 #include <QAbstractEventDispatcher>
 #include <QTableWidgetItem>
-#include "bat.h"
 #include "clientstat.h"
 
 /*

diff --git a/bacula/src/qt-console/status/dirstat.cpp b/bacula/src/qt-console/status/dirstat.cpp
index 792b33f93bb769cde4d48178cf137e8ac10109ab..e3bda8bec13f3595fb0fa711154cb87b5c322d40 100644 (file)
--- a/bacula/src/qt-console/status/dirstat.cpp
+++ b/bacula/src/qt-console/status/dirstat.cpp
@@ -31,9 +31,9 @@
  *   Dirk Bartley, March 2007
  */
  
+#include "bat.h"
 #include <QAbstractEventDispatcher>
 #include <QTableWidgetItem>
-#include "bat.h"
 #include "dirstat.h"
 
 /*

diff --git a/bacula/src/qt-console/status/storstat.cpp b/bacula/src/qt-console/status/storstat.cpp
index fa4a41d9792123c45cb5cbeaa53f16491f606971..f67a131cabd088d1ba32403ee8a16fbfa629d621 100644 (file)
--- a/bacula/src/qt-console/status/storstat.cpp
+++ b/bacula/src/qt-console/status/storstat.cpp
@@ -31,9 +31,9 @@
  *   Dirk Bartley, March 2007
  */
  
+#include "bat.h"
 #include <QAbstractEventDispatcher>
 #include <QTableWidgetItem>
-#include "bat.h"
 #include "storstat.h"
 #include "mount/mount.h"
 

diff --git a/bacula/src/qt-console/storage/storage.cpp b/bacula/src/qt-console/storage/storage.cpp
index 4c6c7dce12324b0d3e53b7dadaca56280723dfd1..40b3b8cdb22b9a9e59f8e8a485216d269b62998f 100644 (file)
--- a/bacula/src/qt-console/storage/storage.cpp
+++ b/bacula/src/qt-console/storage/storage.cpp
@@ -35,9 +35,9 @@
  *
  */ 
 
+#include "bat.h"
 #include <QAbstractEventDispatcher>
 #include <QMenu>
-#include "bat.h"
 #include "storage.h"
 #include "label/label.h"
 #include "mount/mount.h"

diff --git a/bacula/src/qt-console/util/comboutil.cpp b/bacula/src/qt-console/util/comboutil.cpp
index 5b5cf4d70edd80bcffd3079b04278379cb5dfbef..17f68fed8e8404a99e20343ba9933f6570547e9e 100644 (file)
--- a/bacula/src/qt-console/util/comboutil.cpp
+++ b/bacula/src/qt-console/util/comboutil.cpp
@@ -35,10 +35,10 @@
  *
  */
 
+#include "bat.h"
 #include <QComboBox>
 #include <QString>
 #include <QStringList>
-#include "bat.h"
 #include "fmtwidgetitem.h"
 #include "comboutil.h"
 

diff --git a/bacula/src/qt-console/util/fmtwidgetitem.cpp b/bacula/src/qt-console/util/fmtwidgetitem.cpp
index cb3a1f08b20cd942d8fc56b089ee48533968bd26..2bc5b28ac4314ec143c6f00dc87ae45fc34b648e 100644 (file)
--- a/bacula/src/qt-console/util/fmtwidgetitem.cpp
+++ b/bacula/src/qt-console/util/fmtwidgetitem.cpp
@@ -35,6 +35,7 @@
  *
  */ 
 
+#include "bat.h"
 #include <QTreeWidgetItem>
 #include <QTableWidget>
 #include <QTableWidgetItem>
@@ -42,7 +43,6 @@
 #include <QString>
 #include <QStringList>
 #include <math.h>
-#include "bat.h"
 #include "fmtwidgetitem.h"
 
 /***********************************************

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index c254d2de11e622e227aa3ac0dcb91fac8151eff5..f362148b5cf17b2f9c303798bfc4305215830d96 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -11,6 +11,9 @@ mixed priorities
 
 General:
 07Nov08
+kes  Apply Riccardo's second patch that cleans up the #include
+     file order + a few Win32 particularities to make bat work
+     on Win32.
 ebl  Add allow_transactions flag to mysql db backend.
 kes  Apply win32-fixes patch from Riccardo that makes the Win32
      bat more stable and faster (but still slow).