* Unbreak optimized build (noticed by Eric van Riet Paap)
* Comment #endif clauses for readability


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@22646 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/CFGPrinter.cpp b/lib/Analysis/CFGPrinter.cpp
index 7f83a98..5a236f2 100644
--- a/lib/Analysis/CFGPrinter.cpp
+++ b/lib/Analysis/CFGPrinter.cpp
@@ -160,7 +160,7 @@
     system(("rm " + Filename).c_str());
     return;
   }
-#endif
+#endif  // HAVE_GRAPHVIZ
   
 #ifdef HAVE_GV
   std::cerr << "Running 'dot' program... " << std::flush;
@@ -173,12 +173,14 @@
   }
   system(("rm " + Filename + " /tmp/cfg.tempgraph.ps").c_str());
   return;
-#endif
-#endif
+#endif  // HAVE_GV
+#endif  // NDEBUG
   std::cerr << "Function::viewCFG is only available in debug builds on "
             << "systems with Graphviz or gv!\n";
 
+#ifndef NDEBUG
   system(("rm " + Filename).c_str());
+#endif
 }
 
 /// viewCFGOnly - This function is meant for use from the debugger.  It works