Vivian Meazza:
After much trial and tribulation, Harald came up with a fix for the bug which has been plaguing Cygwin for a couple of weeks now. It's only a couple of lines. I've tested it exhaustively, and it seems to cure the problem of Cygwin failing to start.
This commit is contained in:
@@ -105,7 +105,7 @@ void SGTimeStamp::stamp() {
|
||||
|
||||
// increment the time stamp by the number of microseconds (usec)
|
||||
SGTimeStamp operator + (const SGTimeStamp& t, const long& m) {
|
||||
#if defined( WIN32 )
|
||||
#if defined( WIN32 ) && !defined(__CYGWIN__)
|
||||
return SGTimeStamp( 0, t.usec + m );
|
||||
#else
|
||||
return SGTimeStamp( t.seconds + ( t.usec + m ) / 1000000,
|
||||
@@ -116,7 +116,7 @@ SGTimeStamp operator + (const SGTimeStamp& t, const long& m) {
|
||||
// difference between time stamps in microseconds (usec)
|
||||
long operator - (const SGTimeStamp& a, const SGTimeStamp& b)
|
||||
{
|
||||
#if defined( WIN32 )
|
||||
#if defined( WIN32 ) && !defined(__CYGWIN__)
|
||||
return a.usec - b.usec;
|
||||
#else
|
||||
return 1000000 * (a.seconds - b.seconds) + (a.usec - b.usec);
|
||||
|
||||
Reference in New Issue
Block a user