diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index fdf3767..c6be223 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -225,9 +225,10 @@
     "vfork",
     "getcontext"
   };
-#define NUM_RETURNS_TWICE_FNS sizeof(ReturnsTwiceFns) / sizeof(const char *)
+  static const size_t NumReturnsTwiceFns = sizeof(ReturnsTwiceFns) /
+                                           sizeof(const char *);
 
-  for (unsigned I = 0; I < NUM_RETURNS_TWICE_FNS; ++I)
+  for (unsigned I = 0; I < NumReturnsTwiceFns; ++I)
     if (const Function *Callee = M->getFunction(ReturnsTwiceFns[I])) {
       if (!Callee->use_empty())
         for (Value::const_use_iterator
@@ -239,7 +240,6 @@
     }
 
   return false;
-#undef NUM_RETURNS_TWICE_FNS
 }
 
 /// SplitCriticalSideEffectEdges - Look for critical edges with a PHI value that