[PATCH] Some changes when including nmap_amigaos.h

[Kris Katterjohn <kjak () ispwest com>]

The attached patches make some changes for nmap_amigaos.h. Only one would need
to be applied because the second one incorporates the first in it.

amiga-short.patch removes an unneeded test in nbase/nbase_ipv6.h to determine
whether it should include nmap_amigaos.h. It's unneeded because it's done in
nmap_amigaos.h

amiga-long.patch does the same, but also checks for __amigaos__ *inside*
nmap-amigaos.h so it doesn't have to be checked for everywhere it's included.


Thanks,
Kris Katterjohn

--- nbase/nbase_ipv6.h.orig     2006-03-08 17:36:20.000000000 -0600
+++ nbase/nbase_ipv6.h  2006-03-08 17:36:33.000000000 -0600
@@ -103,10 +103,8 @@
 #define NBASE_IPV6_H
 
 #ifdef __amigaos__
-#ifndef _NMAP_AMIGAOS_H_
 #include "../nmap_amigaos.h"
 #endif
-#endif
 
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>

--- nmap-4.02Alpha2.orig/nbase/nbase_ipv6.h     2005-04-14 20:23:49.000000000 -0500
+++ nmap-4.02Alpha2/nbase/nbase_ipv6.h  2006-03-08 17:21:57.000000000 -0600
@@ -102,11 +102,7 @@
 #ifndef NBASE_IPV6_H
 #define NBASE_IPV6_H
 
-#ifdef __amigaos__
-#ifndef _NMAP_AMIGAOS_H_
 #include "../nmap_amigaos.h"
-#endif
-#endif
 
 #if HAVE_SYS_TYPES_H
 #include <sys/types.h>

--- nmap-4.02Alpha2.orig/nmap.h 2006-03-07 16:36:28.000000000 -0600
+++ nmap-4.02Alpha2/nmap.h      2006-03-08 17:22:01.000000000 -0600
@@ -117,9 +117,7 @@
 #endif /* WIN32 */
 #endif /* HAVE_CONFIG_H */
 
-#ifdef __amigaos__
 #include "nmap_amigaos.h"
-#endif
 
 #include <nbase.h>
 
--- nmap-4.02Alpha2.orig/nmap_amigaos.h 2006-03-05 15:31:20.000000000 -0600
+++ nmap-4.02Alpha2/nmap_amigaos.h      2006-03-08 17:22:43.000000000 -0600
@@ -102,6 +102,8 @@
 #ifndef _NMAP_AMIGAOS_H_
 #define _NMAP_AMIGAOS_H_
 
+#ifdef __amigaos__
+
 #include <proto/miami.h>
 #include <proto/miamibpf.h>
 #include <proto/miamipcap.h>
@@ -147,4 +149,6 @@ struct addrinfo {
   struct addrinfo      *ai_next;       /* next structure in linked list */
 };
 
+#endif /* __amigaos__ */
+
 #endif /* _NMAP_AMIGAOS_H_ */



_______________________________________________
Sent through the nmap-dev mailing list
http://cgi.insecure.org/mailman/listinfo/nmap-dev