diff --git a/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp b/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
index 2cea218117a..cf8d04e8a6a 100644
--- a/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
@@ -24,7 +24,7 @@
 #include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
-#ifndef _NDEBUG
+#ifndef NDEBUG
 static cl::opt<bool>
 ViewDAGs("view-sched-dags", cl::Hidden,
          cl::desc("Pop up a window to show sched dags as they are processed"));
@@ -103,7 +103,7 @@ unsigned SimpleSched::Emit(SDOperand Op) {
       --NodeOperands;
    
     unsigned NumMIOperands = NodeOperands+NumResults;
-#ifndef _NDEBUG
+#ifndef NDEBUG
     assert((unsigned(II.numOperands) == NumMIOperands || II.numOperands == -1)&&
            "#operands for dag node doesn't match .td file!"); 
 #endif
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index b587e3697db..4121e400bc4 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -36,7 +36,7 @@
 #include <iostream>
 using namespace llvm;
 
-#ifndef _NDEBUG
+#ifndef NDEBUG
 static cl::opt<bool>
 ViewDAGs("view-isel-dags", cl::Hidden,
          cl::desc("Pop up a window to show isel dags as they are selected"));