[PATCH] Combine 2 #ifdefs in NmapOps.cc

["Kris Katterjohn" <kjak () ispwest com>]

This combines some #ifdef's to make it simpler.

Thanks,
Kris Katterjohn

--- NmapOps.cc.orig     2006-02-22 13:53:35.000000000 -0600
+++ NmapOps.cc  2006-02-22 13:53:40.000000000 -0600
@@ -177,17 +177,13 @@ void NmapOps::Initialize() {
   char tmpxsl[MAXPATHLEN];
 
   setaf(AF_INET);
-#ifndef WIN32
-# ifdef __amigaos__
-    isr00t = 1;
-# else
-    if (getenv("NMAP_PRIVILEGED"))
-      isr00t = 1;
-    else
-      isr00t = !(geteuid());
-# endif // __amigaos__
-#else
+#if defined WIN32 || defined __amigaos__
   isr00t = 1;
+#else
+  if (getenv("NMAP_PRIVILEGED"))
+    isr00t = 1;
+  else
+    isr00t = !(geteuid());
 #endif
   debugging = DEBUGGING;
   verbose = DEBUGGING;




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