onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-18 17:27:20 +01:00
Code Issues Releases Wiki Activity

trying to resolve build problem on windows "/usr/include/net-snmp/*"

Browse Source
This commit is contained in:
Vadim Kurland 2011-03-05 18:52:19 -08:00
parent 1100f1842a
commit 9bf118bc12
9 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
# build number is like "nano" version number. I am incrementing build
# number during development cycle
#
BUILD_NUM="3494"
BUILD_NUM="3495"
VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"

2
VERSION.h
View File

@ -1,2 +1,2 @@
#define VERSION "4.2.0.3494"
#define VERSION "4.2.0.3495"
#define GENERATION "4.2"

2
packaging/fwbuilder-static-qt.spec
View File

@ -3,7 +3,7 @@
%define name fwbuilder
%define version 4.2.0.3494
%define version 4.2.0.3495
%define release 1
%if "%_vendor" == "MandrakeSoft"

2
packaging/fwbuilder.control
View File

@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
Priority: extra
Section: checkinstall
Maintainer: vadim@fwbuilder.org
Version: 4.2.0.3494-1
Version: 4.2.0.3495-1
Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
Description: Firewall Builder GUI and policy compilers

2
packaging/fwbuilder.spec
View File

@ -1,6 +1,6 @@
%define name fwbuilder
%define version 4.2.0.3494
%define version 4.2.0.3495
%define release 1
%if "%_vendor" == "MandrakeSoft"

15
src/libfwbuilder/src/fwbuilder/snmp.cpp
View File

@ -6,8 +6,6 @@
Author: Vadim Zaliva lord@crocodile.org
$Id$
This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms
of that license as published by the Free Software Foundation; either
@ -23,7 +21,7 @@
*/
#include <fwbuilder/libfwbuilder-config.h>
#include "fwbuilder/libfwbuilder-config.h"
#ifdef HAVE_LIBSNMP
@ -32,10 +30,10 @@
#include <fcntl.h>
#include <time.h>
#include <fwbuilder/physAddress.h>
#include <fwbuilder/InetAddrMask.h>
#include <fwbuilder/Inet6AddrMask.h>
#include <fwbuilder/IPv4.h>
#include "fwbuilder/physAddress.h"
#include "fwbuilder/InetAddrMask.h"
#include "fwbuilder/Inet6AddrMask.h"
#include "fwbuilder/IPv4.h"
/*
* we do not really use getops here, but net-snmp does. On FreeBSD, if
@ -49,7 +47,8 @@
* processed
*/
#define _GETOPT_H
#include <fwbuilder/snmp.h>
#include "fwbuilder/snmp.h"
#ifdef UCD_SNMP
#include <ucd-snmp/parse.h>

21
src/libfwbuilder/src/fwbuilder/snmp.h
View File

@ -6,9 +6,6 @@
Author: Vadim Zaliva lord@crocodile.org
$Id$
This program is free software which we release under the GNU General Public
License. You may redistribute and/or modify this program under the terms
of that license as published by the Free Software Foundation; either
@ -28,20 +25,20 @@
#ifndef __SNMP_HH_FLAG__
#define __SNMP_HH_FLAG__
#include <fwbuilder/libfwbuilder-config.h>
#include "fwbuilder/libfwbuilder-config.h"
#ifdef HAVE_LIBSNMP
#include <vector>
#include <fwbuilder/FWObjectDatabase.h>
#include <fwbuilder/Interface.h>
#include <fwbuilder/BackgroundOp.h>
#include <fwbuilder/FWException.h>
#include <fwbuilder/InetAddr.h>
#include <fwbuilder/InterfaceData.h>
#include <fwbuilder/IPRoute.h>
#include <fwbuilder/dns.h>
#include "fwbuilder/FWObjectDatabase.h"
#include "fwbuilder/Interface.h"
#include "fwbuilder/BackgroundOp.h"
#include "fwbuilder/FWException.h"
#include "fwbuilder/InetAddr.h"
#include "fwbuilder/InterfaceData.h"
#include "fwbuilder/IPRoute.h"
#include "fwbuilder/dns.h"
#ifdef UCD_SNMP
#include <ucd-snmp/ucd-snmp-config.h>

7
src/libgui/snmpNetworkDiscoveryWizard/SNMPCrawlerThread.cpp
View File

@ -23,13 +23,14 @@
#include "../../config.h"
#include "global.h"
#include "SNMPCrawlerThread.h"
#include <QWidget>
#include <QtDebug>
#include "utils.h"
#include "QThreadLogger.h"
#include <QWidget>
#include <QtDebug>
#include "SNMPCrawlerThread.h"
using namespace std;

12
src/libgui/snmpNetworkDiscoveryWizard/SNMPCrawlerThread.h
View File

@ -26,18 +26,18 @@
#include "../../config.h"
#include "fwbuilder/libfwbuilder-config.h"
#include "fwbuilder/FWObject.h"
#include "fwbuilder/InetAddrMask.h"
#include "fwbuilder/ThreadTools.h"
#include "fwbuilder/snmp.h"
#include <QWidget>
#include <QThread>
#include <map>
#include <set>
#include "fwbuilder/libfwbuilder-config.h"
#include "fwbuilder/FWObject.h"
#include "fwbuilder/InetAddrMask.h"
#include "fwbuilder/ThreadTools.h"
#include "fwbuilder/snmp.h"
class SNMPCrawlerThread : public QThread
{