From 80f8eb6bce29c784ba483c817355ead32f8943b5 Mon Sep 17 00:00:00 2001 From: dmiller Date: Tue, 30 Jun 2015 04:04:48 +0000 Subject: [PATCH] Use forward-declaration of class Target instead of including Target.h in *.h --- nmap.cc | 1 + scan_engine_raw.cc | 1 + scan_engine_raw.h | 3 ++- traceroute.h | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nmap.cc b/nmap.cc index f7e226e8a..75514cf47 100644 --- a/nmap.cc +++ b/nmap.cc @@ -139,6 +139,7 @@ #include "protocols.h" #include "targets.h" #include "TargetGroup.h" +#include "Target.h" #include "service_scan.h" #include "charpool.h" #include "nmap_error.h" diff --git a/scan_engine_raw.cc b/scan_engine_raw.cc index 40e0a2ee2..54f258ae4 100644 --- a/scan_engine_raw.cc +++ b/scan_engine_raw.cc @@ -125,6 +125,7 @@ #include "nmap_error.h" #include "NmapOps.h" +#include "Target.h" #include "payload.h" #include "scan_engine_raw.h" #include "struct_ip.h" diff --git a/scan_engine_raw.h b/scan_engine_raw.h index 30506fd82..86c3aee10 100644 --- a/scan_engine_raw.h +++ b/scan_engine_raw.h @@ -127,9 +127,10 @@ #define SCAN_ENGINE_RAW_H #include "scan_engine.h" -#include "Target.h" #include +class Target; + void increment_base_port(); int get_ping_pcap_result(UltraScanInfo *USI, struct timeval *stime); void begin_sniffer(UltraScanInfo *USI, std::vector &Targets); diff --git a/traceroute.h b/traceroute.h index 5cfac6aeb..04ac0b510 100644 --- a/traceroute.h +++ b/traceroute.h @@ -125,10 +125,10 @@ #ifndef NMAP_TRACEROUTE_H #define NMAP_TRACEROUTE_H -#include "Target.h" - #include +class Target; + int traceroute(std::vector &Targets); void traceroute_hop_cache_clear();