Commit 43f5d0b4 authored by Brad King's avatar Brad King
Browse files

COMP: Fix and/or disable warnings for Borland 5.6 build.

parent 6ef1cb1b
...@@ -216,7 +216,7 @@ int CommandLineArguments::Parse() ...@@ -216,7 +216,7 @@ int CommandLineArguments::Parse()
// additional value // additional value
CommandLineArgumentsCallbackStructure *cs CommandLineArgumentsCallbackStructure *cs
= &this->Internals->Callbacks[matches[maxidx]]; = &this->Internals->Callbacks[matches[maxidx]];
const CommandLineArguments::Internal::String& sarg = matches[maxidx]; const kwsys_stl::string& sarg = matches[maxidx];
if ( cs->Argument != sarg ) if ( cs->Argument != sarg )
{ {
abort(); abort();
......
...@@ -3348,7 +3348,7 @@ kwsys_stl::string SystemTools::GetCurrentDateTime(const char* format) ...@@ -3348,7 +3348,7 @@ kwsys_stl::string SystemTools::GetCurrentDateTime(const char* format)
time_t t; time_t t;
time(&t); time(&t);
strftime(buf, sizeof(buf), format, localtime(&t)); strftime(buf, sizeof(buf), format, localtime(&t));
return buf; return kwsys_stl::string(buf);
} }
kwsys_stl::string SystemTools::MakeCindentifier(const char* s) kwsys_stl::string SystemTools::MakeCindentifier(const char* s)
......
...@@ -30,6 +30,10 @@ ...@@ -30,6 +30,10 @@
# include <unistd.h> # include <unistd.h>
#endif #endif
#if defined(__BORLANDC__)
# pragma warn -8060 /* possibly incorrect assignment */
#endif
int runChild(const char* cmd[], int state, int exception, int value, int runChild(const char* cmd[], int state, int exception, int value,
int share, int output, int delay, double timeout, int poll, int share, int output, int delay, double timeout, int poll,
int repeat, int disown); int repeat, int disown);
...@@ -196,7 +200,6 @@ int test8_grandchild(int argc, const char* argv[]) ...@@ -196,7 +200,6 @@ int test8_grandchild(int argc, const char* argv[])
return 0; return 0;
} }
int runChild2(kwsysProcess* kp, int runChild2(kwsysProcess* kp,
const char* cmd[], int state, int exception, int value, const char* cmd[], int state, int exception, int value,
int share, int output, int delay, double timeout, int share, int output, int delay, double timeout,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment