onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2025-10-16 07:28:25 +02:00
Code Issues Releases Wiki Activity

fixes #1937 RES_DIR macro is defined twice

Browse Source
This commit is contained in:
Vadim Kurland 2011-01-25 17:09:20 -08:00
parent 71a94277a8
commit 9b1c98f0f4
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.h.in
View File

@ -47,9 +47,6 @@
/* prefix dir */
#undef PREFIX
/* init dir */
#undef RES_DIR
#define MANIFEST_MARKER "# files: "
#undef HAVE_LOCALE_H

4
doc/ChangeLog
View File

@ -1,5 +1,9 @@
2011-01-25 vadim <vadim@netcitadel.com>
* src/fwbuilder/libfwbuilder-config.h.in: fixes #1937 "RES_DIR
macro is defined twice". Got rid of duplicate definition of this
macro.
* FWObject.cpp (updateNonStandardObjectReferences): see #1985
added virtual function updateNonStandardObjectReferences() that is
supposed to update any references to objects stored as attributes.

5
src/common/init.cpp
View File

@ -12,6 +12,7 @@
#include "fwbuilder/libfwbuilder-config.h"
#include "fwbuilder/Tools.h"
#include "fwbuilder/Resources.h"
#include "fwbuilder/Constants.h"
#include "commoninit.h"
@ -53,8 +54,8 @@ void init(char * const*)
/* On Unix RES_DIR and LIBFWBUILDER_TEMPLATE_DIR are absolute paths */
if (respath=="") respath = RES_DIR;
librespath = RES_DIR;
if (respath=="") respath = Constants::getTemplateDirectory();
librespath = Constants::getTemplateDirectory();
libfwbuilder::init();

1
src/gui/main.cpp
View File

@ -200,7 +200,6 @@ int main( int argc, char *argv[] )
exit(1);
}
//respath = RES_DIR;
Resources res(full_res_path);
if (fwbdebug) qDebug("done");

3
src/unit_tests/ObjectMatcherTest/ObjectMatcherTest.cpp
View File

@ -41,6 +41,7 @@
#include "fwbuilder/AddressRange.h"
#include "fwbuilder/Host.h"
#include "fwbuilder/Firewall.h"
#include "fwbuilder/Constants.h"
using namespace libfwbuilder;
using namespace std;
@ -63,7 +64,7 @@ void ObjectMatcherTest::matchTest()
FWObjectDatabase *db = new FWObjectDatabase();
XMLTools::UpgradePredicate up;
db->load(string("test_data.fwb"), &up, string(RES_DIR));
db->load(string("test_data.fwb"), &up, Constants::getTemplateDirectory());
ObjectMatcher om;
om.setRecognizeBroadcasts(true);