From eb410e8dd8f4d1401d11713f398d38e0f250b136 Mon Sep 17 00:00:00 2001
From: Peter Kuemmel <syntheticpp@gmx.net>
Date: Mon, 18 Jun 2012 13:39:29 +0200
Subject: [PATCH] Ninja: disable cldeps for bcc32, it's too old, and ninja
 would also not build

---
 Source/CMakeLists.txt | 2 +-
 Source/cmcldeps.cxx   | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 557f065ba..bf7595804 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -383,7 +383,7 @@ IF(CMAKE_ENABLE_NINJA)
     cmNinjaUtilityTargetGenerator.h
     )
   ADD_DEFINITIONS(-DCMAKE_USE_NINJA)
-  IF(WIN32 AND NOT CYGWIN)
+  IF(WIN32 AND NOT CYGWIN AND NOT BORLAND)
     SET_SOURCE_FILES_PROPERTIES(cmcldeps.cxx PROPERTIES COMPILE_DEFINITIONS _WIN32_WINNT=0x0501)
     ADD_EXECUTABLE(cmcldeps cmcldeps.cxx)
     INSTALL_TARGETS(/bin cmcldeps)
diff --git a/Source/cmcldeps.cxx b/Source/cmcldeps.cxx
index 374ee1098..7d3c4bd65 100644
--- a/Source/cmcldeps.cxx
+++ b/Source/cmcldeps.cxx
@@ -33,9 +33,6 @@
 #endif
 
 
-// bcc32 only finds remove(const char*)
-namespace stlport { }
-
 #if defined(_WIN64)
 typedef unsigned __int64 cmULONG_PTR;
 #else
@@ -433,10 +430,8 @@ bool SubprocessSet::DoWork() {
   subproc->OnPipeReady();
 
   if (subproc->Done()) {
-    using namespace std;
-    using namespace stlport;
     std::vector<Subprocess*>::iterator end =
-        remove(running_.begin(), running_.end(), subproc);
+        std::remove(running_.begin(), running_.end(), subproc);
     if (running_.end() != end) {
       finished_.push(subproc);
       running_.resize(end - running_.begin());