From 3f862089b748741b30e343d2051a4747a3bff2f2 Mon Sep 17 00:00:00 2001
From: Dwayne Boone <dwayne@zeroc.com>
Date: Wed, 9 Aug 2006 14:58:01 +0000
Subject: Borland C++Builder port mass commit

---
 cpp/src/IcePatch2/Client.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'cpp/src/IcePatch2/Client.cpp')

diff --git a/cpp/src/IcePatch2/Client.cpp b/cpp/src/IcePatch2/Client.cpp
index 8427f0c8257..7cb8243d55d 100644
--- a/cpp/src/IcePatch2/Client.cpp
+++ b/cpp/src/IcePatch2/Client.cpp
@@ -169,7 +169,11 @@ private:
     keyPressed()
     {
 	bool pressed = false;
+#ifdef __BCPLUSPLUS__
+	while(kbhit())
+#else
 	while(_kbhit())
+#endif
 	{
 	    pressed = true;
 	    _getch();
@@ -241,7 +245,7 @@ Client::run(int argc, char* argv[])
     vector<string> args;
     try
     {
-    	args = opts.parse(argc, argv);
+    	args = opts.parse(argc, (const char**)argv);
     }
     catch(const IceUtil::Options::BadOpt& e)
     {
-- 
cgit v1.2.3