1*4882a593SmuzhiyunFrom a068952a20880fc864e8cb8b49f8a6b143a5ac30 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Peiran Hong <peiran.hong@windriver.com> 3*4882a593SmuzhiyunDate: Fri, 20 Sep 2019 15:02:45 -0400 4*4882a593SmuzhiyunSubject: [PATCH] Include time.h header to pass clang compilation 5*4882a593Smuzhiyun 6*4882a593Smuzhiyun--- 7*4882a593Smuzhiyun nmap_error.cc | 11 +---------- 8*4882a593Smuzhiyun nping/EchoServer.cc | 1 + 9*4882a593Smuzhiyun osscan2.cc | 1 + 10*4882a593Smuzhiyun service_scan.cc | 1 + 11*4882a593Smuzhiyun 4 files changed, 4 insertions(+), 10 deletions(-) 12*4882a593Smuzhiyun 13*4882a593Smuzhiyundiff --git a/nmap_error.cc b/nmap_error.cc 14*4882a593Smuzhiyunindex 588b13c33..254107ff5 100644 15*4882a593Smuzhiyun--- a/nmap_error.cc 16*4882a593Smuzhiyun+++ b/nmap_error.cc 17*4882a593Smuzhiyun@@ -135,16 +135,7 @@ 18*4882a593Smuzhiyun #include "xml.h" 19*4882a593Smuzhiyun 20*4882a593Smuzhiyun #include <errno.h> 21*4882a593Smuzhiyun-#if TIME_WITH_SYS_TIME 22*4882a593Smuzhiyun-# include <sys/time.h> 23*4882a593Smuzhiyun-# include <time.h> 24*4882a593Smuzhiyun-#else 25*4882a593Smuzhiyun-# if HAVE_SYS_TIME_H 26*4882a593Smuzhiyun-# include <sys/time.h> 27*4882a593Smuzhiyun-# else 28*4882a593Smuzhiyun-# include <time.h> 29*4882a593Smuzhiyun-# endif 30*4882a593Smuzhiyun-#endif 31*4882a593Smuzhiyun+#include <time.h> 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun extern NmapOps o; 34*4882a593Smuzhiyun 35*4882a593Smuzhiyundiff --git a/nping/EchoServer.cc b/nping/EchoServer.cc 36*4882a593Smuzhiyunindex ccdcf9c2d..c403aeda5 100644 37*4882a593Smuzhiyun--- a/nping/EchoServer.cc 38*4882a593Smuzhiyun+++ b/nping/EchoServer.cc 39*4882a593Smuzhiyun@@ -137,6 +137,7 @@ 40*4882a593Smuzhiyun #include "NpingOps.h" 41*4882a593Smuzhiyun #include "ProbeMode.h" 42*4882a593Smuzhiyun #include <signal.h> 43*4882a593Smuzhiyun+#include <time.h> 44*4882a593Smuzhiyun 45*4882a593Smuzhiyun extern NpingOps o; 46*4882a593Smuzhiyun extern EchoServer es; 47*4882a593Smuzhiyundiff --git a/osscan2.cc b/osscan2.cc 48*4882a593Smuzhiyunindex aa31feb12..89673e108 100644 49*4882a593Smuzhiyun--- a/osscan2.cc 50*4882a593Smuzhiyun+++ b/osscan2.cc 51*4882a593Smuzhiyun@@ -147,6 +147,7 @@ 52*4882a593Smuzhiyun 53*4882a593Smuzhiyun #include <list> 54*4882a593Smuzhiyun #include <math.h> 55*4882a593Smuzhiyun+#include <time.h> 56*4882a593Smuzhiyun 57*4882a593Smuzhiyun extern NmapOps o; 58*4882a593Smuzhiyun #ifdef WIN32 59*4882a593Smuzhiyundiff --git a/service_scan.cc b/service_scan.cc 60*4882a593Smuzhiyunindex 57a92ed28..ef277bb1f 100644 61*4882a593Smuzhiyun--- a/service_scan.cc 62*4882a593Smuzhiyun+++ b/service_scan.cc 63*4882a593Smuzhiyun@@ -145,6 +145,7 @@ 64*4882a593Smuzhiyun #include "nmap_tty.h" 65*4882a593Smuzhiyun 66*4882a593Smuzhiyun #include <errno.h> 67*4882a593Smuzhiyun+#include <time.h> 68*4882a593Smuzhiyun 69*4882a593Smuzhiyun #if HAVE_OPENSSL 70*4882a593Smuzhiyun /* OpenSSL 1.0.0 needs _WINSOCKAPI_ to be defined, otherwise it loads 71*4882a593Smuzhiyun-- 72*4882a593Smuzhiyun2.21.0 73*4882a593Smuzhiyun 74