Nmap Development mailing list archives
[PATCH] Remove duplicate #includes
From: Kris Katterjohn <kjak () ispwest com>
Date: Mon, 06 Mar 2006 16:04:51 -0600
The attached patch removes some duplicate #includes. NOTE: When there was one inside a "HAVE_WHATEVER_H" and another outside of it, I kept the one on the inside. Thanks, Kris Katterjohn
--- nmap-4.01.orig/nbase/getnameinfo.c 2005-04-14 20:23:49.000000000 -0500 +++ nmap-4.01/nbase/getnameinfo.c 2006-03-06 15:53:03.000000000 -0600 @@ -115,9 +115,6 @@ #if HAVE_ARPA_INET_H #include <arpa/inet.h> #endif -#if HAVE_NETDB_H -#include <netdb.h> -#endif int getnameinfo(const struct sockaddr *sa, size_t salen, --- nmap-4.01.orig/nmap.h 2005-12-28 02:58:58.000000000 -0600 +++ nmap-4.01/nmap.h 2006-03-06 15:38:37.000000000 -0600 @@ -174,10 +174,6 @@ void *realloc(); /* BSDI needs this to insure the correct struct ip */ #undef _IP_VHL -#if HAVE_STRINGS_H -#include <strings.h> -#endif - #include <stdio.h> #if HAVE_RPC_TYPES_H --- nmap-4.01.orig/nmapfe/nmapfe_sig.c 2006-01-20 18:41:22.000000000 -0600 +++ nmap-4.01/nmapfe/nmapfe_sig.c 2006-03-06 15:52:24.000000000 -0600 @@ -139,7 +139,6 @@ #include <assert.h> #include <ctype.h> #include <errno.h> -#include <signal.h> #ifdef WIN32 --- nmap-4.01.orig/scan_engine.cc 2006-02-07 01:15:37.000000000 -0600 +++ nmap-4.01/scan_engine.cc 2006-03-06 15:50:34.000000000 -0600 @@ -100,8 +100,6 @@ /* $Id: scan_engine.cc 3120 2006-02-07 07:15:32Z fyodor $ */ -#include <dnet.h> - #include "scan_engine.h" #include "timing.h" #include "NmapOps.h" --- nmap-4.01.orig/tcpip.h 2005-12-06 15:15:49.000000000 -0600 +++ nmap-4.01/tcpip.h 2006-03-06 15:43:10.000000000 -0600 @@ -198,7 +198,6 @@ void *realloc(); #include <unistd.h> #endif #include <fcntl.h> -#include <sys/socket.h> #if TIME_WITH_SYS_TIME # include <sys/time.h> --- nmap-4.01.orig/utils.h 2006-01-19 12:55:29.000000000 -0600 +++ nmap-4.01/utils.h 2006-03-06 15:44:05.000000000 -0600 @@ -117,7 +117,6 @@ #include <netinet/in.h> #endif -#include <sys/time.h> #include <assert.h> #include <sys/mman.h> #include "config.h"
_______________________________________________ Sent through the nmap-dev mailing list http://cgi.insecure.org/mailman/listinfo/nmap-dev
Current thread:
- [PATCH] Remove duplicate #includes Kris Katterjohn (Mar 06)
- Re: [PATCH] Remove duplicate #includes Fyodor (Mar 07)